Skip to content

Commit

Permalink
Use built-in FindSDL2
Browse files Browse the repository at this point in the history
  • Loading branch information
lmoureaux committed Dec 14, 2023
1 parent fe3c27f commit 9927a18
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 186 deletions.
2 changes: 0 additions & 2 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,6 @@ jobs:
- name: Install build tools
run: |
brew update
brew uninstall --ignore-dependencies python
brew install \
cmake \
ninja \
Expand Down Expand Up @@ -274,7 +273,6 @@ jobs:
- name: Debug
if: failure()
run: |
cat /Users/runner/work/freeciv21/freeciv21/vcpkg/buildtrees/fontconfig/x64-osx-dbg/meson-logs/meson-log.txt
cat CMakeCache.txt
echo ${{steps.split.outputs.fragment}}
- name: Upload package
Expand Down
6 changes: 3 additions & 3 deletions client/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,6 @@ target_link_libraries(freeciv21-client PRIVATE tolua)

target_link_libraries(freeciv21-client PRIVATE Qt5::Widgets)
target_link_libraries(freeciv21-client PRIVATE Qt5::Svg)
target_link_libraries(freeciv21-client PRIVATE ${SDL2_MIXER_LIBRARIES} ${SDL2_LIBRARY})

if(NOT EMSCRIPTEN)
target_sources(freeciv21-client PRIVATE servers.cpp)
Expand All @@ -168,13 +167,14 @@ if (AUDIO_SDL)
target_sources(freeciv21-client PRIVATE audio/audio_sdl.cpp)
if (NOT EMSCRIPTEN)
# SDL comes with the -s option on emscripten
target_include_directories(freeciv21-client PRIVATE ${SDL2_INCLUDE_DIR})
target_link_libraries(freeciv21-client PRIVATE SDL2::SDL2)
target_link_libraries(freeciv21-client PRIVATE ${SDL2_MIXER_LIBRARIES})
target_include_directories(freeciv21-client PRIVATE ${SDL2_MIXER_INCLUDE_DIR})
endif()
endif()

if(APPLE)
target_link_libraries(freeciv21-client PRIVATE "-framework AudioUnit" "-framework CoreAudio" "-framework ForceFeedback" "-framework AudioToolbox")
# target_link_libraries(freeciv21-client PRIVATE "-framework AudioUnit" "-framework CoreAudio" "-framework ForceFeedback" "-framework AudioToolbox")
qt5_import_plugins(freeciv21-client INCLUDE Qt5::QCocoaIntegrationPlugin Qt5::QSvgPlugin)
endif()

Expand Down
181 changes: 0 additions & 181 deletions cmake/FindSDL2.cmake

This file was deleted.

0 comments on commit 9927a18

Please sign in to comment.