large merge for kde 3d

2018-08-01 11:13:53 +02:00
parent 38042f8dad 713494a675
commit ca64256c48
4 changed files with 27 additions and 20 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -51,7 +51,12 @@ if ("${CMAKE_GENERATOR}" MATCHES "Visual Studio*")
 		-D_USE_MATH_DEFINES
 		-DUNICODE
 		-D_UNICODE
+		-DNOGDI
 	)
+	
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /permissive-")
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /Zc:__cplusplus")
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /std:c++17")	
 else()	
 	# system specific compiler flags
 	ADD_DEFINITIONS(
@@ -66,7 +71,7 @@ else()
 		-fstack-protector-all

 		-g3
-                -O2
+                #-O2
 		-march=native

 	)