diff options
author | Perttu Ahola <celeron55@gmail.com> | 2011-01-18 15:05:29 +0200 |
---|---|---|
committer | Perttu Ahola <celeron55@gmail.com> | 2011-01-18 15:05:29 +0200 |
commit | 3ef2629e847e1e7e239068bbf17bebd6d4ebfc95 (patch) | |
tree | d540c1068747ce73862237d80d6d04b15fa58eac /src/CMakeLists.txt | |
parent | 515a480d0e82fe77f1aae8115e81d720d7d1775b (diff) | |
download | hax-minetest-server-3ef2629e847e1e7e239068bbf17bebd6d4ebfc95.tar.gz hax-minetest-server-3ef2629e847e1e7e239068bbf17bebd6d4ebfc95.zip |
made old build system to work too. the cmake one doesn't make working binaries for some computers.
--HG--
rename : src/config.h.in => src/cmake_config.h.in
Diffstat (limited to 'src/CMakeLists.txt')
-rw-r--r-- | src/CMakeLists.txt | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index c55b238e1..a9e3f2788 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -5,6 +5,9 @@ if(RUN_IN_PLACE) add_definitions ( -DRUN_IN_PLACE ) endif(RUN_IN_PLACE) +# Use cmake_config.h +add_definitions ( -DUSE_CMAKE_CONFIG_H ) + if(WIN32) # Windows # Surpress some warnings @@ -31,8 +34,8 @@ else() endif() configure_file( - "${PROJECT_SOURCE_DIR}/config.h.in" - "${PROJECT_BINARY_DIR}/config.h" + "${PROJECT_SOURCE_DIR}/cmake_config.h.in" + "${PROJECT_BINARY_DIR}/cmake_config.h" ) set(minetest_SRCS @@ -140,7 +143,7 @@ if(MSVC) # Visual Studio # EHa enables SEH exceptions (used for catching segfaults) - set(CMAKE_CXX_FLAGS_RELEASE "/EHa /MD /O2 /Ob2 /Oi /Ot /Oy /GL /FD /MT /GS- /arch:SSE /fp:fast") + set(CMAKE_CXX_FLAGS_RELEASE "/EHa /MD /O2 /Ob2 /Oi /Ot /Oy /GL /FD /MT /GS- /arch:SSE /fp:fast /D NDEBUG") set(CMAKE_CXX_FLAGS_DEBUG "/MDd /Zi /Ob0 /Od /RTC1") if(BUILD_SERVER) |