X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FCMakeLists.txt;h=b159c58c6e747cc731f29f61663f60966547ace6;hb=612415ff494c29cf2fc7ea560da9908eaff7d847;hp=0e8e9bacbf561274a3fa8e8e130d1d004af7c84b;hpb=2e284d5574d29547f984cd625a76ef6266050abf;p=lugaru.git

diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt
index 0e8e9ba..b159c58 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
@@ -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,16 +98,54 @@ 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"
 		CarbonStdCLib.h)
 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
+						  )
+  endif(NOT CMAKE_CROSSCOMPILING)
+
+  set(LUGARU_SRCS
+	${LUGARU_SRCS}
+	WinDefs.cpp)
+
+  set(LUGARU_H
+	${LUGARU_H}
+	WinDefs.h
+	res/resource.h)
+endif(WIN32)
+
+if(WIN32)
+add_executable(lugaru ${LUGARU_SRCS} ${LUGARU_H} lugaru_resource.obj)
+else(WIN32)
 add_executable(lugaru ${LUGARU_SRCS} ${LUGARU_H})
+endif(WIN32)
+
 target_link_libraries(lugaru ${LUGARU_LIBS})
 
-add_definitions(-DPLATFORM_LINUX=1 -DPLATFORM_UNIX=1 -DUSE_OPENAL=1 -DUSE_SDL=1 -DBinIO_STDINT_HEADER=<stdint.h>)
+if(WIN32)
+	add_definitions(-DUSE_OPENAL=1 -DUSE_SDL=1 -DBinIO_STDINT_HEADER=<stdint.h>)
+else(WIN32)
+	add_definitions(-DPLATFORM_LINUX=1 -DPLATFORM_UNIX=1 -DUSE_OPENAL=1 -DUSE_SDL=1 -DBinIO_STDINT_HEADER=<stdint.h>)
+endif(WIN32)
+