# HG changeset patch # User Pontos # Date 1274153379 10800 # Node ID 284fda52358fe91171f07381eb8dcf4cc5538313 # Parent fb5be83391cc0f33cd52d079c74dedf1c0067bd0 Made changes to hopefully get cross-compiling for Windows in Linux to work diff -r fb5be83391cc -r 284fda52358f CMakeLists.txt --- a/CMakeLists.txt Sat May 15 21:15:57 2010 -0500 +++ b/CMakeLists.txt Tue May 18 00:29:39 2010 -0300 @@ -123,6 +123,7 @@ if(WIN32) if(CMAKE_CROSSCOMPILING) + set(PLATFORM_LIBS "-Wl,--enable-auto-import") ADD_CUSTOM_COMMAND( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/lugaru_resource.obj COMMAND i686-pc-mingw32-windres -I${SRCDIR}/win-res diff -r fb5be83391cc -r 284fda52358f Source/OpenGL_Windows.cpp --- a/Source/OpenGL_Windows.cpp Sat May 15 21:15:57 2010 -0500 +++ b/Source/OpenGL_Windows.cpp Tue May 18 00:29:39 2010 -0300 @@ -122,7 +122,7 @@ #include #endif -#include "res/resource.h" +#include "win-res/resource.h" using namespace std; diff -r fb5be83391cc -r 284fda52358f Source/WinInput.cpp --- a/Source/WinInput.cpp Sat May 15 21:15:57 2010 -0500 +++ b/Source/WinInput.cpp Tue May 18 00:29:39 2010 -0300 @@ -23,7 +23,7 @@ #include "WinInput.h" #ifdef WIN32 -#include "String.h" +#include #else #include #include