Skip to content

Commit 82bed46

Browse files
authored
Merge pull request #678 from Return-To-The-Roots/master
FIX wrong paths of driver dylibs
2 parents 9326fcb + 892f4df commit 82bed46

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

release/prepareRelease.sh.cmake

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,8 +130,8 @@ case "$SYSTEM_NAME" in
130130
Darwin)
131131
echo "extraction of debug symbols for Apple currently not supported" >&2
132132
i686-apple-darwin10-strip -S ${DESTDIR}bin/s25client
133-
i686-apple-darwin10-strip -S ${DESTDIR}share/s25rttr/driver/video/libvideoSDL.dylib
134-
i686-apple-darwin10-strip -S ${DESTDIR}share/s25rttr/driver/audio/libaudioSDL.dylib
133+
i686-apple-darwin10-strip -S ${DESTDIR}lib/share/s25rttr/driver/video/libvideoSDL.dylib
134+
i686-apple-darwin10-strip -S ${DESTDIR}lib/share/s25rttr/driver/audio/libaudioSDL.dylib
135135
i686-apple-darwin10-strip -S ${DESTDIR}bin/RTTR/s25update
136136
i686-apple-darwin10-strip -S ${DESTDIR}bin/RTTR/sound-convert
137137
i686-apple-darwin10-strip -S ${DESTDIR}bin/RTTR/s-c_resample
@@ -199,6 +199,7 @@ case "$SYSTEM_NAME" in
199199
done
200200

201201
mkdir -vp ${DESTDIR}s25client.app/Contents/MacOS/bin || exit 1
202+
mkdir -vp ${DESTDIR}s25client.app/Contents/MacOS/lib || exit 1
202203

203204
# binaries und paketdaten kopieren
204205
cp -v ${RTTR_SRCDIR}/release/bin/macos/rttr.command ${DESTDIR}s25client.app/Contents/MacOS/ || exit 1
@@ -207,6 +208,7 @@ case "$SYSTEM_NAME" in
207208
cp -v ${RTTR_SRCDIR}/release/bin/macos/PkgInfo ${DESTDIR}s25client.app/Contents/ || exit 1
208209
cp -v ${RTTR_SRCDIR}/release/bin/macos/Info.plist ${DESTDIR}s25client.app/Contents/ || exit 1
209210
mv -v ${DESTDIR}bin/* ${DESTDIR}s25client.app/Contents/MacOS/bin/ || exit 1
211+
mv -v ${DESTDIR}lib/* ${DESTDIR}s25client.app/Contents/MacOS/lib/ || exit 1
210212

211213
chmod +x ${DESTDIR}s25client.app/Contents/MacOS/* || exit 1
212214

0 commit comments

Comments
 (0)