vlc | branch: master | David Fuhrmann <[email protected]> | Wed Mar 27 19:28:09 2019 +0100| [5b8554d5eab4870ce1b27261ff63246b2b4621f9] | committer: David Fuhrmann
darwinvlc: Set rpath appliciable for POSIX installation This enables us to just run the vlc executable from an installed directory like on any other POSIX installation. All modules should work, apart the macOS interface module which requires the bundle structure. > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=5b8554d5eab4870ce1b27261ff63246b2b4621f9 --- bin/Makefile.am | 3 +-- extras/package/macosx/package.mak | 1 + 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/Makefile.am b/bin/Makefile.am index fed00b2b4d..0bfa668806 100644 --- a/bin/Makefile.am +++ b/bin/Makefile.am @@ -47,8 +47,7 @@ endif vlc_osx_SOURCES = darwinvlc.m vlc_osx_LDFLAGS = $(LDFLAGS_vlc) -Wl,-framework,CoreFoundation,-framework,Cocoa -vlc_osx_LDFLAGS += -Xlinker -rpath -Xlinker "@executable_path/../Frameworks/" -vlc_osx_LDFLAGS += -Xlinker -rpath -Xlinker "@executable_path/../Frameworks/plugins/" +vlc_osx_LDFLAGS += -Xlinker -rpath -Xlinker "$(libdir)" if HAVE_BREAKPAD vlc_osx_LDFLAGS += -Wl,-framework,Breakpad vlc_osx_OBJCFLAGS = -F$(CONTRIB_DIR)/Frameworks diff --git a/extras/package/macosx/package.mak b/extras/package/macosx/package.mak index 1aa92e70e2..fa2a9ee4ff 100644 --- a/extras/package/macosx/package.mak +++ b/extras/package/macosx/package.mak @@ -50,6 +50,7 @@ endif -cp -a $(CONTRIB_DIR)/share/java/libbluray*.jar $@/Contents/Frameworks/plugins/ ## Install binary cp $(prefix)/bin/vlc $@/Contents/MacOS/VLC + install_name_tool -rpath "$(libdir)" "@executable_path/../Frameworks/" $@/Contents/MacOS/VLC ## Generate plugin cache bin/vlc-cache-gen $@/Contents/Frameworks/plugins find $@ -type d -exec chmod ugo+rx '{}' \; _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
