ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:supertuxkart/stk-code

Browse Source
This commit is contained in:
hiker 2014-10-08 23:17:04 +11:00
commit 8495dbfd27
1 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
CMakeLists.txt
View File

@ -87,11 +87,7 @@ if(WIN32)
set(ENV{PATH} "$ENV{PATH};${PROJECT_SOURCE_DIR}/dependencies/include") set(ENV{PATH} "$ENV{PATH};${PROJECT_SOURCE_DIR}/dependencies/include")
set(ENV{LIB} ${PROJECT_SOURCE_DIR}/dependencies/lib) set(ENV{LIB} ${PROJECT_SOURCE_DIR}/dependencies/lib)
set(ENV{OPENALDIR} ${PROJECT_SOURCE_DIR}/dependencies) set(ENV{OPENALDIR} ${PROJECT_SOURCE_DIR}/dependencies)
if(MSVC) add_definitions(-D_IRR_STATIC_LIB_)
add_definitions(/D_IRR_STATIC_LIB_)
elseif(MINGW)
add_definitions(-D_IRR_STATIC_LIB_)
endif()
endif() endif()
@ -149,7 +145,7 @@ endif()
if(UNIX OR MINGW) if(UNIX OR MINGW)
# if(USE_CPP2011) # if(USE_CPP2011)
add_definitions("-std=gnu++0x") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++0x")
# endif() # endif()
endif() endif()
@ -172,7 +168,7 @@ endif()
# Set some compiler options # Set some compiler options
if(UNIX OR MINGW) if(UNIX OR MINGW)
add_definitions(-Wall) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")
endif() endif()
if(WIN32) if(WIN32)
@ -200,7 +196,7 @@ endif()
# TODO: remove this switch # TODO: remove this switch
add_definitions(-DHAVE_OGGVORBIS) add_definitions(-DHAVE_OGGVORBIS)
if(WIN32 AND NOT MINGW) if(WIN32)
configure_file("${STK_SOURCE_DIR}/windows_installer/icon_rc.template" "${PROJECT_BINARY_DIR}/tmp/icon.rc") configure_file("${STK_SOURCE_DIR}/windows_installer/icon_rc.template" "${PROJECT_BINARY_DIR}/tmp/icon.rc")
endif() endif()
@ -291,8 +287,7 @@ if(UNIX AND NOT APPLE)
target_link_libraries(supertuxkart ${IRRLICHT_XF86VM_LIBRARY}) target_link_libraries(supertuxkart ${IRRLICHT_XF86VM_LIBRARY})
endif() endif()
if(USE_ASAN) if(USE_ASAN)
add_definitions("-fsanitize=address") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=address -fno-omit-frame-pointer")
add_definitions("-fno-omit-frame-pointer")
target_link_libraries(supertuxkart "-fsanitize=address") target_link_libraries(supertuxkart "-fsanitize=address")
endif() endif()
endif() endif()
@ -318,11 +313,7 @@ if(USE_WIIUSE)
find_library(BLUETOOTH_LIBRARY NAMES IOBluetooth PATHS /Developer/Library/Frameworks/IOBluetooth.framework) find_library(BLUETOOTH_LIBRARY NAMES IOBluetooth PATHS /Developer/Library/Frameworks/IOBluetooth.framework)
target_link_libraries(supertuxkart wiiuse ${BLUETOOTH_LIBRARY}) target_link_libraries(supertuxkart wiiuse ${BLUETOOTH_LIBRARY})
elseif(WIN32) elseif(WIN32)
if(MSVC) add_definitions(-DWIIUSE_STATIC)
add_definitions("/DWIIUSE_STATIC")
else()
add_definitions("-DWIIUSE_STATIC")
endif()
if(WIIUSE_BUILD) if(WIIUSE_BUILD)
target_link_libraries(supertuxkart wiiuse) target_link_libraries(supertuxkart wiiuse)
else() else()