From 359fd78ea57154f88787499cdc771b31c012bbf1 Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Sun, 27 Apr 2025 20:05:56 +0200 Subject: fixup! refine make dependency quirk to improve use with OpenJDK 21 --- Makefile | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 659df38..98b4a42 100644 --- a/Makefile +++ b/Makefile @@ -28,7 +28,13 @@ ifeq ($(shell expr $(JAVA_MAJOR_VERSION) \>= 23), 1) JAVAFLAGS += --sun-misc-unsafe-memory-access=allow endif +# loading as modules works with JDK 22+, and is required with JDK 23+ +ifeq ($(shell expr $(JAVA_MAJOR_VERSION) \>= 22), 1) +JAVA_MODULEPATHS_bachelorizer += mods/com.example.portfolio3 +else +JAVA_CLASSPATHS_bachelorizer += mods/com.example.portfolio3 +endif + # TODO: fix properly declare and resolve local interdependencies -JAVA_CLASSPATHS_bachelorizer = mods/com.example.portfolio3 runsrc-dk.biks.bachelorizer build-dk.biks.bachelorizer: \ build-com.example.portfolio3 -- cgit v1.2.3