diff --git a/cmake/Modules/FindSDL2.cmake b/cmake/Modules/FindSDL2.cmake index 7939b7d5..faa556a8 100644 --- a/cmake/Modules/FindSDL2.cmake +++ b/cmake/Modules/FindSDL2.cmake @@ -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) diff --git a/cmake/Modules/FindSDL2_main.cmake b/cmake/Modules/FindSDL2_main.cmake index da9e7770..280e51e2 100644 --- a/cmake/Modules/FindSDL2_main.cmake +++ b/cmake/Modules/FindSDL2_main.cmake @@ -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" diff --git a/src/sdl/CMakeLists.txt b/src/sdl/CMakeLists.txt index 52a47dad..446f7fdc 100644 --- a/src/sdl/CMakeLists.txt +++ b/src/sdl/CMakeLists.txt @@ -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()