diff options
| -rwxr-xr-x | build/bcmake | 6 | ||||
| -rw-r--r-- | build/toolchain.cmake | 4 | ||||
| -rw-r--r-- | packaging/windows/evol.nsi | 1 | ||||
| -rw-r--r-- | packaging/windows/setup.nsi | 1 | ||||
| -rw-r--r-- | src/inputmanager.h | 8 |
5 files changed, 15 insertions, 5 deletions
diff --git a/build/bcmake b/build/bcmake index b994ea7b6..e4ac00022 100755 --- a/build/bcmake +++ b/build/bcmake @@ -2,9 +2,9 @@ cd .. -export PATH=/usr/i586-mingw32msvc/bin:$PATH -export CXXFLAGS="-Wall -g1 -O3" +#export PATH=/usr/i586-mingw32msvc/bin:$PATH +export CXXFLAGS="-Wall -g1 -O3 -static-libstdc++" cmake -DCMAKE_TOOLCHAIN_FILE=build/toolchain.cmake . 2>build/make1.log -make -j5 VERBOSE=1 2>build/make.log +make -j5 VERBOSE=1 2>>build/make.log diff --git a/build/toolchain.cmake b/build/toolchain.cmake index 92415eb1e..1a40095cd 100644 --- a/build/toolchain.cmake +++ b/build/toolchain.cmake @@ -3,7 +3,7 @@ SET(CMAKE_SYSTEM_NAME Windows) # toolchain prefix, can be overridden by -DTOOLCHAIN=... # IF (NOT TOOLCHAIN) -SET(TOOLCHAIN "i586-mingw32msvc-") +SET(TOOLCHAIN "i686-w64-mingw32-") # ENDIF() # which compilers to use for C and C++ @@ -24,7 +24,7 @@ SET(SDL_INCLUDE_DIR ../mana_win/libs/include/SDL) SET(ENABLE_MANASERV OFF) # here is the target environment located -SET(CMAKE_FIND_ROOT_PATH /usr/i586-mingw32msvc /../mana_win/libs ) +SET(CMAKE_FIND_ROOT_PATH /usr/i686-w64-mingw32 /../mana_win/libs ) # adjust the default behaviour of the FIND_XXX() commands: # search headers and libraries in the target environment, search diff --git a/packaging/windows/evol.nsi b/packaging/windows/evol.nsi index 695051a15..debdfb296 100644 --- a/packaging/windows/evol.nsi +++ b/packaging/windows/evol.nsi @@ -252,6 +252,7 @@ Section "Core files (required)" SecCore File "${DLLDIR}\SDL_ttf.dll" File "${DLLDIR}\exchndl.dll" File "${DLLDIR}\libcurl-4.dll" + File "${DLLDIR}\libgcc_s_sjlj-1.dll" File "${DLLDIR}\libiconv-2.dll" File "${DLLDIR}\libintl-8.dll" File "${DLLDIR}\libjpeg-8.dll" diff --git a/packaging/windows/setup.nsi b/packaging/windows/setup.nsi index e96b9bd3c..689165699 100644 --- a/packaging/windows/setup.nsi +++ b/packaging/windows/setup.nsi @@ -249,6 +249,7 @@ Section "Core files (required)" SecCore File "${DLLDIR}\SDL_ttf.dll" File "${DLLDIR}\exchndl.dll" File "${DLLDIR}\libcurl-4.dll" + File "${DLLDIR}\libgcc_s_sjlj-1.dll" File "${DLLDIR}\libiconv-2.dll" File "${DLLDIR}\libintl-8.dll" File "${DLLDIR}\libjpeg-8.dll" diff --git a/src/inputmanager.h b/src/inputmanager.h index de5003a3b..4bcc85e84 100644 --- a/src/inputmanager.h +++ b/src/inputmanager.h @@ -31,6 +31,14 @@ #define KeyFunctionSize 3 +// hack to avoid conflicts with windows headers. +#ifdef INPUT_KEYBOARD +#undef INPUT_KEYBOARD +#endif +#ifdef INPUT_MOUSE +#undef INPUT_MOUSE +#endif + struct KeyData; class Setup_Input; |