ZedZone
|
Blog
|
Software
|
Code
projects
/
jjmpeg
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
291b0d9
)
Switch trunk to pre 4.1 development
author
Michael Zucchi
<michael@swordfish.com.au>
Tue, 23 Apr 2019 03:39:33 +0000
(13:09 +0930)
committer
Michael Zucchi
<michael@swordfish.com.au>
Tue, 23 Apr 2019 03:39:33 +0000
(13:09 +0930)
Makefile
patch
|
blob
|
history
config.make
patch
|
blob
|
history
diff --git
a/Makefile
b/Makefile
index
ea6e70c
..
a6c4976
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-1,5
+1,5
@@
-dist_VERSION=4.0
+dist_VERSION=4.0
.99
dist_NAME=jjmpeg
dist_EXTRA=README TODO \
build.xml \
diff --git
a/config.make
b/config.make
index
672631e
..
657bb75
100644
(file)
--- a/
config.make
+++ b/
config.make
@@
-6,9
+6,9
@@
JAVAFX_HOME ?= /usr/local/javafx-sdk-11.0.2
FFMPEG_HOME ?= /opt/ffmpeg/4.0
# See also JAVACFLAGS --module-path
-NATIVEZ_HOME=../nativez
-1.0
/bin/notzed.nativez/$(TARGET)
+NATIVEZ_HOME=../nativez/bin/notzed.nativez/$(TARGET)
-JAVACFLAGS += --module-path $(JAVAFX_HOME)/lib:../nativez
-1.0
/bin/notzed.nativez
+JAVACFLAGS += --module-path $(JAVAFX_HOME)/lib:../nativez/bin/notzed.nativez
JAVACFLAGS += -source 11
JAVAC ?= javac