32 lines
1.1 KiB
Plaintext
32 lines
1.1 KiB
Plaintext
From 47061715f39c44da24d6a999a3c012e79b6ee8de Mon Sep 17 00:00:00 2001
|
|
From: begasus <begasus@gmail.com>
|
|
Date: Sun, 24 Nov 2019 18:16:39 +0000
|
|
Subject: use system SDL2/SDL2_mixer headers
|
|
|
|
|
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index 52a0f25..b573ee0 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -41,7 +41,7 @@ ENDIF(OPENGL_FOUND)
|
|
# set up SDL created by our build scripts
|
|
set(SDL2_DIR ${CMAKE_SOURCE_DIR}/build_ext/built_sdl)
|
|
|
|
-set(SDL2_INCLUDE_DIRS ${SDL2_DIR}/include/SDL2)
|
|
+#set(SDL2_INCLUDE_DIRS ${SDL2_DIR}/include/SDL2)
|
|
find_library(SDL2_LIBRARY SDL2 PATHS ${SDL2_DIR}/lib NO_DEFAULT_PATH)
|
|
find_library(SDL2MAIN_LIBRARY SDL2main PATHS ${SDL2_DIR}/lib NO_DEFAULT_PATH)
|
|
set(SDL2_LIBRARIES "${SDL2MAIN_LIBRARY};${SDL2_LIBRARY}")
|
|
@@ -49,7 +49,7 @@ set(SDL2_LIBRARIES "${SDL2MAIN_LIBRARY};${SDL2_LIBRARY}")
|
|
|
|
# and SDL mixer
|
|
|
|
-set(SDL2_MIXER_DIR ${CMAKE_SOURCE_DIR}/build_ext/built_sdl_mixer)
|
|
+#set(SDL2_MIXER_DIR ${CMAKE_SOURCE_DIR}/build_ext/built_sdl_mixer)
|
|
|
|
set(SDL2_MIXER_INCLUDE_DIRS ${SDL2_MIXER_DIR}/include/SDL2)
|
|
find_library(SDL2_MIXER_LIBRARY SDL2_mixer PATHS ${SDL2_MIXER_DIR}/lib NO_DEFAULT_PATH)
|
|
--
|
|
2.24.0
|
|
|