From 1480287aafb39c2c3de682aa9c0d310786646b16 Mon Sep 17 00:00:00 2001 From: Not Zed Date: Wed, 8 Dec 2021 10:33:31 +1030 Subject: [PATCH] Use saner defaults Use full paths to java tools --- config.make.in | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/config.make.in b/config.make.in index f0186c5..633f536 100644 --- a/config.make.in +++ b/config.make.in @@ -1,17 +1,19 @@ TARGET ?= linux-amd64 -JAVA_HOME ?= /usr/local/jdk-13+33 +JAVA_HOME ?= /usr/local/jdk +JAVAFX_HOME ?= /usr/local/javafx-sdk # See also JAVACFLAGS --module-path NATIVEZ_HOME=../nativez/bin/$(TARGET) -JAVAMODPATH = $(NATIVEZ_HOME)/lib -JAVACFLAGS += -source 13 +JAVAMODPATH = $(NATIVEZ_HOME)/lib $(JAVAFX_HOME)/lib +JAVACFLAGS += -JAVAC ?= javac -JAR ?= jar -JMOD ?= jmod +JAVA ?= $(JAVA_HOME)/bin/java +JAVAC ?= $(JAVA_HOME)/bin/javac +JAR ?= $(JAVA_HOME)/bin/jar +JMOD ?= $(JAVA_HOME)/bin/jmod # Linux options linux-amd64_CPPFLAGS = \ -- 2.39.5