Merge.

[lugaru.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ad651c903a8734b27486d50860738642c9677558..3908731de22acb3dc43b0db7d334bc3f0e8add7e 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -5,10 +5,10 @@ cmake_minimum_required(VERSION 2.6)
 set(SRCDIR "${CMAKE_CURRENT_SOURCE_DIR}/Source")
 set(DEPDIR "${CMAKE_CURRENT_SOURCE_DIR}/Dependencies")
 
-if(NOT CMAKE_BUILD_TYPE)\r
-  set(CMAKE_BUILD_TYPE RelWithDebInfo CACHE STRING\r
-      "Choose the type of build, options are: None Debug Release RelWithDebInfo MinSizeRel"\r
-      FORCE)\r
+if(NOT CMAKE_BUILD_TYPE)
+  set(CMAKE_BUILD_TYPE RelWithDebInfo CACHE STRING
+      "Choose the type of build, options are: None Debug Release RelWithDebInfo MinSizeRel"
+      FORCE)
 endif(NOT CMAKE_BUILD_TYPE)
 
 if(NOT LUGARU_INSTALL_PREFIX)
@@ -97,7 +97,6 @@ set(LUGARU_H
        ${SRCDIR}/openal_wrapper.h
        ${SRCDIR}/gamegl.h
        ${SRCDIR}/glstubs.h
-       ${SRCDIR}/md5.h
        ${SRCDIR}/mmgr.h
        ${SRCDIR}/nommgr.h
        ${SRCDIR}/pack_private.h
@@ -162,7 +161,7 @@ if (NOT OPENAL_FOUND)
     set(OPENAL_INCLUDE_DIR "${OPENALDIR}/include/AL")
     set(OPENAL_LIBRARY "")
 
-    if (WINDOWS)
+    if (WIN32)
         set(LUGARU_HAS_INTERNAL_OPENAL True)
 #        if (MSVC)                     # !!! FIXME: package MSVC .dll and .lib for Windows?
 #            set(OPENAL_LIBRARY
@@ -174,7 +173,7 @@ if (NOT OPENAL_FOUND)
                 ${OPENALDIR}/lib/win32/mingw/libOpenAL32.dll.a
             )
         endif (MINGW)
-     endif(WINDOWS)
+     endif(WIN32)
 
     if (NOT LUGARU_HAS_INTERNAL_OPENAL)
         message(ERROR "We don't have a prebuilt OpenAL for this platform.")
@@ -202,21 +201,23 @@ if (NOT SDL_FOUND)
         )
     endif (APPLE)
 
-    if (WINDOWS)
+    if (WIN32)
         set(LUGARU_HAS_INTERNAL_SDL True)
         if (MSVC)
           set(SDL_LIBRARY
-              ${SDLDIR}/lib/win32/msvc/SDL.lib
               ${SDLDIR}/lib/win32/msvc/SDLmain.lib
+              ${SDLDIR}/lib/win32/msvc/SDL.lib
           )
         endif (MSVC)
         if (MINGW)
           set(SDL_LIBRARY
-              ${SDLDIR}/lib/win32/mingw/libSDL.dll.a
+              "mingw32"
               ${SDLDIR}/lib/win32/mingw/libSDLmain.a
+              ${SDLDIR}/lib/win32/mingw/libSDL.dll.a
+              "-mwindows"
           )
         endif (MINGW)
-    endif (WINDOWS)
+    endif (WIN32)
 
     if (NOT LUGARU_HAS_INTERNAL_SDL)
         message(ERROR "We don't have a prebuilt SDL for this platform.")