Merge.

[lugaru.git] / Source / CMakeLists.txt

diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt
index b0c4cabd05e392ae61350554dae42dd785b83d94..b159c58c6e747cc731f29f61663f60966547ace6 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
@@ -54,8 +53,7 @@ set(LUGARU_SRCS
        unpack_private.c
        Weapons.cpp
        MacCompatibility.cpp
-       logger/logger.cpp
-       OpenGL_Windows.cpp 
+       OpenGL_Windows.cpp
        openal_wrapper.cpp
        WinInput.cpp)
 
@@ -66,9 +64,7 @@ set(LUGARU_H
        Lights.h
        LinkedList.h
        MacCompatibility.h
-       MacInput.h
        Models.h
-       MoreFilesX.h
        Objects.h
        Person.h
        PhysicsMath.h
@@ -102,9 +98,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"
@@ -131,9 +125,14 @@ if(WIN32)
                                                  )\r
   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)