[Bf-blender-cvs] [276f6840edd] master: CMake: fix linking with WITH_SDL_DYNLOAD
Campbell Barton
noreply at git.blender.org
Tue Dec 8 10:53:17 CET 2020
Commit: 276f6840eddd5e14958b66b9b0c5440eb59de523
Author: Campbell Barton
Date: Tue Dec 8 20:47:32 2020 +1100
Branches: master
https://developer.blender.org/rB276f6840eddd5e14958b66b9b0c5440eb59de523
CMake: fix linking with WITH_SDL_DYNLOAD
While this was only needed in 'source/blender/python',
add to ghost to avoid problems in the future.
===================================================================
M intern/ghost/CMakeLists.txt
M source/blender/python/intern/CMakeLists.txt
===================================================================
diff --git a/intern/ghost/CMakeLists.txt b/intern/ghost/CMakeLists.txt
index 4a2a12932fe..e8611839aea 100644
--- a/intern/ghost/CMakeLists.txt
+++ b/intern/ghost/CMakeLists.txt
@@ -142,7 +142,11 @@ if(WITH_HEADLESS OR WITH_GHOST_SDL)
list(APPEND INC_SYS
${SDL_INCLUDE_DIR}
)
- if(NOT WITH_SDL_DYNLOAD)
+ if(WITH_SDL_DYNLOAD)
+ list(APPEND LIB
+ extern_sdlew
+ )
+ else()
list(APPEND LIB
${SDL_LIBRARY}
)
diff --git a/source/blender/python/intern/CMakeLists.txt b/source/blender/python/intern/CMakeLists.txt
index 772b31fd9d8..5d8330e368d 100644
--- a/source/blender/python/intern/CMakeLists.txt
+++ b/source/blender/python/intern/CMakeLists.txt
@@ -255,7 +255,11 @@ if(WITH_SDL)
list(APPEND INC_SYS
${SDL_INCLUDE_DIR}
)
- if(NOT WITH_SDL_DYNLOAD)
+ if(WITH_SDL_DYNLOAD)
+ list(APPEND LIB
+ extern_sdlew
+ )
+ else()
list(APPEND LIB
${SDL_LIBRARY}
)
More information about the Bf-blender-cvs
mailing list