X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FCMakeLists.txt;h=f48fdbe8a934d849938bbceb7beb5fa787306621;hb=83dd4aeb0f3deef28f2bbda315a6fb7add8c79e9;hp=b2ffe3f1d9f62b9d5050c301895d693d2275ee8c;hpb=9a5f2758e538d9216d255b4797f042a1b6874272;p=lugaru.git

diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt
index b2ffe3f..f48fdbe 100644
--- 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,23 +105,23 @@ if(CMAKE_HOST_APPLE)
 endif(CMAKE_HOST_APPLE)
 
 if(WIN32)
-  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
-						  )
+  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
@@ -138,7 +131,7 @@ if(WIN32)
   set(LUGARU_H
 	${LUGARU_H}
 	WinDefs.h
-	res/lugaru.h)
+	res/resource.h)
 endif(WIN32)
 
 if(WIN32)