Skip to content
Browse files

In CMake scripts: New version number, fix MSVC stuff

  • Loading branch information...
1 parent 9e46cbf commit 853a78681eea74103b5fd6294a2ef25e65a7f946 @celeron55 celeron55 committed Oct 14, 2011
Showing with 9 additions and 3 deletions.
  1. +4 −2 CMakeLists.txt
  2. +5 −1 src/CMakeLists.txt
View
6 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)
View
6 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

0 comments on commit 853a786

Please sign in to comment.
Something went wrong with that request. Please try again.