Added
Link Here
|
1 |
--- src/CMakeLists.txt.orig 2019-01-29 16:31:24 UTC |
2 |
+++ src/CMakeLists.txt |
3 |
@@ -40,9 +40,9 @@ else(GPL) |
4 |
set(EXTRA_LIBRARIES) |
5 |
endif(GPL) |
6 |
|
7 |
-find_package(SDL REQUIRED) |
8 |
-find_package(SDL_mixer REQUIRED) |
9 |
-include_directories(${SDLMIXER_INCLUDE_DIR} ${SDL_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} ${BZIP2_INCLUDE_DIR} ${JPEG_INCLUDE_DIR}) |
10 |
+pkg_search_module(SDL REQUIRED sdl sdl) |
11 |
+pkg_search_module(SDLMIXER REQUIRED SDL_mixer) |
12 |
+include_directories(${SDLMIXER_INCLUDE_DIRS} ${SDL_INCLUDE_DIRS}/SDL ${ZLIB_INCLUDE_DIR} ${BZIP2_INCLUDE_DIR} ${JPEG_INCLUDE_DIR}) |
13 |
|
14 |
check_function_exists(stricmp STRICMP_EXISTS) |
15 |
check_function_exists(strnicmp STRNICMP_EXISTS) |
16 |
@@ -320,7 +320,7 @@ else(NOT ANDROID) |
17 |
endif(NOT ANDROID) |
18 |
|
19 |
add_dependencies(ecwolf lzma gdtoa revision_check) |
20 |
-target_link_libraries(ecwolf ${EXTRA_LIBRARIES} ${SDL_LIBRARY} ${SDLMIXER_LIBRARY} ${ZLIB_LIBRARY} ${BZIP2_LIBRARIES} ${JPEG_LIBRARIES} lzma gdtoa) |
21 |
+target_link_libraries(ecwolf ${EXTRA_LIBRARIES} ${SDL_LIBRARIES} ${SDLMIXER_LIBRARIES} ${ZLIB_LIBRARY} ${BZIP2_LIBRARIES} ${JPEG_LIBRARIES} lzma gdtoa) |
22 |
set_target_properties(ecwolf PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${OUTPUT_DIR}) |
23 |
|
24 |
# Install |