aboutsummaryrefslogtreecommitdiffstats
path: root/mediaplugin
diff options
context:
space:
mode:
authork-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c>2010-11-24 23:09:14 +0000
committerk-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c>2010-11-24 23:09:14 +0000
commitb84df627dc3910e8685de787ba7eb9541e8f2ae8 (patch)
tree9b05f5d0e7002055d373e85603716c8a98e2f5c4 /mediaplugin
parenta3fb9e60284a1969a77747f3ffc3e7a80a079ea9 (diff)
downloadusdx-b84df627dc3910e8685de787ba7eb9541e8f2ae8.tar.gz
usdx-b84df627dc3910e8685de787ba7eb9541e8f2ae8.tar.xz
usdx-b84df627dc3910e8685de787ba7eb9541e8f2ae8.zip
fix dylibs in the bundle. No need to fix libffmpegplugin.dylib. it works.
git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/branches/experimental@2752 b956fd51-792f-4845-bead-9b4dfca2ff2c
Diffstat (limited to 'mediaplugin')
-rw-r--r--mediaplugin/Makefile.in9
1 files changed, 5 insertions, 4 deletions
diff --git a/mediaplugin/Makefile.in b/mediaplugin/Makefile.in
index 60afab50..f5f6ad37 100644
--- a/mediaplugin/Makefile.in
+++ b/mediaplugin/Makefile.in
@@ -437,18 +437,19 @@ endef
$(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 $(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))
-# 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)
$(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)
+# libjpeg.8.dylib must be installed extra, but I do not really understand why. It is called from libtiff.3.dylib
+ $(shell $(INSTALL) -m 755 $(finkLibDir)/libjpeg.8.dylib $(macosx_bundle_path)/MacOS)
+ $(shell $(INSTALL_NAME_TOOL) -change $(finkLibDir)/libjpeg.8.dylib @executable_path/libjpeg.8.dylib $(macosx_bundle_path)/MacOS/libjpeg.8.dylib)
+ $(shell $(INSTALL_NAME_TOOL) -id @executable_path/libjpeg.8.dylib $(macosx_bundle_path)/MacOS/libjpeg.8.dylib)
+
# final messages
@echo "Standalone Mac OS X application created."
@echo ""