equal
deleted
inserted
replaced
65 if (minimum_macosx LESS "10.4") |
65 if (minimum_macosx LESS "10.4") |
66 set(FATAL "Hedgewars is not supported for pre-10.4 systems") |
66 set(FATAL "Hedgewars is not supported for pre-10.4 systems") |
67 endif() |
67 endif() |
68 |
68 |
69 set(CMAKE_OSX_ARCHITECTURES "i386;ppc7400") |
69 set(CMAKE_OSX_ARCHITECTURES "i386;ppc7400") |
70 if(current_macosx_version MATCHES "10.6") |
70 |
71 set(CMAKE_OSX_ARCHITECTURES "x86_64") |
|
72 endif() |
|
73 |
71 |
74 #create universal binaries only when it's time to bundle the application, also build server |
72 #create universal binaries only when it's time to bundle the application, also build server |
75 IF(BUNDLE) |
73 IF(BUNDLE) |
76 set(WITH_SERVER false) |
74 set(WITH_SERVER false) |
77 if(NOT minimum_macosx MATCHES "10.6") |
75 if(NOT minimum_macosx MATCHES "10.6") |
78 set(CMAKE_C_COMPILER "gcc-4.0") |
76 set(CMAKE_C_COMPILER "gcc-4.0") |
79 set(CMAKE_CXX_COMPILER "g++-4.0") |
77 set(CMAKE_CXX_COMPILER "g++-4.0") |
|
78 endif() |
|
79 ELSE() |
|
80 if(current_macosx_version MATCHES "10.6") |
|
81 set(CMAKE_OSX_ARCHITECTURES "x86_64") |
80 endif() |
82 endif() |
81 ENDIF() |
83 ENDIF() |
82 |
84 |
83 message(STATUS "Target system: Mac OS X ${minimum_macosx} ${CMAKE_OSX_ARCHITECTURES}") |
85 message(STATUS "Target system: Mac OS X ${minimum_macosx} ${CMAKE_OSX_ARCHITECTURES}") |
84 |
86 |