mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #1946 from Gymnasiast/mingw-fix 

Take out MinGW error preventing Linux from being detected, closes #1626
This commit is contained in:
Ted John 2015-09-20 11:07:36 +01:00
parent 22196d931d c86f07bbba
commit 46a4b47715
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CMakeLists_mingw.txt
View File

@ -1,3 +1,4 @@
SET(ACTUAL_SYSTEM ${CMAKE_SYSTEM_NAME})
SET(CMAKE_SYSTEM_NAME Windows)
SET(COMPILER_PREFIX i686-w64-mingw32)
@ -12,11 +13,11 @@ SET(PKG_CONFIG_EXECUTABLE ${COMPILER_PREFIX}-pkg-config)
#
set(CMAKE_C_FLAGS "-masm=intel -std=gnu99 -fpack-struct=1" CACHE STRING "" FORCE)
set(CMAKE_CXX_FLAGS "-masm=intel -std=c++0x -std=gnu++0x -fpack-struct=1" CACHE STRING "" FORCE)
if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
if(${ACTUAL_SYSTEM} MATCHES "Linux")
set(CMAKE_SHARED_LINKER_FLAGS "-O3 -static-libgcc -static-libstdc++ -static -lpthread" CACHE STRING "" FORCE)
else()
set(CMAKE_SHARED_LINKER_FLAGS "-static-libgcc -static-libstdc++" CACHE STRING "" FORCE)
endif(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
endif(${ACTUAL_SYSTEM} MATCHES "Linux")
# find and include SDL2
INCLUDE(FindPkgConfig)