equal
deleted
inserted
replaced
34 #workaround for http://playcontrol.net/ewing/jibberjabber/big_behind-the-scenes_chang.html#SDL_mixer (Update 2) |
34 #workaround for http://playcontrol.net/ewing/jibberjabber/big_behind-the-scenes_chang.html#SDL_mixer (Update 2) |
35 if(current_macosx_version VERSION_EQUAL "10.4") |
35 if(current_macosx_version VERSION_EQUAL "10.4") |
36 find_package(SDL_mixer REQUIRED) |
36 find_package(SDL_mixer REQUIRED) |
37 set(DYLIB_SMPEG "-dylib_file @loader_path/Frameworks/smpeg.framework/Versions/A/smpeg:${SDLMIXER_LIBRARY}/Versions/A/Frameworks/smpeg.framework/Versions/A/smpeg") |
37 set(DYLIB_SMPEG "-dylib_file @loader_path/Frameworks/smpeg.framework/Versions/A/smpeg:${SDLMIXER_LIBRARY}/Versions/A/Frameworks/smpeg.framework/Versions/A/smpeg") |
38 set(DYLIB_MIKMOD "-dylib_file @loader_path/Frameworks/mikmod.framework/Versions/A/mikmod:${SDLMIXER_LIBRARY}/Versions/A/Frameworks/mikmod.framework/Versions/A/mikmod") |
38 set(DYLIB_MIKMOD "-dylib_file @loader_path/Frameworks/mikmod.framework/Versions/A/mikmod:${SDLMIXER_LIBRARY}/Versions/A/Frameworks/mikmod.framework/Versions/A/mikmod") |
39 set(CMAKE_C_FLAGS "${DYLIB_SMPEG} ${DYLIB_MIKMOD}") |
39 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${DYLIB_SMPEG} ${DYLIB_MIKMOD}") |
|
40 set(CMAKE_CX_FLAGS "${CMAKE_CX_FLAGS} ${DYLIB_SMPEG} ${DYLIB_MIKMOD}") |
40 list(APPEND pascal_flags "-k${DYLIB_SMPEG}" "-k${DYLIB_MIKMOD}") |
41 list(APPEND pascal_flags "-k${DYLIB_SMPEG}" "-k${DYLIB_MIKMOD}") |
41 endif() |
42 endif() |
42 |
43 |
43 #CMAKE_OSX_ARCHITECTURES and CMAKE_OSX_SYSROOT need to be set for universal binary and correct linking |
44 #CMAKE_OSX_ARCHITECTURES and CMAKE_OSX_SYSROOT need to be set for universal binary and correct linking |
44 if(NOT CMAKE_OSX_ARCHITECTURES) |
45 if(NOT CMAKE_OSX_ARCHITECTURES) |
73 |
74 |
74 endif(APPLE) |
75 endif(APPLE) |
75 |
76 |
76 if(MINGW) |
77 if(MINGW) |
77 #this flags prevents a few dll hell problems |
78 #this flags prevents a few dll hell problems |
78 set(CMAKE_C_FLAGS "-static-libgcc ${CMAKE_C_FLAGS}") |
79 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -static-libgcc ") |
|
80 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -static-libgcc ") |
79 endif(MINGW) |
81 endif(MINGW) |
80 |
82 |
81 if(WIN32) |
83 if(WIN32) |
82 if(NOT BUILD_SHARED_LIB) |
84 if(NOT BUILD_SHARED_LIB) |
83 message(FATAL_ERROR "Static linking is not supported on Windows") |
85 message(FATAL_ERROR "Static linking is not supported on Windows") |