equal
deleted
inserted
replaced
128 #workaround for http://playcontrol.net/ewing/jibberjabber/big_behind-the-scenes_chang.html#SDL_mixer (Update 2) |
128 #workaround for http://playcontrol.net/ewing/jibberjabber/big_behind-the-scenes_chang.html#SDL_mixer (Update 2) |
129 if(current_macosx_version VERSION_EQUAL "10.4") |
129 if(current_macosx_version VERSION_EQUAL "10.4") |
130 find_package(SDL_mixer REQUIRED) |
130 find_package(SDL_mixer REQUIRED) |
131 set(DYLIB_SMPEG "-dylib_file @loader_path/Frameworks/smpeg.framework/Versions/A/smpeg:${SDLMIXER_LIBRARY}/Versions/A/Frameworks/smpeg.framework/Versions/A/smpeg") |
131 set(DYLIB_SMPEG "-dylib_file @loader_path/Frameworks/smpeg.framework/Versions/A/smpeg:${SDLMIXER_LIBRARY}/Versions/A/Frameworks/smpeg.framework/Versions/A/smpeg") |
132 set(DYLIB_MIKMOD "-dylib_file @loader_path/Frameworks/mikmod.framework/Versions/A/mikmod:${SDLMIXER_LIBRARY}/Versions/A/Frameworks/mikmod.framework/Versions/A/mikmod") |
132 set(DYLIB_MIKMOD "-dylib_file @loader_path/Frameworks/mikmod.framework/Versions/A/mikmod:${SDLMIXER_LIBRARY}/Versions/A/Frameworks/mikmod.framework/Versions/A/mikmod") |
133 set(CMAKE_C_FLAGS "${DYLIB_SMPEG}" "${DYLIB_MIKMOD}") |
133 set(CMAKE_C_FLAGS "${DYLIB_SMPEG} ${DYLIB_MIKMOD}") |
134 list(APPEND pascal_flags "-k${DYLIB_SMPEG}" "-k${DYLIB_MIKMOD}") |
134 list(APPEND pascal_flags "-k${DYLIB_SMPEG}" "-k${DYLIB_MIKMOD}") |
135 endif() |
135 endif() |
136 |
136 |
137 #CMAKE_OSX_ARCHITECTURES and CMAKE_OSX_SYSROOT need to be set for universal binary and correct linking |
137 #CMAKE_OSX_ARCHITECTURES and CMAKE_OSX_SYSROOT need to be set for universal binary and correct linking |
138 if(NOT CMAKE_OSX_ARCHITECTURES) |
138 if(NOT CMAKE_OSX_ARCHITECTURES) |
183 set (CMAKE_BUILD_TYPE ${default_build_type} CACHE STRING "Choose the build type, options are: Debug Release." FORCE) |
183 set (CMAKE_BUILD_TYPE ${default_build_type} CACHE STRING "Choose the build type, options are: Debug Release." FORCE) |
184 endif (CMAKE_BUILD_TYPE) |
184 endif (CMAKE_BUILD_TYPE) |
185 |
185 |
186 #set default flags values for all projects (unless MINIMAL_FLAGS is true) |
186 #set default flags values for all projects (unless MINIMAL_FLAGS is true) |
187 if(NOT ${MINIMAL_FLAGS}) |
187 if(NOT ${MINIMAL_FLAGS}) |
188 set(CMAKE_C_FLAGS "-pipe") |
188 set(CMAKE_C_FLAGS "-pipe ${CMAKE_C_FLAGS}") |
189 set(CMAKE_C_FLAGS_RELEASE "-w -Os -fomit-frame-pointer") |
189 set(CMAKE_C_FLAGS_RELEASE "-w -Os -fomit-frame-pointer ${CMAKE_C_FLAGS_RELEASE}") |
190 set(CMAKE_C_FLAGS_DEBUG "-Wall -O0 -g -DDEBUG") |
190 set(CMAKE_C_FLAGS_DEBUG "-Wall -O0 -g -DDEBUG ${CMAKE_C_FLAGS_DEBUG}") |
191 set(CMAKE_CXX_FLAGS ${CMAKE_C_FLAGS}) |
191 set(CMAKE_CXX_FLAGS ${CMAKE_C_FLAGS}) |
192 set(CMAKE_CXX_FLAGS_RELEASE ${CMAKE_C_FLAGS_RELEASE}) |
192 set(CMAKE_CXX_FLAGS_RELEASE ${CMAKE_C_FLAGS_RELEASE}) |
193 set(CMAKE_CXX_FLAGS_DEBUG ${CMAKE_C_FLAGS_DEBUG}) |
193 set(CMAKE_CXX_FLAGS_DEBUG ${CMAKE_C_FLAGS_DEBUG}) |
194 else() |
194 else() |
195 #CMake adds a lot of additional configuration flags, so let's clear them up |
195 #CMake adds a lot of additional configuration flags, so let's clear them up |