Mercurial Mercurial > hedgewars / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
restore tiger 10.4 deployment
authorkoda
Wed, 03 Mar 2010 23:04:24 +0000
changeset 2929 dd4efe601bc6
parent 2928 0e95e0e24fd8
child 2930 2106bfe3127d
restore tiger 10.4 deployment
CMakeLists.txt file | annotate | diff | comparison | revisions
hedgewars/CMakeLists.txt file | annotate | diff | comparison | revisions
misc/liblua/CMakeLists.txt file | annotate | diff | comparison | revisions 
--- a/CMakeLists.txt	Wed Mar 03 18:47:02 2010 +0000
+++ b/CMakeLists.txt	Wed Mar 03 23:04:24 2010 +0000
@@ -53,6 +53,10 @@
 		set(minimum_macosx ${current_macosx_version})
 	endif()
 
+	if (minimum_macosx LESS "10.4")
+		set(FATAL "Hedgewars is not supported for pre-10.4 systems")
+	endif()
+
 	if(current_macosx_version MATCHES "10.6")
 		set(CMAKE_OSX_ARCHITECTURES "x86_64")
 	endif()
@@ -60,7 +64,9 @@
 	#create universal binaries only when it's time to bundle the application, also build server
 	IF(BUNDLE)
 		set(WITH_SERVER false)
-		if(minimum_macosx NOT MATCHES "10.6")
+		if(NOT minimum_macosx MATCHES "10.6")
+			set(CMAKE_C_COMPILER "gcc-4.0")
+			set(CMAKE_CXX_COMPILER "g++-4.0")
 			set(CMAKE_OSX_ARCHITECTURES "i386;ppc7400")
 		endif()
 	ENDIF()	
--- a/hedgewars/CMakeLists.txt	Wed Mar 03 18:47:02 2010 +0000
+++ b/hedgewars/CMakeLists.txt	Wed Mar 03 23:04:24 2010 +0000
@@ -144,7 +144,7 @@
 	#let's build sdlmain, which is absent from the framework
 	find_package(SDL REQUIRED)
 
-	set(CMAKE_OSX_ARCHITECTURES "x86_64;i386;ppc7400")	
+#	set(CMAKE_OSX_ARCHITECTURES "x86_64;i386;ppc7400")
 	set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/bin)
 	include_directories(${SDL_INCLUDE_DIR})
 
@@ -153,7 +153,7 @@
 
 	#these are the dependencies for building a universal binary on Mac OS X
 	foreach (build_arch ${powerpc_build} ${i386_build} ${x86_64_build})
-		set(lipo_args_list "${EXECUTABLE_OUTPUT_PATH}/hwengine.${build_arch}")
+		set(lipo_args_list "${EXECUTABLE_OUTPUT_PATH}/hwengine.${build_arch}" ${lipo_args_list})
 		add_custom_command(OUTPUT "${EXECUTABLE_OUTPUT_PATH}/hwengine.${build_arch}"
 			COMMAND "${pascal_compiler}"
 			ARGS ${pascal_compiler_flags} -ohwengine.${build_arch} -P${build_arch}
--- a/misc/liblua/CMakeLists.txt	Wed Mar 03 18:47:02 2010 +0000
+++ b/misc/liblua/CMakeLists.txt	Wed Mar 03 23:04:24 2010 +0000
@@ -2,7 +2,7 @@
 set(LIBRARY_OUTPUT_PATH ${EXECUTABLE_OUTPUT_PATH})
 
 IF(APPLE)
-	set(CMAKE_OSX_ARCHITECTURES "x86_64;i386;ppc7400")	
+#	set(CMAKE_OSX_ARCHITECTURES "x86_64;i386;ppc7400")	
 	
 	set(build_type STATIC)
 	add_definitions(-DLUA_USE_LINUX)
hedgewars