-
Notifications
You must be signed in to change notification settings - Fork 724
/
patch-CMakeLists.txt
73 lines (67 loc) · 1.92 KB
/
patch-CMakeLists.txt
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
--- CMakeLists.txt.orig 2020-05-26 19:25:37 UTC
+++ CMakeLists.txt
@@ -72,8 +72,7 @@ endif(ENABLE_SDL2 MATCHES "BUNDLED")
if(ENABLE_SOUND MATCHES "ON")
# FIXME applies only for *nix systems
- find_package(PkgConfig)
- pkg_check_modules(SDL2_MIXER REQUIRED SDL2_mixer>=2.0.4)
+ find_package(SDL2_mixer REQUIRED)
add_definitions(-DUSE_SDL_MIXER=1)
endif(ENABLE_SOUND MATCHES "ON")
if(ENABLE_SOUND MATCHES "BUNDLED")
@@ -86,8 +85,10 @@ endif(ENABLE_SOUND MATCHES "BUNDLED")
if(ENABLE_FLUIDSYNTH MATCHES "ON")
find_package(PkgConfig)
- pkg_check_modules(FLUIDSYNTH REQUIRED fluidsynth)
+ pkg_check_modules(PC_FLUIDSYNTH REQUIRED fluidsynth)
add_definitions("-DUSE_FLUIDSYNTH=1")
+ find_path(FLUIDSYNTH_INCLUDE_DIRS fluidsynth.h HINTS ${PC_FLUIDSYNTH_INCLUDE_DIRS} REQUIRED)
+ find_library(FLUIDSYNTH_LIBRARIES fluidsynth HINTS ${PC_FLUIDSYNTH_LIBRARY_DIRS} REQUIRED)
endif(ENABLE_FLUIDSYNTH MATCHES "ON")
if(ENABLE_FLUIDSYNTH MATCHES "BUNDLED")
find_library(FLUIDSYNTH_LIBRARY fluidsynth PATHS ${CMAKE_SOURCE_DIR}/build_ext/fluidsynth-lite/src)
@@ -312,8 +313,8 @@ add_executable(movinfo
target_link_libraries(playmov
AFILE_LIB
FIX_LIB
- ${SDL2_LIBRARIES}
- ${SDL2_MIXER_LIBRARIES}
+ SDL2::SDL2
+ SDL2_mixer::SDL2_mixer
)
target_link_libraries(movinfo
@@ -332,7 +333,7 @@ target_link_libraries(TestSimpleMain
RES_LIB
FIX_LIB
LG_LIB
- ${SDL2_LIBRARIES}
+ SDL2::SDL2
)
add_executable(BoxTest
@@ -346,7 +347,7 @@ target_link_libraries(BoxTest
RES_LIB
FIX_LIB
LG_LIB
- ${SDL2_LIBRARIES}
+ SDL2::SDL2
)
add_executable(BitmapTest
@@ -360,7 +361,7 @@ target_link_libraries(BitmapTest
RES_LIB
FIX_LIB
LG_LIB
- ${SDL2_LIBRARIES}
+ SDL2::SDL2
)
add_executable(FixTest
@@ -410,8 +411,8 @@ target_link_libraries(systemshock
EDMS_LIB
FIXPP_LIB
ADLMIDI_LIB
- ${SDL2_LIBRARIES}
- ${SDL2_MIXER_LIBRARIES}
+ SDL2::SDL2
+ SDL2_mixer::SDL2_mixer
${FLUIDSYNTH_LIBRARIES}
${OPENGL_LIBRARIES}
${ALSA_LIBRARIES}