Update Windows build scripts

2 files changed, 3 insertions, 28 deletions

diff --git a/make/scripts/make.joal.all.win32.bat b/make/scripts/make.joal.all.win32.bat
deleted file mode 100755
index d3ae0b7..0000000
--- a/make/scripts/make.joal.all.win32.bat
+++ /dev/null
@@ -1,25 +0,0 @@
-set THISDIR="C:\JOGL"

-

-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

-

-set CMAKE_PATH=C:\cmake-3.15.2-win32-x86

-set CMAKE_C_COMPILER=c:\mingw32\bin\gcc

-

-set PATH=%J2RE_HOME%\bin;%JAVA_HOME%\bin;%ANT_PATH%\bin;c:\mingw32\bin;%CMAKE_PATH%\bin;%GIT_PATH%;%SEVENZIP%;%PATH%

-

-set LIB_GEN=%THISDIR%\lib

-set CLASSPATH=.;%THISDIR%\build-win32\classes

-REM    -Dc.compiler.debug=true 

-

-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

-

-ant -Drootrel.build=build-win32 %1 %2 %3 %4 %5 %6 %7 %8 %9 > make.joal.all.win32.log 2>&1

diff --git a/make/scripts/make.joal.all.win64.bat b/make/scripts/make.joal.all.win64.bat
index f2f9183..af6563b 100755
--- a/make/scripts/make.joal.all.win64.bat
+++ b/make/scripts/make.joal.all.win64.bat
@@ -1,12 +1,12 @@
-set THISDIR="C:\JOGL"

+set THISDIR="C:\JogAmp"

 

-set J2RE_HOME=c:\jre-17

+set J2RE_HOME=c:\jdk-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

 

-set CMAKE_PATH=C:\cmake-3.15.2-win64-x64

+set CMAKE_PATH=C:\make-3.25.1-windows-x64_64

 set CMAKE_C_COMPILER=c:\mingw64\bin\gcc

 

 set PATH=%J2RE_HOME%\bin;%JAVA_HOME%\bin;%ANT_PATH%\bin;c:\mingw64\bin;%CMAKE_PATH%\bin;%GIT_PATH%;%SEVENZIP%;%PATH%