diff options
| author | Sven Gothel <[email protected]> | 2023-01-15 04:08:59 +0100 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2023-01-15 04:08:59 +0100 |
| commit | b6a10d76e0c6085ca77420730e7295341f1638b8 (patch) | |
| tree | 03e0c641a7e0af74d879b29f39f366249bb5b5c2 /make | |
| parent | 629bf805104b65f312a839db1296fd5399a1f5dc (diff) | |
Build scripts: MacOS + Windows: Use JDK-17 to build our Java-1.8 API
Diffstat (limited to 'make')
| -rwxr-xr-x | make/scripts/make.jogl.all.ios.amd64.sh | 2 | ||||
| -rwxr-xr-x | make/scripts/make.jogl.all.ios.arm64.sh | 2 | ||||
| -rwxr-xr-x | make/scripts/make.jogl.all.macosx.sh | 7 | ||||
| -rwxr-xr-x | make/scripts/make.jogl.all.win32.bat | 4 | ||||
| -rwxr-xr-x | make/scripts/make.jogl.all.win64.bat | 4 |
5 files changed, 7 insertions, 12 deletions
diff --git a/make/scripts/make.jogl.all.ios.amd64.sh b/make/scripts/make.jogl.all.ios.amd64.sh index 9ebb655e2..8e48335fa 100755 --- a/make/scripts/make.jogl.all.ios.amd64.sh +++ b/make/scripts/make.jogl.all.ios.amd64.sh @@ -12,7 +12,7 @@ fi export SDKROOT=iphonesimulator13.2 xcrun --show-sdk-path -JAVA_HOME=`/usr/libexec/java_home -version 11` +JAVA_HOME=`/usr/libexec/java_home -version 17` PATH=$JAVA_HOME/bin:$PATH export JAVA_HOME PATH which java diff --git a/make/scripts/make.jogl.all.ios.arm64.sh b/make/scripts/make.jogl.all.ios.arm64.sh index 1edae79d8..2dbf89fd0 100755 --- a/make/scripts/make.jogl.all.ios.arm64.sh +++ b/make/scripts/make.jogl.all.ios.arm64.sh @@ -12,7 +12,7 @@ fi export SDKROOT=iphoneos13.2 xcrun --show-sdk-path -JAVA_HOME=`/usr/libexec/java_home -version 11` +JAVA_HOME=`/usr/libexec/java_home -version 17` PATH=$JAVA_HOME/bin:$PATH export JAVA_HOME PATH which java diff --git a/make/scripts/make.jogl.all.macosx.sh b/make/scripts/make.jogl.all.macosx.sh index 894ed1a0d..730be7028 100755 --- a/make/scripts/make.jogl.all.macosx.sh +++ b/make/scripts/make.jogl.all.macosx.sh @@ -4,12 +4,7 @@ if [ -e /usr/local/etc/profile.ant ] ; then . /usr/local/etc/profile.ant fi -# Force OSX SDK 10.6, if desired -# export SDKROOT=macosx10.6 - -#JAVA_HOME=`/usr/libexec/java_home` -JAVA_HOME=`/usr/libexec/java_home -version 11` -#JAVA_HOME=`/usr/libexec/java_home -version 1.8` +JAVA_HOME=`/usr/libexec/java_home -version 17` PATH=$JAVA_HOME/bin:$PATH export JAVA_HOME PATH diff --git a/make/scripts/make.jogl.all.win32.bat b/make/scripts/make.jogl.all.win32.bat index cd885accb..87cbab76f 100755 --- a/make/scripts/make.jogl.all.win32.bat +++ b/make/scripts/make.jogl.all.win32.bat @@ -1,7 +1,7 @@ set THISDIR="C:\JogAmp"
-set J2RE_HOME=c:\jre-11.0.4+11_x32
-set JAVA_HOME=c:\jdk-11.0.4+11_x32
+set J2RE_HOME=c:\jre-17
+set JAVA_HOME=c:\jdk-17
set ANT_PATH=C:\apache-ant-1.10.5
set GIT_PATH=C:\cygwin64\bin
set SEVENZIP=C:\Program Files\7-Zip
diff --git a/make/scripts/make.jogl.all.win64.bat b/make/scripts/make.jogl.all.win64.bat index 0d40a859d..d9e404370 100755 --- a/make/scripts/make.jogl.all.win64.bat +++ b/make/scripts/make.jogl.all.win64.bat @@ -1,7 +1,7 @@ set THISDIR="C:\JOGL"
-set J2RE_HOME=c:\jre-11.0.4+11_x64
-set JAVA_HOME=c:\jdk-11.0.4+11_x64
+set J2RE_HOME=c:\jre-17
+set JAVA_HOME=c:\jdk-17
set ANT_PATH=C:\apache-ant-1.10.5
set GIT_PATH=C:\cygwin64\bin
set SEVENZIP=C:\Program Files\7-Zip
|