Mercurial Mercurial > hedgewars / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
CMakeLists.txt
changeset 3199 1a9938a27677
parent 3198 6947d29c2a24
child 3205 ada12d757574 
--- a/CMakeLists.txt	Tue Mar 30 23:20:07 2010 +0000
+++ b/CMakeLists.txt	Tue Mar 30 23:29:30 2010 +0000
@@ -67,9 +67,7 @@
 	endif()
 
 	set(CMAKE_OSX_ARCHITECTURES "i386;ppc7400")
-	if(current_macosx_version MATCHES "10.6")
-		set(CMAKE_OSX_ARCHITECTURES "x86_64")
-	endif()
+
 
 	#create universal binaries only when it's time to bundle the application, also build server
 	IF(BUNDLE)
@@ -78,6 +76,10 @@
 			set(CMAKE_C_COMPILER "gcc-4.0")
 			set(CMAKE_CXX_COMPILER "g++-4.0")
 		endif()
+	ELSE()
+		if(current_macosx_version MATCHES "10.6")
+			set(CMAKE_OSX_ARCHITECTURES "x86_64")
+		endif()
 	ENDIF()	
 
 	message(STATUS "Target system: Mac OS X ${minimum_macosx} ${CMAKE_OSX_ARCHITECTURES}")
hedgewars