From 9839d433aa7ffc21ad2218bf7d25490307a8009a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= Date: Sat, 19 Apr 2014 11:19:02 +0200 Subject: [PATCH] fixed packaging regressions from upgrade to SDL 2.0.3 followup of #5073 --- Makefile | 2 +- packaging/package-all.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index a78bda27e6..b3da91f222 100644 --- a/Makefile +++ b/Makefile @@ -319,7 +319,7 @@ install-core: default @$(CP_R) cg "$(DATA_INSTALL_DIR)" @$(CP) *.ttf "$(DATA_INSTALL_DIR)" @$(CP) thirdparty/Tao/* "$(DATA_INSTALL_DIR)" - @$(CP) thirdparty/SDL2\#* "$(DATA_INSTALL_DIR)" + @$(CP) thirdparty/SDL2-CS* "$(DATA_INSTALL_DIR)" @$(INSTALL_PROGRAM) thirdparty/ICSharpCode.SharpZipLib.dll "$(DATA_INSTALL_DIR)" @$(INSTALL_PROGRAM) thirdparty/FuzzyLogicLibrary.dll "$(DATA_INSTALL_DIR)" @$(INSTALL_PROGRAM) thirdparty/SharpFont.dll "$(DATA_INSTALL_DIR)" diff --git a/packaging/package-all.sh b/packaging/package-all.sh index da2337b945..22f9f9cf3a 100755 --- a/packaging/package-all.sh +++ b/packaging/package-all.sh @@ -54,7 +54,7 @@ cp thirdparty/FuzzyLogicLibrary.dll packaging/built cp thirdparty/SharpFont* packaging/built # SDL2-CS -cp thirdparty/SDL2-CS packaging/built +cp thirdparty/SDL2-CS* packaging/built # Mono.NAT for UPnP support cp thirdparty/Mono.Nat.dll packaging/built