Kill Windows line endings in the middle of the file

[lugaru.git] / Source / CMakeLists.txt

diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt
index b0c4cabd05e392ae61350554dae42dd785b83d94..f48fdbe8a934d849938bbceb7beb5fa787306621 100644 (file)
--- a/Source/CMakeLists.txt
+++ b/Source/CMakeLists.txt
@@ -7,7 +7,6 @@ set(LUGARU_SRCS
        Lights.cpp
        Models.cpp
        Objects.cpp
-       OpenGL_Full_Screen.cpp
        OpenGL_Windows.cpp
        Person.cpp
        Quaternions.cpp
@@ -53,9 +52,7 @@ set(LUGARU_SRCS
        unpack.c
        unpack_private.c
        Weapons.cpp
-       MacCompatibility.cpp
-       logger/logger.cpp
-       OpenGL_Windows.cpp 
+       OpenGL_Windows.cpp
        openal_wrapper.cpp
        WinInput.cpp)
 
@@ -66,9 +63,7 @@ set(LUGARU_H
        Lights.h
        LinkedList.h
        MacCompatibility.h
-       MacInput.h
        Models.h
-       MoreFilesX.h
        Objects.h
        Person.h
        PhysicsMath.h
@@ -102,9 +97,7 @@ set(LUGARU_H
 if(CMAKE_HOST_APPLE)
        set(LUGARU_SRCS
                ${LUGARU_SRCS}
-               MacCompatibility.cpp
-               MoreFilesX.c
-               MacInput.cpp)
+               MacCompatibility.cpp)
        set(LUGARU_H
                ${LUGARU_H}
                "Carbon Include.h"
@@ -112,28 +105,33 @@ if(CMAKE_HOST_APPLE)
 endif(CMAKE_HOST_APPLE)
 
 if(WIN32)
-  if(CMAKE_CROSSCOMPILING)\r
-    ADD_CUSTOM_COMMAND( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/lugaru_resource.obj\r
-                                                 COMMAND i686-pc-mingw32-windres\r
-                                                         -I${CMAKE_CURRENT_SOURCE_DIR}/res\r
-                                                         -o ${CMAKE_CURRENT_BINARY_DIR}/lugaru_resource.obj\r
-                                                         -i${CMAKE_CURRENT_SOURCE_DIR}/res/lugaru.rc\r
-                                             DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/res/lugaru.rc\r
-                                                 )\r
-  endif(CMAKE_CROSSCOMPILING)\r
-  if(NOT CMAKE_CROSSCOMPILING)\r
-    ADD_CUSTOM_COMMAND( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/lugaru_resource.obj\r
-                                                 COMMAND windres\r
-                                                         -I${CMAKE_CURRENT_SOURCE_DIR}/res\r
-                                                         -o ${CMAKE_CURRENT_BINARY_DIR}/lugaru_resource.obj\r
-                                                         -i${CMAKE_CURRENT_SOURCE_DIR}/res/lugaru.rc\r
-                                             DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/res/lugaru.rc\r
-                                                 )\r
+  if(CMAKE_CROSSCOMPILING)
+    ADD_CUSTOM_COMMAND( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/lugaru_resource.obj
+                                                 COMMAND i686-pc-mingw32-windres
+                                                         -I${CMAKE_CURRENT_SOURCE_DIR}/res
+                                                         -o ${CMAKE_CURRENT_BINARY_DIR}/lugaru_resource.obj
+                                                         -i${CMAKE_CURRENT_SOURCE_DIR}/res/lugaru.rc
+                                             DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/res/lugaru.rc
+                                                 )
+  endif(CMAKE_CROSSCOMPILING)
+  if(NOT CMAKE_CROSSCOMPILING)
+    ADD_CUSTOM_COMMAND( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/lugaru_resource.obj
+                                                 COMMAND windres
+                                                         -I${CMAKE_CURRENT_SOURCE_DIR}/res
+                                                         -o ${CMAKE_CURRENT_BINARY_DIR}/lugaru_resource.obj
+                                                         -i${CMAKE_CURRENT_SOURCE_DIR}/res/lugaru.rc
+                                             DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/res/lugaru.rc
+                                                 )
   endif(NOT CMAKE_CROSSCOMPILING)
 
+  set(LUGARU_SRCS
+       ${LUGARU_SRCS}
+       WinDefs.cpp)
+
   set(LUGARU_H
        ${LUGARU_H}
-       res/lugaru.h)
+       WinDefs.h
+       res/resource.h)
 endif(WIN32)
 
 if(WIN32)