diff options
author | Sven Gothel <[email protected]> | 2019-12-26 18:24:28 +0100 |
---|---|---|
committer | Sven Gothel <[email protected]> | 2019-12-26 18:24:28 +0100 |
commit | 22b41b9a232527d8c2b2a2b03e03005273529df7 (patch) | |
tree | 1d5cd2c19c56dbc0d6a96cdfba61c269cf19781b /make/scripts/make.jocl.all.win64.bat | |
parent | 855fc43060fe788ce32b2daa396f6fe236c31ba8 (diff) |
Bug 1417: Android: Adapt to GlueGen's 'aapt.signed' d8 usage and use manifest SDK API [min=21, target=28]
Also fix all make/scripts using Java11 as 'host compiler' and Java8 as target-rt-jar,
as well as adapt to GlueGen's new Android 'setenv-android-tools.sh' for new SDK/NDK as of 2019-12-10.
Diffstat (limited to 'make/scripts/make.jocl.all.win64.bat')
-rwxr-xr-x | make/scripts/make.jocl.all.win64.bat | 25 |
1 files changed, 15 insertions, 10 deletions
diff --git a/make/scripts/make.jocl.all.win64.bat b/make/scripts/make.jocl.all.win64.bat index b1928677..eaf2a755 100755 --- a/make/scripts/make.jocl.all.win64.bat +++ b/make/scripts/make.jocl.all.win64.bat @@ -1,17 +1,22 @@ -set THISDIR="C:\JOGL"
+REM set THISDIR="C:\JOGL"
-set J2RE_HOME=c:\jre1.8.0_66_x64
-set JAVA_HOME=c:\jdk1.8.0_66_x64
-set ANT_PATH=C:\apache-ant-1.9.4
+set J2RE_HOME=c:\jre-11.0.4+11_x64
+set JAVA_HOME=c:\jdk-11.0.4+11_x64
+set ANT_PATH=C:\apache-ant-1.10.5
+set GIT_PATH=C:\cygwin\bin
+set SEVENZIP=C:\Program Files\7-Zip
-set PATH=%JAVA_HOME%\bin;%ANT_PATH%\bin;c:\mingw64\bin;c:\mingw\bin;%PATH%
+set CMAKE_PATH=C:\cmake-3.15.2-win64-x64
+set CMAKE_C_COMPILER=c:\mingw64\bin\gcc
-set LIB_GEN=%THISDIR%\lib
-set CLASSPATH=.;%THISDIR%\build-win64\classes
+set PATH=%J2RE_HOME%\bin;%JAVA_HOME%\bin;%ANT_PATH%\bin;c:\mingw64\bin;%CMAKE_PATH%\bin;%GIT_PATH%;%SEVENZIP%;%PATH%
-set SOURCE_LEVEL=1.6
-set TARGET_LEVEL=1.6
-set TARGET_RT_JAR=c:\jre1.6.0_30\lib\rt.jar
+REM set LIB_GEN=%THISDIR%\lib
+REM set CLASSPATH=.;%THISDIR%\build-win64\classes
+
+set SOURCE_LEVEL=1.8
+set TARGET_LEVEL=1.8
+set TARGET_RT_JAR=C:\jre1.8.0_212\lib\rt.jar
REM set JOGAMP_JAR_CODEBASE=Codebase: *.jogamp.org
set JOGAMP_JAR_CODEBASE=Codebase: *.goethel.localnet
|