mirror of
https://github.com/cxong/cdogs-sdl.git
synced 2025-07-22 15:10:33 +02:00
Update CMakeLists
This commit is contained in:
@@ -69,7 +69,6 @@ set(CMAKE_MODULE_PATH
|
||||
find_package(Nanopb 0.4.5...<1.0.0 REQUIRED)
|
||||
find_package(SDL2 REQUIRED)
|
||||
message("SDL2 include dir: ${SDL2_INCLUDE_DIRS}")
|
||||
find_package(SDL2_image REQUIRED)
|
||||
find_package(SDL2_mixer REQUIRED)
|
||||
if(BUILD_EDITOR)
|
||||
find_package(OpenGL REQUIRED)
|
||||
@@ -291,7 +290,7 @@ elseif(APPLE)
|
||||
|
||||
# copy SDL frameworks
|
||||
set(APPS cdogs-sdl cdogs-sdl-editor)
|
||||
set(LIBS SDL2 SDL2_image SDL2_mixer)
|
||||
set(LIBS SDL2 SDL2_mixer)
|
||||
foreach(APP ${APPS})
|
||||
foreach(LIB ${LIBS})
|
||||
install(DIRECTORY /Library/Frameworks/${LIB}.framework
|
||||
|
@@ -250,6 +250,5 @@ target_link_libraries(cdogs
|
||||
SDL_joystickbuttonnames
|
||||
yajl_s
|
||||
SDL2::SDL2
|
||||
SDL2_image::SDL2_image
|
||||
SDL2_mixer::SDL2_mixer
|
||||
${ENet_LIBRARIES})
|
||||
|
@@ -46,4 +46,4 @@ set(CDOGSED_HEADERS
|
||||
tile_brush.h
|
||||
ui_object.h)
|
||||
add_library(cdogsedlib STATIC ${CDOGSED_SOURCES} ${CDOGSED_HEADERS})
|
||||
target_link_libraries(cdogsedlib SDL2::SDL2 SDL2_image::SDL2_image SDL2_mixer::SDL2_mixer)
|
||||
target_link_libraries(cdogsedlib SDL2::SDL2 SDL2_mixer::SDL2_mixer)
|
||||
|
@@ -140,7 +140,6 @@ target_link_libraries(pic_test
|
||||
cdogs
|
||||
cdogs_proto
|
||||
SDL2::SDL2
|
||||
SDL2_image::SDL2_image
|
||||
${EXTRA_LIBRARIES})
|
||||
# TODO: test disabled since CI fails with Couldn't find matching render driver
|
||||
#add_test(NAME pic_test COMMAND pic_test)
|
||||
|
Reference in New Issue
Block a user