summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--CMakeLists.txt10
-rw-r--r--src/CMakeLists.txt1
2 files changed, 8 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 77ee23cc8..4201602f2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,14 +2,20 @@
cmake_minimum_required (VERSION 2.6)
project (MCServer)
+if(WIN32)
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP")
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /MP")
+endif()
+
set(CMAKE_CXX_FLAGS_BAK ${CMAKE_CXX_FLAGS})
set(CMAKE_C_FLAGS_BAK ${CMAKE_C_FLAGS})
if (UNIX)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -w")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -w")
else()
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /w")
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /w")
+ #remove /W3 from command line -- cannot just cancel it later with /w like in unix because of D9025
+ string(REPLACE "/W3" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
+ string(REPLACE "/W3" "" CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
endif()
set(CMAKE_BUILD_TYPE_BAK ${CMAKE_BUILD_TYPE})
set(CMAKE_BUILD_TYPE "Release")
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index e247df34e..847ca59d5 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -37,7 +37,6 @@ endforeach(folder)
file(GLOB_RECURSE SOURCE
"*.cpp"
- "*.h"
)