aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authork-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c>2013-12-06 21:47:37 +0000
committerk-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c>2013-12-06 21:47:37 +0000
commit0fb70372997a75fef7d345cd8de0061f5329ea82 (patch)
treeb5a3ba575903249602845b2b5bcd77d46b9ddbb7
parent42144d259a8a84628c548649049893b368f73e78 (diff)
downloadusdx-0fb70372997a75fef7d345cd8de0061f5329ea82.tar.gz
usdx-0fb70372997a75fef7d345cd8de0061f5329ea82.tar.xz
usdx-0fb70372997a75fef7d345cd8de0061f5329ea82.zip
fix codesign, dependence of libtiff, and treat only the libavcodec version, which is in ultrastardx
git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@3017 b956fd51-792f-4845-bead-9b4dfca2ff2c
-rw-r--r--Makefile.in10
1 files changed, 9 insertions, 1 deletions
diff --git a/Makefile.in b/Makefile.in
index 8816a9c8..62f5453a 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -416,6 +416,7 @@ macosx-app: all
@echo "Have fun."
@echo ""
+AVCODECLIB := $(shell $(OTOOL) -L $(macosx_bundle_path)/MacOS/ultrastardx | grep avcodec | cut -f 1 -d ' ' | cut -f 2 -d '/')
.PHONY: macosx-standalone-app
macosx-standalone-app: macosx-app
# Create double clickable standalone (does not need fink) Mac OS X
@@ -430,13 +431,17 @@ macosx-standalone-app: macosx-app
# work on the secondary dylibs from ffmpeg
# libavcodec references all tertiary libraries of the ffmpeg libs
- $(foreach dylib,$(shell $(OTOOL) -L $(finkLibDir)/libavcodec.dylib | grep version | cut -f 1 -d ' ' | grep -v \/System\/Library | grep -v \/usr\/lib),$(install_osx_libraries))
+ $(foreach dylib,$(shell $(OTOOL) -L $(finkLibDir)/$(AVCODECLIB) | grep version | cut -f 1 -d ' ' | grep -v \/System\/Library | grep -v \/usr\/lib),$(install_osx_libraries))
+
# same procedure in libfaac. it gets libgnugetopt
$(foreach dylib,$(shell $(OTOOL) -L $(finkLibDir)/libfaac.dylib | grep version | cut -f 1 -d ' ' | grep -v \/System\/Library | grep -v \/usr\/lib),$(install_osx_libraries))
# same procedure for tertiary libs in SDL_image
$(foreach dylib,$(shell $(OTOOL) -L $(finkLibDir)/libSDL_image.dylib | grep version | cut -f 1 -d ' ' | grep -v \/System\/Library | grep -v \/usr\/lib),$(install_osx_libraries))
+# same procedure for secondary libs in libtiff
+ $(foreach dylib,$(shell $(OTOOL) -L $(finkLibDir)/libtiff.dylib | grep version | cut -f 1 -d ' ' | grep -v \/System\/Library | grep -v \/usr\/lib),$(install_osx_libraries))
+
# X11 libs as well, because users may not have installed it on 10.4
$(foreach dylib,$(shell $(OTOOL) -L /usr/X11R6/lib/libX11.dylib | grep version | cut -f 1 -d ' ' | grep -v \/System\/Library | grep -v \/usr\/lib),$(install_osx_libraries))
@@ -445,6 +450,9 @@ macosx-standalone-app: macosx-app
$(shell $(INSTALL_NAME_TOOL) -change $(finkLibDir)/libpcre.dylib @executable_path/libpcre.dylib $(macosx_bundle_path)/MacOS/libpcre.dylib)
$(shell $(INSTALL_NAME_TOOL) -id @executable_path/libpcre.dylib $(macosx_bundle_path)/MacOS/libpcre.dylib)
+# codesigning
+ codesign -f -s USDX-codesign UltraStarDeluxe.app
+
# final messages
@echo "Standalone Mac OS X application created."
@echo ""