dhewm/dhewm3-sdk
0
0
Fork 0
mirror of https://github.com/dhewm/dhewm3-sdk.git synced 2024-11-28 23:32:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

Add SDL2 support for the build system

Browse source 
Defaults to off, tree doesn't yet compile with SDL2.
This commit is contained in:
dhewg 2012-07-19 20:05:38 +02:00 committed by Daniel Gibson
parent 68c38d452b
commit a5f5270f8e
1 changed files with 19 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
CMakeLists.txt
View file

@ -29,6 +29,7 @@ option(BASE "Build the base game code" ON)
option(D3XP "Build the d3xp game code" ON) option(D3XP "Build the d3xp game code" ON)
option(DEDICATED "Build the dedicated server" OFF) option(DEDICATED "Build the dedicated server" OFF)
option(ONATIVE "Optimize for the host CPU" OFF) option(ONATIVE "Optimize for the host CPU" OFF)
option(SDL2 "Use SDL2 instead of SDL1.2" OFF)
if(NOT CMAKE_SYSTEM_PROCESSOR) if(NOT CMAKE_SYSTEM_PROCESSOR)
message(FATAL_ERROR "No target CPU architecture set") message(FATAL_ERROR "No target CPU architecture set")
@ -73,6 +74,7 @@ if(DHEWM3LIBS)
# these are too stupid, give them a hint # these are too stupid, give them a hint
set(ENV{OPENALDIR} ${DHEWM3LIBS}) set(ENV{OPENALDIR} ${DHEWM3LIBS})
set(ENV{SDLDIR} ${DHEWM3LIBS}) set(ENV{SDLDIR} ${DHEWM3LIBS})
set(ENV{SDL2DIR} ${DHEWM3LIBS})
endif() endif()
# libs # libs
@ -98,12 +100,23 @@ include_directories(${VORBISFILE_INCLUDE_DIR})
find_package(OpenAL REQUIRED) find_package(OpenAL REQUIRED)
include_directories(${OPENAL_INCLUDE_DIR}) include_directories(${OPENAL_INCLUDE_DIR})
if(APPLE OR WIN32) if (SDL2)
# skip SDL2main
if(APPLE OR WIN32)
set(SDL2_BUILDING_LIBRARY TRUE)
endif()
find_package(SDL2 REQUIRED)
include_directories(${SDL2_INCLUDE_DIR})
set(SDLx_LIBRARY ${SDL2_LIBRARY})
else()
# skip SDLmain # skip SDLmain
set(SDL_BUILDING_LIBRARY TRUE) if(APPLE OR WIN32)
set(SDL_BUILDING_LIBRARY TRUE)
endif()
find_package(SDL REQUIRED)
include_directories(${SDL_INCLUDE_DIR})
set(SDLx_LIBRARY ${SDL_LIBRARY})
endif() endif()
find_package(SDL REQUIRED)
include_directories(${SDL_INCLUDE_DIR})
find_package(CURL QUIET) find_package(CURL QUIET)
if(CURL_FOUND) if(CURL_FOUND)
@ -737,7 +750,7 @@ if(CORE)
${CURL_LIBRARY} ${CURL_LIBRARY}
${JPEG_LIBRARY} ${JPEG_LIBRARY}
${ZLIB_LIBRARY} ${ZLIB_LIBRARY}
${SDL_LIBRARY} ${SDLx_LIBRARY}
${sys_libs} ${sys_libs}
) )
@ -767,7 +780,7 @@ if(DEDICATED)
${CURL_LIBRARY} ${CURL_LIBRARY}
${JPEG_LIBRARY} ${JPEG_LIBRARY}
${ZLIB_LIBRARY} ${ZLIB_LIBRARY}
${SDL_LIBRARY} ${SDLx_LIBRARY}
${sys_libs} ${sys_libs}
) )