From 195d6cded05f7ef5bde695ee047b341a0265eab3 Mon Sep 17 00:00:00 2001
From: Piotr Dziwinski <piotrdz@gmail.com>
Date: Sun, 24 Mar 2013 00:03:37 +0100
Subject: Fixed timer functions on win32

 * changed win32 implementation to QueryPerformaceTimer system function
 * refactored system utils code
 * proper tests for time utils and update event creation in application
 * should fix issue #134
---
 CMakeLists.txt | 43 ++++++++++++++++++++++++-------------------
 1 file changed, 24 insertions(+), 19 deletions(-)

(limited to 'CMakeLists.txt')

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 607df20..48a47bb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -94,14 +94,6 @@ option(INSTALL_DOCS "Install Doxygen-generated documentation" OFF)
 option(OPENAL_SOUND "Build openal sound support" OFF)
 
 
-# Hacks for MSYS
-if (MSYS)
-    set(COLOBOT_CXX_FLAGS "${COLOBOT_CXX_FLAGS} -U__STRICT_ANSI__") # fixes putenv()
-    set(USE_SDL_MAIN 1) # fixes SDL_main
-    set(DESKTOP OFF) # MSYS doesn't have the necessary tools
-endif()
-
-
 ##
 # Searching for packages
 ##
@@ -131,35 +123,24 @@ if (${OPENAL_SOUND})
 endif()
 
 
-##
-# Additional settings to use when cross-compiling with MXE (http://mxe.cc/)
-##
-
-include("${colobot_SOURCE_DIR}/cmake/mxe.cmake")
-
-
 ##
 # Platform detection and some related checks
 ##
 
 if (${CMAKE_SYSTEM_NAME} MATCHES "Windows")
-    message(STATUS "Windows system detected")
     set(PLATFORM_WINDOWS 1)
     set(PLATFORM_LINUX   0)
     set(PLATFORM_OTHER   0)
 elseif(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
-    message(STATUS "Linux system detected")
     set(PLATFORM_WINDOWS 0)
     set(PLATFORM_LINUX   1)
     set(PLATFORM_OTHER   0)
 else()
-    message(STATUS "Other system detected")
     set(PLATFORM_WINDOWS 0)
     set(PLATFORM_LINUX   0)
     set(PLATFORM_OTHER   1)
 endif()
 
-
 if(NOT ${ASSERTS})
     add_definitions(-DNDEBUG)
 endif()
@@ -171,6 +152,30 @@ else()
 endif()
 
 
+##
+# Additional settings to use when cross-compiling with MXE (http://mxe.cc/)
+##
+
+include("${colobot_SOURCE_DIR}/cmake/mxe.cmake")
+
+##
+# Additional settings for MSYS
+##
+include("${colobot_SOURCE_DIR}/cmake/msys.cmake")
+
+
+##
+# Summary of detected things
+##
+if (${PLATFORM_WINDOWS})
+    message(STATUS "Build for Windows system")
+elseif(${PLATFORM_LINUX})
+    message(STATUS "Build for Linux system")
+else()
+    message(STATUS "Build for other system")
+endif()
+
+
 ##
 # Doxygen docs
 ##
-- 
cgit v1.2.3-1-g7c22