projects
/
supertux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
1ac0892
)
Add math defines to all Win32. Fixes compilation errors on Windows with MSYS2
author
Tobias Markus
<tobbi.bugs@googlemail.com>
Thu, 12 Mar 2015 22:03:36 +0000
(23:03 +0100)
committer
Tobias Markus
<tobbi.bugs@googlemail.com>
Thu, 12 Mar 2015 22:03:36 +0000
(23:03 +0100)
CMakeLists.txt
patch
|
blob
|
history
diff --git
a/CMakeLists.txt
b/CMakeLists.txt
index
d6cc2da
..
c852121
100644
(file)
--- a/
CMakeLists.txt
+++ b/
CMakeLists.txt
@@
-181,10
+181,13
@@
include_directories (${CMAKE_CURRENT_SOURCE_DIR}/external/obstack/)
## MSVC Compatibility headers and definitions
IF(MSVC)
## MSVC Compatibility headers and definitions
IF(MSVC)
-include_directories (${CMAKE_CURRENT_SOURCE_DIR}/mk/msvc)
- ADD_DEFINITIONS(-D_USE_MATH_DEFINES -DNOMINMAX)
+ include_directories (${CMAKE_CURRENT_SOURCE_DIR}/mk/msvc)
ENDIF(MSVC)
ENDIF(MSVC)
+IF(WIN32)
+ ADD_DEFINITIONS(-D_USE_MATH_DEFINES -DNOMINMAX)
+ENDIF(WIN32)
+
## Build list of sources for supertux binary
FILE(GLOB SUPERTUX_SOURCES_C RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} external/obstack/*.c external/findlocale/findlocale.c)
## Build list of sources for supertux binary
FILE(GLOB SUPERTUX_SOURCES_C RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} external/obstack/*.c external/findlocale/findlocale.c)
@@
-257,6
+260,7
@@
endif(COMPILER_SUPPORTS_CXX11)
IF(CMAKE_COMPILER_IS_GNUCC)
IF(CMAKE_COMPILER_IS_GNUCC)
+ ADD_DEFINITIONS(-D_USE_MATH_DEFINES -DNOMINMAX)
SET(CMAKE_CXX_FLAGS_DEBUG "-O0 -g" CACHE STRING "Debug flags")
SET(CMAKE_C_FLAGS_DEBUG "-O0 -g" CACHE STRING "Debug flags")
SET(CMAKE_CXX_FLAGS_PROFILE "-pg" CACHE STRING "Profile flags")
SET(CMAKE_CXX_FLAGS_DEBUG "-O0 -g" CACHE STRING "Debug flags")
SET(CMAKE_C_FLAGS_DEBUG "-O0 -g" CACHE STRING "Debug flags")
SET(CMAKE_CXX_FLAGS_PROFILE "-pg" CACHE STRING "Profile flags")