- final completion of tools now building in both linux and windows through cmake

2010-12-11 15:05:43 +00:00 · 2010-12-11 15:05:43 +00:00 · 1984c61386
parent 9cce656e65
commit 1984c61386
5 changed files with 131 additions and 35 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -7,7 +7,8 @@ SET(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/mk/cmake/Modules)
 IF(WIN32)
 	SET(CMAKE_LIBRARY_PATH ${CMAKE_LIBRARY_PATH}
 						   ${PROJECT_SOURCE_DIR}/source/win32_deps/lib
-						   ${PROJECT_SOURCE_DIR}/source/win32_deps/xerces-c-src_2_8_0/lib)
+						   ${PROJECT_SOURCE_DIR}/source/win32_deps/xerces-c-src_2_8_0/lib
+                                                   ${PROJECT_SOURCE_DIR}/source/win32_deps/wxWidgets-2.8.10/lib)

 	SET(CMAKE_INCLUDE_PATH ${CMAKE_INCLUDE_PATH}
 						   ${PROJECT_SOURCE_DIR}/source/win32_deps/include
@ -21,20 +22,19 @@ IF(WIN32)
 						   ${PROJECT_SOURCE_DIR}/source/win32_deps/zlib-1.2.5
 						   ${PROJECT_SOURCE_DIR}/source/win32_deps/curl-7.20.1/include
 						   ${PROJECT_SOURCE_DIR}/source/win32_deps/SDL-1.2.x/include
-						   )
+						   ${PROJECT_SOURCE_DIR}/source/win32_deps/wxWidgets-2.8.10/include)
 	link_directories(${PROJECT_SOURCE_DIR}/source/win32_deps/lib)
 	link_directories(${PROJECT_SOURCE_DIR}/source/win32_deps/xerces-c-src_2_8_0/lib)
+	link_directories(${PROJECT_SOURCE_DIR}/source/win32_deps/wxWidgets-2.8.10/lib)
 	include_directories("${PROJECT_SOURCE_DIR}/source/win32_deps/Microsoft\ DirectX\ SDK \(November 2007\)/Include")
 	include_directories(${PROJECT_SOURCE_DIR}/source/win32_deps/openal-soft-1.12.854/include)
 ENDIF()
 	   
 ADD_SUBDIRECTORY( source/shared_lib )
 ADD_SUBDIRECTORY( source/glest_game )
-IF(UNIX)
-	ADD_SUBDIRECTORY( source/glest_map_editor )
-	ADD_SUBDIRECTORY( source/g3d_viewer )
-	ADD_SUBDIRECTORY( source/configurator )
-ENDIF()
+ADD_SUBDIRECTORY( source/glest_map_editor )
+ADD_SUBDIRECTORY( source/g3d_viewer )
+ADD_SUBDIRECTORY( source/configurator )

 IF(APPLE)
 	include(mk/macosx/CMakeLists.txt)
--- a/source/configurator/CMakeLists.txt
+++ b/source/configurator/CMakeLists.txt
@ -10,16 +10,48 @@ FIND_PACKAGE(OpenGL REQUIRED)
 INCLUDE_DIRECTORIES(${OPENGL_INCLUDE_DIR})
 SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ${OPENGL_LIBRARY})

-FIND_PACKAGE(XercesC REQUIRED)
-INCLUDE_DIRECTORIES(${XERCESC_INCLUDE_DIR})
-SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ${XERCESC_LIBRARY})
+IF(NOT WIN32)

-# It was noticed that when using MinGW gcc it is essential that 'core' is mentioned before 'base'.
-FIND_PACKAGE(wxWidgets COMPONENTS core base gl REQUIRED)
-# wxWidgets include (this will do all the magic to configure everything)
-include( ${wxWidgets_USE_FILE} )
-#INCLUDE_DIRECTORIES(${WX_INCLUDE_DIR})
-SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ${wxWidgets_LIBRARIES})
+	FIND_PACKAGE(XercesC REQUIRED)
+	INCLUDE_DIRECTORIES(${XERCESC_INCLUDE_DIR})
+	SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ${XERCESC_LIBRARY})
+
+	# It was noticed that when using MinGW gcc it is essential that 'core' is mentioned before 'base'.
+	FIND_PACKAGE(wxWidgets COMPONENTS core base gl REQUIRED)
+	# wxWidgets include (this will do all the magic to configure everything)
+	include( ${wxWidgets_USE_FILE} )
+	#INCLUDE_DIRECTORIES(${WX_INCLUDE_DIR})
+	SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ${wxWidgets_LIBRARIES})
+ELSE()
+	SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ${PROJECT_SOURCE_DIR}/source/win32_deps/wxWidgets-2.8.10/lib/libwx_mswu-2.8-i586-mingw32msvc.a)
+	SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ${PROJECT_SOURCE_DIR}/source/win32_deps/wxWidgets-2.8.10/lib/libwx_mswu_gl-2.8-i586-mingw32msvc.a)
+	SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ${PROJECT_SOURCE_DIR}/source/win32_deps/wxWidgets-2.8.10/lib/libwxpng-2.8-i586-mingw32msvc.a)
+	SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ${PROJECT_SOURCE_DIR}/source/win32_deps/wxWidgets-2.8.10/lib/libwxjpeg-2.8-i586-mingw32msvc.a)
+	SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ${PROJECT_SOURCE_DIR}/source/win32_deps/wxWidgets-2.8.10/lib/libwxtiff-2.8-i586-mingw32msvc.a)
+	SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ${PROJECT_SOURCE_DIR}/source/win32_deps/wxWidgets-2.8.10/lib/libwxzlib-2.8-i586-mingw32msvc.a)
+
+	INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/source/win32_deps/wxWidgets-2.8.10/include/)
+	INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/source/win32_deps/wxWidgets-2.8.10/lib/wx/include/i586-mingw32msvc-msw-unicode-release-static-2.8)
+
+	SET(CMAKE_LIBRARY_PATH ${CMAKE_LIBRARY_PATH}
+			       ${PROJECT_SOURCE_DIR}/source/win32_deps/lib
+			       ${PROJECT_SOURCE_DIR}/source/win32_deps/xerces-c-src_2_8_0/lib)
+
+	INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/source/win32_deps/include)
+	INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/source/win32_deps/openal-soft-1.12.854/include)
+	INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/source/win32_deps/openal-soft-1.12.854)
+	INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/source/win32_deps/xerces-c-src_2_8_0/include)
+	INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/source/win32_deps/libogg-1.2.1/include)
+	INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/source/win32_deps/lua-5.1/src)
+	INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/source/win32_deps/jpeg-8b)
+	INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/source/win32_deps/lpng141)
+	INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/source/win32_deps/zlib-1.2.5)
+	INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/source/win32_deps/curl-7.20.1/include)
+	INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/source/win32_deps/SDL-1.2.x/include)
+			       
+	link_directories(${PROJECT_SOURCE_DIR}/source/win32_deps/lib)
+	link_directories(${PROJECT_SOURCE_DIR}/source/win32_deps/xerces-c-src_2_8_0/lib)
+ENDIF()

 #########################################################################################
 # glest configurator
--- a/source/g3d_viewer/CMakeLists.txt
+++ b/source/g3d_viewer/CMakeLists.txt
@ -10,16 +10,48 @@ FIND_PACKAGE(OpenGL REQUIRED)
 INCLUDE_DIRECTORIES(${OPENGL_INCLUDE_DIR})
 SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ${OPENGL_LIBRARY})

-FIND_PACKAGE(XercesC REQUIRED)
-INCLUDE_DIRECTORIES(${XERCESC_INCLUDE_DIR})
-SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ${XERCESC_LIBRARY})
+IF(NOT WIN32)

-# It was noticed that when using MinGW gcc it is essential that 'core' is mentioned before 'base'.
-FIND_PACKAGE(wxWidgets COMPONENTS core base gl REQUIRED)
-# wxWidgets include (this will do all the magic to configure everything)
-include( ${wxWidgets_USE_FILE} )
-#INCLUDE_DIRECTORIES(${WX_INCLUDE_DIR})
-SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ${wxWidgets_LIBRARIES})
+	FIND_PACKAGE(XercesC REQUIRED)
+	INCLUDE_DIRECTORIES(${XERCESC_INCLUDE_DIR})
+	SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ${XERCESC_LIBRARY})
+
+	# It was noticed that when using MinGW gcc it is essential that 'core' is mentioned before 'base'.
+	FIND_PACKAGE(wxWidgets COMPONENTS core base gl REQUIRED)
+	# wxWidgets include (this will do all the magic to configure everything)
+	include( ${wxWidgets_USE_FILE} )
+	#INCLUDE_DIRECTORIES(${WX_INCLUDE_DIR})
+	SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ${wxWidgets_LIBRARIES})
+ELSE()
+	SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ${PROJECT_SOURCE_DIR}/source/win32_deps/wxWidgets-2.8.10/lib/libwx_mswu-2.8-i586-mingw32msvc.a)
+	SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ${PROJECT_SOURCE_DIR}/source/win32_deps/wxWidgets-2.8.10/lib/libwx_mswu_gl-2.8-i586-mingw32msvc.a)
+	SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ${PROJECT_SOURCE_DIR}/source/win32_deps/wxWidgets-2.8.10/lib/libwxpng-2.8-i586-mingw32msvc.a)
+	SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ${PROJECT_SOURCE_DIR}/source/win32_deps/wxWidgets-2.8.10/lib/libwxjpeg-2.8-i586-mingw32msvc.a)
+	SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ${PROJECT_SOURCE_DIR}/source/win32_deps/wxWidgets-2.8.10/lib/libwxtiff-2.8-i586-mingw32msvc.a)
+	SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ${PROJECT_SOURCE_DIR}/source/win32_deps/wxWidgets-2.8.10/lib/libwxzlib-2.8-i586-mingw32msvc.a)
+
+	INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/source/win32_deps/wxWidgets-2.8.10/include/)
+	INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/source/win32_deps/wxWidgets-2.8.10/lib/wx/include/i586-mingw32msvc-msw-unicode-release-static-2.8)
+
+	SET(CMAKE_LIBRARY_PATH ${CMAKE_LIBRARY_PATH}
+			       ${PROJECT_SOURCE_DIR}/source/win32_deps/lib
+			       ${PROJECT_SOURCE_DIR}/source/win32_deps/xerces-c-src_2_8_0/lib)
+
+	INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/source/win32_deps/include)
+	INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/source/win32_deps/openal-soft-1.12.854/include)
+	INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/source/win32_deps/openal-soft-1.12.854)
+	INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/source/win32_deps/xerces-c-src_2_8_0/include)
+	INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/source/win32_deps/libogg-1.2.1/include)
+	INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/source/win32_deps/lua-5.1/src)
+	INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/source/win32_deps/jpeg-8b)
+	INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/source/win32_deps/lpng141)
+	INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/source/win32_deps/zlib-1.2.5)
+	INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/source/win32_deps/curl-7.20.1/include)
+	INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/source/win32_deps/SDL-1.2.x/include)
+			       
+	link_directories(${PROJECT_SOURCE_DIR}/source/win32_deps/lib)
+	link_directories(${PROJECT_SOURCE_DIR}/source/win32_deps/xerces-c-src_2_8_0/lib)
+ENDIF()

 #########################################################################################
 # glest G3d Model Viewer
--- a/source/glest_map_editor/CMakeLists.txt
+++ b/source/glest_map_editor/CMakeLists.txt
@ -10,12 +10,44 @@ FIND_PACKAGE(OpenGL REQUIRED)
 INCLUDE_DIRECTORIES(${OPENGL_INCLUDE_DIR})
 SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ${OPENGL_LIBRARY})

-# It was noticed that when using MinGW gcc it is essential that 'core' is mentioned before 'base'.
-FIND_PACKAGE(wxWidgets COMPONENTS core base gl REQUIRED)
-# wxWidgets include (this will do all the magic to configure everything)
-include( ${wxWidgets_USE_FILE} )
-#INCLUDE_DIRECTORIES(${WX_INCLUDE_DIR})
-SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ${wxWidgets_LIBRARIES})
+IF(NOT WIN32)
+	# It was noticed that when using MinGW gcc it is essential that 'core' is mentioned before 'base'.
+	FIND_PACKAGE(wxWidgets COMPONENTS core base gl REQUIRED)
+
+	# wxWidgets include (this will do all the magic to configure everything)
+	include( ${wxWidgets_USE_FILE} )
+	#INCLUDE_DIRECTORIES(${WX_INCLUDE_DIR})
+	SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ${wxWidgets_LIBRARIES})
+ELSE()
+	SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ${PROJECT_SOURCE_DIR}/source/win32_deps/wxWidgets-2.8.10/lib/libwx_mswu-2.8-i586-mingw32msvc.a)
+	SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ${PROJECT_SOURCE_DIR}/source/win32_deps/wxWidgets-2.8.10/lib/libwx_mswu_gl-2.8-i586-mingw32msvc.a)
+	SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ${PROJECT_SOURCE_DIR}/source/win32_deps/wxWidgets-2.8.10/lib/libwxpng-2.8-i586-mingw32msvc.a)
+	SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ${PROJECT_SOURCE_DIR}/source/win32_deps/wxWidgets-2.8.10/lib/libwxjpeg-2.8-i586-mingw32msvc.a)
+	SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ${PROJECT_SOURCE_DIR}/source/win32_deps/wxWidgets-2.8.10/lib/libwxtiff-2.8-i586-mingw32msvc.a)
+	SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ${PROJECT_SOURCE_DIR}/source/win32_deps/wxWidgets-2.8.10/lib/libwxzlib-2.8-i586-mingw32msvc.a)
+
+	INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/source/win32_deps/wxWidgets-2.8.10/include/)
+	INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/source/win32_deps/wxWidgets-2.8.10/lib/wx/include/i586-mingw32msvc-msw-unicode-release-static-2.8)
+
+	SET(CMAKE_LIBRARY_PATH ${CMAKE_LIBRARY_PATH}
+			       ${PROJECT_SOURCE_DIR}/source/win32_deps/lib
+			       ${PROJECT_SOURCE_DIR}/source/win32_deps/xerces-c-src_2_8_0/lib)
+
+	INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/source/win32_deps/include)
+	INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/source/win32_deps/openal-soft-1.12.854/include)
+	INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/source/win32_deps/openal-soft-1.12.854)
+	INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/source/win32_deps/xerces-c-src_2_8_0/include)
+	INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/source/win32_deps/libogg-1.2.1/include)
+	INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/source/win32_deps/lua-5.1/src)
+	INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/source/win32_deps/jpeg-8b)
+	INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/source/win32_deps/lpng141)
+	INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/source/win32_deps/zlib-1.2.5)
+	INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/source/win32_deps/curl-7.20.1/include)
+	INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/source/win32_deps/SDL-1.2.x/include)
+			       
+	link_directories(${PROJECT_SOURCE_DIR}/source/win32_deps/lib)
+	link_directories(${PROJECT_SOURCE_DIR}/source/win32_deps/xerces-c-src_2_8_0/lib)
+ENDIF()

 #########################################################################################
 # glest map editor
--- a/source/shared_lib/CMakeLists.txt
+++ b/source/shared_lib/CMakeLists.txt
@ -12,7 +12,8 @@ SET(EXTERNAL_LIBS "")
 IF(WIN32)
 	SET(CMAKE_LIBRARY_PATH ${CMAKE_LIBRARY_PATH}
 				${PROJECT_SOURCE_DIR}/source/win32_deps/lib
-				${PROJECT_SOURCE_DIR}/source/win32_deps/xerces-c-src_2_8_0/lib)
+				${PROJECT_SOURCE_DIR}/source/win32_deps/xerces-c-src_2_8_0/lib
+				${PROJECT_SOURCE_DIR}/source/win32_deps/wxWidgets-2.8.10/lib)

 	INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/source/win32_deps/include)
 	INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/source/win32_deps/openal-soft-1.12.854/include)
@ -25,16 +26,17 @@ IF(WIN32)
 	INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/source/win32_deps/zlib-1.2.5)
 	INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/source/win32_deps/curl-7.20.1/include)
 	INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/source/win32_deps/SDL-1.2.x/include)
+	INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/source/win32_deps/wxWidgets-2.8.10/include)
 			       
 	link_directories(${PROJECT_SOURCE_DIR}/source/win32_deps/lib)
 	link_directories(${PROJECT_SOURCE_DIR}/source/win32_deps/xerces-c-src_2_8_0/lib)
+	link_directories(${PROJECT_SOURCE_DIR}/source/win32_deps/wxWidgets-2.8.10/lib)
 ENDIF()

 IF(WIN32)
 	INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/source/win32_deps/include)
 	INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/source/shared_lib/include/platform/posix)
 	INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/source/shared_lib/include/platform/win32)
-	#SET(OPENAL_INCLUDE_DIR ${PROJECT_SOURCE_DIR}/source/win32_deps/openal-soft-1.12.854/include)
 ENDIF()

 FIND_PACKAGE(SDL REQUIRED)
@ -220,5 +222,3 @@ ENDIF()
 TARGET_LINK_LIBRARIES(libglest streflop)
 TARGET_LINK_LIBRARIES(libglest ${EXTERNAL_LIBS})

-
-