diff options
| author | k-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2015-12-28 15:34:04 +0000 |
|---|---|---|
| committer | k-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2015-12-28 15:34:04 +0000 |
| commit | c2642efc13ede8debbf6993e8edc588a1ebbf984 (patch) | |
| tree | 3358b0cb055ecfa89ffdebe4d507120acaebdb75 /Makefile.in | |
| parent | fdaaa5578955cdbe10d1f3f41feac4a9c05d24ce (diff) | |
| download | usdx-c2642efc13ede8debbf6993e8edc588a1ebbf984.tar.gz usdx-c2642efc13ede8debbf6993e8edc588a1ebbf984.tar.xz usdx-c2642efc13ede8debbf6993e8edc588a1ebbf984.zip | |
add configure for swresample
git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@3154 b956fd51-792f-4845-bead-9b4dfca2ff2c
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Makefile.in b/Makefile.in index 5bfd09b1..08066cd0 100644 --- a/Makefile.in +++ b/Makefile.in @@ -416,7 +416,8 @@ 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 '/') +AVCODECLIB := $(shell $(OTOOL) -L $(macosx_bundle_path)/MacOS/ultrastardx | grep avcodec | cut -f 1 -d ' ' | cut -f 4-6 -d '/') +SWRESAMPLELIB := $(shell $(OTOOL) -L $(macosx_bundle_path)/MacOS/libavcodec*.dylib | grep swresample | cut -f 1 -d ' ' | cut -f 4-6 -d '/') .PHONY: macosx-standalone-app macosx-standalone-app: macosx-app # Create double clickable standalone (does not need fink) Mac OS X @@ -443,7 +444,7 @@ macosx-standalone-app: macosx-app $(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)) + $(foreach dylib,$(shell $(OTOOL) -L /opt/X11/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) |