vlc | branch: master | David Fuhrmann <[email protected]> | Sat Jun 13 09:28:54 2015 +0200| [ce5d8671e01237befc472818fd65211d467b7b51] | committer: David Fuhrmann
macosx: rename vlc target to vlc-bundle-helper This is the target called from our makefile scripts. Rename it so it is more clear that it should not be called in Xcode directly. > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=ce5d8671e01237befc472818fd65211d467b7b51 --- extras/package/macosx/package.mak | 2 +- extras/package/macosx/vlc.xcodeproj/project.pbxproj | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/extras/package/macosx/package.mak b/extras/package/macosx/package.mak index 630eb9b..f709d81 100644 --- a/extras/package/macosx/package.mak +++ b/extras/package/macosx/package.mak @@ -45,7 +45,7 @@ VLC-tmp: vlc mkdir -p $(top_builddir)/tmp/modules/gui/macosx cd "$(srcdir)/modules/gui/macosx/" && cp *.h *.m $(abs_top_builddir)/tmp/modules/gui/macosx/ cd $(top_builddir)/tmp/extras/package/macosx && \ - xcodebuild -target vlc SYMROOT=../../../build DSTROOT=../../../build $(silentstd) + xcodebuild -target vlc-bundle-helper SYMROOT=../../../build DSTROOT=../../../build $(silentstd) cp -R $(top_builddir)/tmp/build/Default/VLC.bundle $@ mkdir -p $@/Contents/Frameworks && cp -R $(CONTRIB_DIR)/Growl.framework $@/Contents/Frameworks/ if HAVE_SPARKLE diff --git a/extras/package/macosx/vlc.xcodeproj/project.pbxproj b/extras/package/macosx/vlc.xcodeproj/project.pbxproj index 9b5f12f..848c7d3 100644 --- a/extras/package/macosx/vlc.xcodeproj/project.pbxproj +++ b/extras/package/macosx/vlc.xcodeproj/project.pbxproj @@ -3024,9 +3024,9 @@ productReference = 1CCB5F2F1A62A6A5004C3E90 /* pseudo-vlc.app */; productType = "com.apple.product-type.application"; }; - CC402EAE0E00ABBB006A4BA4 /* vlc */ = { + CC402EAE0E00ABBB006A4BA4 /* vlc-bundle-helper */ = { isa = PBXNativeTarget; - buildConfigurationList = CC402F460E00ABBB006A4BA4 /* Build configuration list for PBXNativeTarget "vlc" */; + buildConfigurationList = CC402F460E00ABBB006A4BA4 /* Build configuration list for PBXNativeTarget "vlc-bundle-helper" */; buildPhases = ( CC402EAF0E00ABBB006A4BA4 /* Resources */, CC402F400E00ABBB006A4BA4 /* Frameworks */, @@ -3036,7 +3036,7 @@ ); dependencies = ( ); - name = vlc; + name = "vlc-bundle-helper"; productInstallPath = "$(HOME)/Library/Bundles"; productName = vlc; productReference = CC402F4B0E00ABBB006A4BA4 /* VLC.bundle */; @@ -3085,7 +3085,7 @@ projectDirPath = ""; projectRoot = ../../..; targets = ( - CC402EAE0E00ABBB006A4BA4 /* vlc */, + CC402EAE0E00ABBB006A4BA4 /* vlc-bundle-helper */, 1CCB5F2E1A62A6A5004C3E90 /* pseudo-vlc */, 1C42A6DF1B19F597007D87B2 /* Build deps */, 1C07EDFD1B1CD6B300A0BBDB /* Bootstrap project */, @@ -5015,7 +5015,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Default; }; - CC402F460E00ABBB006A4BA4 /* Build configuration list for PBXNativeTarget "vlc" */ = { + CC402F460E00ABBB006A4BA4 /* Build configuration list for PBXNativeTarget "vlc-bundle-helper" */ = { isa = XCConfigurationList; buildConfigurations = ( CC402F470E00ABBB006A4BA4 /* Development */, _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
