From cd3f1b2903821127440cd975384c41f17f1d69b5 Mon Sep 17 00:00:00 2001 From: Sven Gothel Date: Sat, 4 Jan 2020 19:49:36 +0100 Subject: fix windows build scripts --- make/scripts/make.jocl.all.win32.bat | 4 ++-- make/scripts/make.jocl.all.win64.bat | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/make/scripts/make.jocl.all.win32.bat b/make/scripts/make.jocl.all.win32.bat index f843fd3d..1f2eda11 100755 --- a/make/scripts/make.jocl.all.win32.bat +++ b/make/scripts/make.jocl.all.win32.bat @@ -3,13 +3,13 @@ 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 ANT_PATH=C:\apache-ant-1.10.5 -set GIT_PATH=C:\cygwin\bin +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=%JAVA_HOME%\bin;%ANT_PATH%\bin;c:\mingw32\bin;%CMAKE_PATH%\bin;%GIT_PATH%;%SEVENZIP%;%PATH% +set PATH=%J2RE_HOME%\bin;%JAVA_HOME%\bin;%ANT_PATH%\bin;c:\mingw32\bin;%CMAKE_PATH%\bin;%GIT_PATH%;%SEVENZIP%;%PATH% REM set LIB_GEN=%THISDIR%\lib REM set CLASSPATH=.;%THISDIR%\build-win32\classes diff --git a/make/scripts/make.jocl.all.win64.bat b/make/scripts/make.jocl.all.win64.bat index eaf2a755..b4d8d2d4 100755 --- a/make/scripts/make.jocl.all.win64.bat +++ b/make/scripts/make.jocl.all.win64.bat @@ -3,7 +3,7 @@ REM 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 ANT_PATH=C:\apache-ant-1.10.5 -set GIT_PATH=C:\cygwin\bin +set GIT_PATH=C:\cygwin64\bin set SEVENZIP=C:\Program Files\7-Zip set CMAKE_PATH=C:\cmake-3.15.2-win64-x64 -- cgit v1.2.3