equal
deleted
inserted
replaced
41 endif() |
41 endif() |
42 |
42 |
43 #create universal binaries only when it's time to bundle the application |
43 #create universal binaries only when it's time to bundle the application |
44 IF(BUNDLE) |
44 IF(BUNDLE) |
45 if(current_macosx_version MATCHES "10.6") |
45 if(current_macosx_version MATCHES "10.6") |
46 set(CMAKE_OSX_ARCHITECTURES "x86_64;i386;ppc7400") |
46 set(CMAKE_OSX_ARCHITECTURES "x86_64;i386;ppc7400") |
47 set(build_x86_64 TRUE) |
|
48 set(build_i386 TRUE) |
|
49 set(build_ppc TRUE) |
|
50 else() |
47 else() |
51 set(CMAKE_OSX_ARCHITECTURES "i386;ppc7400") |
48 set(CMAKE_OSX_ARCHITECTURES "i386;ppc7400") |
52 set(build_i386 TRUE) |
|
53 set(build_ppc TRUE) |
|
54 endif() |
49 endif() |
55 ELSE() |
50 ELSEIF(NOT CMAKE_OSX_ARCHITECTURES) |
56 set(build_i386 TRUE) |
51 EXEC_PROGRAM("/usr/bin/uname" ARGS "-p" OUTPUT_VARIABLE ARCH_TYPE) |
|
52 set(CMAKE_OSX_ARCHITECTURES "${ARCH_TYPE}") |
57 ENDIF() |
53 ENDIF() |
58 |
54 |
59 message(STATUS "Target system: Mac OS X ${minimum_macosx} for ${CMAKE_OSX_ARCHITECTURES}") |
55 message(STATUS "Target system: Mac OS X ${minimum_macosx} ${CMAKE_OSX_ARCHITECTURES}") |
60 |
56 |
61 if(minimum_macosx MATCHES "10.4") |
57 if(minimum_macosx MATCHES "10.4") |
62 set(CMAKE_OSX_SYSROOT "/Developer/SDKs/MacOSX10.4u.sdk/") |
58 set(CMAKE_OSX_SYSROOT "/Developer/SDKs/MacOSX10.4u.sdk/") |
63 else() |
59 else() |
64 set(CMAKE_OSX_SYSROOT "/Developer/SDKs/MacOSX${minimum_macosx}.sdk/") |
60 set(CMAKE_OSX_SYSROOT "/Developer/SDKs/MacOSX${minimum_macosx}.sdk/") |
94 set(CMAKE_CXX_FLAGS ${CMAKE_C_FLAGS}) |
90 set(CMAKE_CXX_FLAGS ${CMAKE_C_FLAGS}) |
95 set(CMAKE_CXX_FLAGS_RELEASE ${CMAKE_C_FLAGS_RELEASE}) |
91 set(CMAKE_CXX_FLAGS_RELEASE ${CMAKE_C_FLAGS_RELEASE}) |
96 set(CMAKE_CXX_FLAGS_DEBUG ${CMAKE_C_FLAGS_DEBUG}) |
92 set(CMAKE_CXX_FLAGS_DEBUG ${CMAKE_C_FLAGS_DEBUG}) |
97 |
93 |
98 set(pascal_compiler_flags_cmn "-B" "-FE../bin" "-Fl../bin/" "-Cs2000000" "-vwi") |
94 set(pascal_compiler_flags_cmn "-B" "-FE../bin" "-Fl../bin/" "-Cs2000000" "-vwi") |
|
95 if(LOWRES) |
|
96 set(pascal_compiler_flags_cmn "-dLOWRES" ${pascal_compiler_flags_cmn}) |
|
97 add_definitions(-DLOWRES) |
|
98 endif(LOWRES) |
99 |
99 |
100 if(Optz) |
100 if(Optz) |
101 set(pascal_compiler_flags_cmn "-O2" "-Xs" "-Si" ${pascal_compiler_flags_cmn}) |
101 set(pascal_compiler_flags_cmn "-O2" "-Xs" "-Si" ${pascal_compiler_flags_cmn}) |
102 set(haskell_compiler_flags_cmn "-w" "-O2") |
102 set(haskell_compiler_flags_cmn "-w" "-O2") |
103 else(Optz) |
103 else(Optz) |
106 endif(Optz) |
106 endif(Optz) |
107 |
107 |
108 |
108 |
109 if(DEFINED DATA_INSTALL_DIR) |
109 if(DEFINED DATA_INSTALL_DIR) |
110 set(SHAREPATH ${DATA_INSTALL_DIR}/hedgewars/) |
110 set(SHAREPATH ${DATA_INSTALL_DIR}/hedgewars/) |
111 else(DEFINED DATA_INSTALL_DIR) |
111 else() |
112 set(SHAREPATH share/hedgewars/) |
112 set(SHAREPATH share/hedgewars/) |
113 endif(DEFINED DATA_INSTALL_DIR) |
113 endif() |
114 set(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin) |
114 set(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin) |
115 |
115 |
116 set(HEDGEWARS_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}") |
116 set(HEDGEWARS_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}") |
117 set(HEDGEWARS_PROTO_VER 30) |
117 set(HEDGEWARS_PROTO_VER 30) |
118 |
118 |