edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-20 06:58:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge #2331

Browse source 
2331: Enable rpath on Linux for shipping SDL2 shared lib r=heinrich5991 a=def-

I guess we should have a way to say when we want to build against the
static sdl2? Or we just ship SDL2 for the ddnet.tw releases as well. I'd
be fine with the latter, but it adds a few MB probably.

Co-authored-by: def <dennis@felsin9.de>
This commit is contained in:
bors[bot] 2020-06-25 11:52:49 +00:00 committed by GitHub
parent 38b95f6c33 64d63bc123
commit bf09d18cc7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
CMakeLists.txt
View file

@ -1816,6 +1816,11 @@ if(CLIENT)
${PLATFORM_CLIENT_INCLUDE_DIRS}
)
# Support shipped SDL2 shared lib for Steam release
if(TARGET_OS STREQUAL "linux")
set_property(TARGET ${TARGET_CLIENT} PROPERTY BUILD_RPATH "$ORIGIN")
endif()
set(PARAMS "${WAVPACK_INCLUDE_DIRS};${WAVPACK_INCLUDE_DIRS}")
if(NOT(WAVPACK_OPEN_FILE_INPUT_EX_PARAMS STREQUAL PARAMS))
unset(WAVPACK_OPEN_FILE_INPUT_EX CACHE)

2
ddnet-libs

@ -1 +1 @@
Subproject commit 573d8a9be7f57f19383642de207f8a80a7a017f2
Subproject commit 87038aa991fa12eb35f80557e02223a0725ebf23