lifning
/
SRB2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cmake: fixes to enable linux compilation 

string.c, capitalization, find fixes
This commit is contained in:
Ronald Kinard 2015-01-28 20:15:24 +00:00
parent 68f8a5b0f9
commit 57037e4124
3 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
cmake/Modules/FindSDL2.cmake
View File

@ -27,19 +27,8 @@ find_library(SDL2_LIBRARY
"/usr/local/lib"
)
find_library(SDL2_MAIN_LIBRARY
NAMES SDL2_main
PATHS
${SDL2_PKGCONF_LIBRARY_DIRS}
/usr/lib
/usr/local/lib
)
# set include dir variables
set(SDL2_PROCESS_INCLUDES SDL2_INCLUDE_DIR)
set(SDL2_PROCESS_LIBS SDL2_LIBRARY)
set(SDL2_MAIN_PROCESS_INCLUDES SDL2_INCLUDE_DIR)
set(SDL2_MAIN_PROCESS_LIBS SDL2_MAIN_LIBRARY)
libfind_process(SDL2)
libfind_process(SDL2_MAIN)

2
cmake/Modules/FindSDL2_main.cmake
View File

@ -11,7 +11,7 @@ libfind_pkg_check_modules(SDL2_MAIN_PKGCONF SDL2)
# includes
find_path(SDL2_MAIN_INCLUDE_DIR
NAMES SDL_main.h
NAMES SDL.h
PATHS
${SDL2_MAIN_PKGCONF_INCLUDE_DIRS}
"/usr/include/SDL2"

8
src/sdl/CMakeLists.txt
View File

@ -3,7 +3,7 @@
set(SRB2_CONFIG_SDL2_USEMIXER ON CACHE BOOL "Use SDL2_mixer or regular sdl sound")
if(${SRB2_CONFIG_SDL2_USEMIXER})
find_package(SDL2_MIXER)
find_package(SDL2_mixer)
if(${SDL2_MIXER_FOUND})
set(SRB2_HAVE_MIXER ON)
set(SRB2_SDL2_SOUNDIMPL mixer_sound.c)
@ -75,6 +75,10 @@ if(${SDL2_FOUND})
set(SRB2_SDL2_TOTAL_SOURCES ${SRB2_SDL2_TOTAL_SOURCES}
${CMAKE_SOURCE_DIR}/src/win32/win_dbg.c
${CMAKE_SOURCE_DIR}/src/win32/Srb2win.rc
)
endif()
if(NOT CLANG)
set(SRB2_SDL2_TOTAL_SOURCES ${SRB2_SDL2_TOTAL_SOURCES}
${CMAKE_SOURCE_DIR}/src/string.c
)
endif()
@ -109,6 +113,8 @@ if(${SDL2_FOUND})
${PNG_LIBRARIES}
${ZLIB_LIBRARIES}
${OPENGL_LIBRARIES}
m #need math lol
rt # this too
)
endif()