diff options
| author | Sven Gothel <[email protected]> | 2019-08-18 23:56:42 +0200 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2019-08-18 23:56:42 +0200 |
| commit | 5f4292bb8a310489e05a4f3545ae081310a93f72 (patch) | |
| tree | af52455ba48c73c6a64eab6f481ff9ac6f65b04b /make/scripts | |
| parent | 6f987f16c808242b61263d76bd7d72e148a0af24 (diff) | |
Build Update: CMake 2.8.10.2 -> 3.15.2 (Windows + MacOS), Mingw64 4.8.1 -> 8.1.0
Diffstat (limited to 'make/scripts')
| -rwxr-xr-x | make/scripts/java-win32.bat | 4 | ||||
| -rwxr-xr-x | make/scripts/java-win64.bat | 4 | ||||
| -rwxr-xr-x | make/scripts/make.gluegen.all.win32.bat | 6 | ||||
| -rwxr-xr-x | make/scripts/make.gluegen.all.win64.bat | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/make/scripts/java-win32.bat b/make/scripts/java-win32.bat index eb84ee0..2ed87c3 100755 --- a/make/scripts/java-win32.bat +++ b/make/scripts/java-win32.bat @@ -9,8 +9,8 @@ set BLD_DIR=..\%BLD_SUB% REM set LIB_DIR=..\%BLD_SUB%\obj;..\%BLD_SUB%\test\build\natives
REM set LIB_DIR=..\%BLD_SUB%\test\build\natives
-REM set PATH=%JAVA_HOME%\bin;%ANT_PATH%\bin;c:\mingw\bin;%LIB_DIR%;%PATH%
-set PATH=%JAVA_HOME%\bin;%ANT_PATH%\bin;c:\mingw\bin;%PATH%
+REM set PATH=%JAVA_HOME%\bin;%ANT_PATH%\bin;c:\mingw32\bin;%LIB_DIR%;%PATH%
+set PATH=%JAVA_HOME%\bin;%ANT_PATH%\bin;c:\mingw32\bin;%PATH%
set CP_ALL=.;lib\junit.jar;%ANT_PATH%\lib\ant.jar;%ANT_PATH%\lib\ant-junit.jar;lib/semantic-versioning/semver.jar;%BLD_DIR%\gluegen-rt.jar;%BLD_DIR%\gluegen.jar;%BLD_DIR%\gluegen-test-util.jar;%BLD_DIR%\test\build\gluegen-test.jar
diff --git a/make/scripts/java-win64.bat b/make/scripts/java-win64.bat index e52b4c9..283fe4c 100755 --- a/make/scripts/java-win64.bat +++ b/make/scripts/java-win64.bat @@ -9,8 +9,8 @@ set BLD_DIR=..\%BLD_SUB% REM set LIB_DIR=..\%BLD_SUB%\obj;..\%BLD_SUB%\test\build\natives
REM set LIB_DIR=..\%BLD_SUB%\test\build\natives
-REM set PATH=%JAVA_HOME%\bin;%ANT_PATH%\bin;c:\mingw\bin;%LIB_DIR%;%PATH%
-set PATH=%JAVA_HOME%\bin;%ANT_PATH%\bin;c:\mingw\bin;%PATH%
+REM set PATH=%JAVA_HOME%\bin;%ANT_PATH%\bin;c:\mingw64\bin;%LIB_DIR%;%PATH%
+set PATH=%JAVA_HOME%\bin;%ANT_PATH%\bin;c:\mingw64\bin;%PATH%
set CP_ALL=.;lib\junit.jar;%ANT_PATH%\lib\ant.jar;%ANT_PATH%\lib\ant-junit.jar;lib/semantic-versioning/semver.jar;lib\TestJarsInJar.jar;%BLD_DIR%\gluegen-rt.jar;%BLD_DIR%\gluegen.jar;%BLD_DIR%\gluegen-test-util.jar;%BLD_DIR%\test\build\gluegen-test.jar
diff --git a/make/scripts/make.gluegen.all.win32.bat b/make/scripts/make.gluegen.all.win32.bat index 54a6bca..f32c3cd 100755 --- a/make/scripts/make.gluegen.all.win32.bat +++ b/make/scripts/make.gluegen.all.win32.bat @@ -6,10 +6,10 @@ set ANT_PATH=C:\apache-ant-1.10.5 set GIT_PATH=C:\cygwin\bin
set SEVENZIP=C:\Program Files\7-Zip
-set CMAKE_PATH=C:\cmake-2.8.10.2-win32-x86
-set CMAKE_C_COMPILER=c:\mingw\bin\gcc
+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:\mingw\bin;%CMAKE_PATH%\bin;%GIT_PATH%;%SEVENZIP%;%PATH%
+set PATH=%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
diff --git a/make/scripts/make.gluegen.all.win64.bat b/make/scripts/make.gluegen.all.win64.bat index 1fea6c4..3601822 100755 --- a/make/scripts/make.gluegen.all.win64.bat +++ b/make/scripts/make.gluegen.all.win64.bat @@ -6,7 +6,7 @@ set ANT_PATH=C:\apache-ant-1.10.5 set GIT_PATH=C:\cygwin\bin
set SEVENZIP=C:\Program Files\7-Zip
-set CMAKE_PATH=C:\cmake-2.8.10.2-win32-x86
+set CMAKE_PATH=C:\cmake-3.15.2-win64-x64
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%
|