[Performous-commit] Tapio Vierros : Some mingw32 build tweaks.

[Tapio V. <aa...@us...>]

Module: performous
Branch: master
Commit: 4aaebcb3cd0365fe2308ac96022f4a77e2a52f71

Author: Tapio Vierros <tap...@gm...>
Date:   Wed May 12 17:17:16 2010 +0300

Some mingw32 build tweaks.

---

 game/CMakeLists.txt          |    6 +++++-
 libs/libda/CMakeLists.txt    |    4 ++--
 libs/plugin++/CMakeLists.txt |    5 ++++-
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/game/CMakeLists.txt b/game/CMakeLists.txt
index a68b2af..17a11e7 100644
--- a/game/CMakeLists.txt
+++ b/game/CMakeLists.txt
@@ -121,7 +121,11 @@ endif()
 if(CMAKE_COMPILER_IS_GNUCXX)
 	message(STATUS "GCC detected, adding compile flags")
 	# -pedantic cannot be used because ffmpeg headers are b0rked
-	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pthread -std=c++98 -Wall -Wextra -Wno-missing-field-initializers")
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Wno-missing-field-initializers")
+	# -pthread is unrecognized on Windows and ansi standard causes errors
+	if(NOT WIN32)
+		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++98 -pthread")
+	endif(NOT WIN32)
 	# Needed for ffmpeg.cc to compile cleanly on OSX (it's a (unsigned long) long story)
 	add_definitions("-D__STDC_CONSTANT_MACROS")
 endif(CMAKE_COMPILER_IS_GNUCXX)
diff --git a/libs/libda/CMakeLists.txt b/libs/libda/CMakeLists.txt
index e6ea492..04997aa 100644
--- a/libs/libda/CMakeLists.txt
+++ b/libs/libda/CMakeLists.txt
@@ -48,9 +48,9 @@ endif()
 
 if(CMAKE_COMPILER_IS_GNUCXX)
 	message(STATUS "GCC detected, adding compile flags")
-	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++98 -Wall -Wextra")
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra")
 	if(NOT WIN32)
-		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pthread")
+		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++98 -pthread")
 	endif(NOT WIN32)
 endif(CMAKE_COMPILER_IS_GNUCXX)
 
diff --git a/libs/plugin++/CMakeLists.txt b/libs/plugin++/CMakeLists.txt
index 3821706..4dcf031 100644
--- a/libs/plugin++/CMakeLists.txt
+++ b/libs/plugin++/CMakeLists.txt
@@ -25,7 +25,10 @@ set(LIB_SUFFIX "" CACHE STRING "Optional suffix to use on lib folders (e.g. 64 f
 
 if(CMAKE_COMPILER_IS_GNUCXX)
 	message(STATUS "GCC detected, adding compile flags")
-	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++98 -Wall -Wextra")
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra")
+	if(NOT WIN32)
+		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++98")
+	endif(NOT WIN32)
 endif()
 
 add_library(plugin++ STATIC src/dll.cc src/execname.cc src/loader.cc)