From 115255f6a3c2be422680710b5d6ba4226c3383a6 Mon Sep 17 00:00:00 2001 From: whiteshark0 Date: Tue, 15 Jun 2010 21:28:52 +0000 Subject: merged trunk r2528 into us_maker branch git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/branches/experimental@2530 b956fd51-792f-4845-bead-9b4dfca2ff2c --- us_maker_edition/Makefile.in | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'us_maker_edition/Makefile.in') diff --git a/us_maker_edition/Makefile.in b/us_maker_edition/Makefile.in index 1f36c8e7..237565f5 100644 --- a/us_maker_edition/Makefile.in +++ b/us_maker_edition/Makefile.in @@ -358,6 +358,8 @@ OTOOL := /usr/bin/otool INSTALL_NAME_TOOL := /usr/bin/install_name_tool # hdiutil: Mac OS X disk image tool HDIUTIL := /usr/bin/hdiutil +# finkLibDir := path for libraries installed using fink +finkLibDir := /sw/lib ################################################# # Mac OS X app-bundle @@ -425,16 +427,19 @@ endef # work on the secondary dylibs from ffmpeg # libavcodec references all tertiary libraries of the ffmpeg libs - $(foreach dylib,$(shell $(OTOOL) -L /sw/lib/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)/libavcodec.dylib | 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 /sw/lib/libfaac.dylib | grep version | cut -f 1 -d ' ' | grep -v \/System\/Library | grep -v \/usr\/lib),$(install_osx_libraries)) + $(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 /sw/lib/libSDL_image.dylib | grep version | cut -f 1 -d ' ' | grep -v \/System\/Library | grep -v \/usr\/lib),$(install_osx_libraries)) + $(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)) # 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)) +# libpcre.dylib must be installed extra, since it is not linked to the executable but opened using dlopen + $(shell $(INSTALL) -m 755 $(finkLibDir)/libpcre.dylib $(macosx_bundle_path)/MacOS) + # final messages @echo "Standalone Mac OS X application created." @echo "" -- cgit v1.2.3