diff options
| author | k-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2010-06-11 07:50:25 +0000 |
|---|---|---|
| committer | k-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2010-06-11 07:50:25 +0000 |
| commit | 9c7b3f021b4b58dcb283a0fe7fe896d6d3821176 (patch) | |
| tree | c985c48473efa3512caddf293131ad1f10edec45 /Makefile.in | |
| parent | c6977960a37aac90a4ed10164c47d7f5adc5f334 (diff) | |
| download | usdx-9c7b3f021b4b58dcb283a0fe7fe896d6d3821176.tar.gz usdx-9c7b3f021b4b58dcb283a0fe7fe896d6d3821176.tar.xz usdx-9c7b3f021b4b58dcb283a0fe7fe896d6d3821176.zip | |
Mac OS X: fix installation and loading of libpcre.dylib in standalone and fink based app.
git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2483 b956fd51-792f-4845-bead-9b4dfca2ff2c
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/Makefile.in b/Makefile.in index 1f36c8e7..237565f5 100644 --- a/Makefile.in +++ b/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 "" |