In CMake scripts: New version number, fix MSVC stuff

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ec94768e0dc75f9cb35068dd3bd111f058ce3c53..ea8c9ee165f17f979d2f6eb9643c1dd27e636bad 100644 (file)
--- 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 92cf0fde962ca9d64f52b0fa07482c163899f24d..1d3218bcd67c8d8cab7a6cb74ecd2a2dc630a90d 100644 (file)
--- 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