diff options
| author | Sven Gothel <[email protected]> | 2023-05-04 01:50:10 +0200 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2023-05-04 01:50:10 +0200 |
| commit | 704cadb26e1b98e613a4faea94d9b8d7e308d1ea (patch) | |
| tree | 091f345ec19beade255b23490e512f61fbb9d7bf | |
| parent | b32e378ec80488c5ffbd0d9bb356217e6db0245f (diff) | |
HowToBuild: Windows: We use MinGW64 w/ 'posix threads' instead of 'win32 threads', allowing C++ std::mutex etc to be used (openal-soft)
| -rw-r--r-- | doc/HowToBuild.html | 13 | ||||
| -rwxr-xr-x | make/scripts/make.gluegen.all.win64.bat | 2 |
2 files changed, 12 insertions, 3 deletions
diff --git a/doc/HowToBuild.html b/doc/HowToBuild.html index 8ce7c5d..f4e32a7 100644 --- a/doc/HowToBuild.html +++ b/doc/HowToBuild.html @@ -166,15 +166,24 @@ apt-get install kernel-package build-essential <li>gawk is provided by <a href="https://cygwin.com">cygwin</a></li> <li> <a href="http://mingw-w64.org/">MinGW64</a> (<a href="https://github.com/niXman/mingw-builds-binaries/releases">files on github</a>) <ul> - <li> <a href="https://github.com/niXman/mingw-builds-binaries/releases/download/12.2.0-rt_v10-rev2/x86_64-12.2.0-release-win32-seh-msvcrt-rt_v10-rev2.7z">x86_64-12.2.0-release-win32-seh-msvcrt-rt_v10-rev2.7z</a> + <li> <a href="https://github.com/niXman/mingw-builds-binaries/releases/download/12.2.0-rt_v10-rev2/x86_64-12.2.0-release-posix-seh-msvcrt-rt_v10-rev2.7z">x86_64-12.2.0-release-posix-seh-msvcrt-rt_v10-rev2.7z</a> <ul> <li>version: 12.2.0</li> <li>host: x64</li> - <li>threading: win32</li> + <li>threading: posix</li> <li>exceptions: seh</li> <li>c-runtime: msvcrt</li> <li>revision: 2</li> </ul></li> + <li> <s><a href="https://github.com/niXman/mingw-builds-binaries/releases/download/12.2.0-rt_v10-rev2/x86_64-12.2.0-release-win32-seh-msvcrt-rt_v10-rev2.7z">x86_64-12.2.0-release-win32-seh-msvcrt-rt_v10-rev2.7z</a> + <ul> + <li>version: 12.2.0</li> + <li>host: x64</li> + <li>threading: win32</li> + <li>exceptions: seh</li> + <li>c-runtime: msvcrt</li> + <li>revision: 2</li> + </ul></s></li> </ul> </li> <li><a href="https://cmake.org/">CMake 3.25.1</a> 64bit version</li> diff --git a/make/scripts/make.gluegen.all.win64.bat b/make/scripts/make.gluegen.all.win64.bat index 6f3716e..b0dc64e 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:\cygwin64\bin
set SEVENZIP=C:\Program Files\7-Zip
-set CMAKE_PATH=C:\cmake-3.25.1-windows-x64_64
+set CMAKE_PATH=C:\cmake-3.25.1-windows-x86_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%
|