diff options
| author | Perttu Ahola <celeron55@gmail.com> | 2011-10-14 09:55:39 +0300 |
|---|---|---|
| committer | Perttu Ahola <celeron55@gmail.com> | 2011-10-14 09:55:39 +0300 |
| commit | 853a78681eea74103b5fd6294a2ef25e65a7f946 (patch) | |
| tree | 96666ea28ea2ca21ab19b1b5f85d5d383ed40ab5 | |
| parent | 9e46cbf7ea512330f35d0f2ede0c7c0c085c7cf4 (diff) | |
| download | minetest-853a78681eea74103b5fd6294a2ef25e65a7f946.tar.gz minetest-853a78681eea74103b5fd6294a2ef25e65a7f946.tar.bz2 minetest-853a78681eea74103b5fd6294a2ef25e65a7f946.zip | |
In CMake scripts: New version number, fix MSVC stuff
| -rw-r--r-- | CMakeLists.txt | 6 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 6 |
2 files changed, 9 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index ec94768e0..ea8c9ee16 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,10 +8,12 @@ endif(${CMAKE_VERSION} STREQUAL "2.8.2") project(minetest) set(VERSION_MAJOR 0) -set(VERSION_MINOR 2) -set(VERSION_PATCH 20110922_1) +set(VERSION_MINOR 3) +set(VERSION_PATCH dev-20111012a) set(VERSION_STRING "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}") +MESSAGE(STATUS "*** Will build version ${VERSION_STRING} ***") + # Configuration options if(WIN32) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 92cf0fde9..1d3218bcd 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -217,13 +217,17 @@ 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 /D NDEBUG /D _HAS_ITERATOR_DEBUGGING=0 /TP") + set(CMAKE_CXX_FLAGS_RELEASE "/EHa /O2 /Ob2 /Oi /Ot /Oy /GL /FD /MT /GS- /arch:SSE /fp:fast /D NDEBUG /D _HAS_ITERATOR_DEBUGGING=0 /TP") #set(CMAKE_EXE_LINKER_FLAGS_RELEASE "/LTCG /NODEFAULTLIB:\"libcmtd.lib\" /NODEFAULTLIB:\"libcmt.lib\"") set(CMAKE_EXE_LINKER_FLAGS_RELEASE "/LTCG") # Debug build doesn't catch exceptions by itself # Add some optimizations because otherwise it's VERY slow set(CMAKE_CXX_FLAGS_DEBUG "/MDd /Zi /Ob0 /Od /RTC1") + + # Flags for C files (sqlite) + # /MT = Link statically with standard library stuff + set(CMAKE_C_FLAGS_RELEASE "/O2 /Ob2 /MT") if(BUILD_SERVER) set_target_properties(${PROJECT_NAME}server PROPERTIES |