From: Not Zed Date: Tue, 7 Dec 2021 23:22:46 +0000 (+1030) Subject: Use saner defaults X-Git-Url: https://code.zedzone.au/cvs?a=commitdiff_plain;h=refs%2Fheads%2Fmaster;p=jjmpeg Use saner defaults Use full path names to java tools --- diff --git a/config.make.in b/config.make.in index b0c9b24..a943972 100644 --- a/config.make.in +++ b/config.make.in @@ -1,19 +1,19 @@ TARGET ?= linux-amd64 -JAVA_HOME ?= /usr/local/jdk-13+33 -JAVAFX_HOME ?= /usr/local/javafx-sdk-13 -FFMPEG_HOME ?= /opt/ffmpeg/4.0 +JAVA_HOME ?= /usr/local/jdk +JAVAFX_HOME ?= /usr/local/javafx-sdk +FFMPEG_HOME ?= /usr # See also JAVACFLAGS --module-path NATIVEZ_HOME=../nativez/bin/$(TARGET) JAVAMODPATH = $(JAVAFX_HOME)/lib $(NATIVEZ_HOME)/lib -JAVACFLAGS += -source 13 +JAVACFLAGS += -JAVAC ?= javac -JAR ?= jar -JMOD ?= jmod +JAVAC ?= $(JAVA_HOME)/bin/javac +JAR ?= $(JAVA_HOME)/bin/jar +JMOD ?= $(JAVA_HOME)/bin/jmod # Linux options # USE_SO_VERSION adds the major version to the library open name for ffmpeg libs on linux.