buildsystem + xcodeproj: replaced BWToolKit with BGHUDAppKit

diff --git a/Makefile.am b/Makefile.am
index 33a09bbfd50e372cc8c700bfa9c0d314a016dc97..14c1d7ae40456ebb35147d83e669dcaba3372e51 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -420,8 +420,8 @@ VLC-release.app: vlc
        done
        mkdir -p $(top_builddir)/tmp/extras/contrib/Sparkle
        cp -R $(CONTRIB_DIR)/Sparkle/Sparkle.framework $(top_builddir)/tmp/extras/contrib/Sparkle
-       mkdir -p $(top_builddir)/tmp/extras/contrib/BWToolKit
-       cp -R $(CONTRIB_DIR)/BWToolKit/BWToolKitFramework.framework $(top_builddir)/tmp/extras/contrib/BWToolKit
+       mkdir -p $(top_builddir)/tmp/extras/contrib/BGHUDAppKit
+       cp -R $(CONTRIB_DIR)/BGHUDAppKit/BGHUDAppKit.framework $(top_builddir)/tmp/extras/contrib/BGHUDAppKit
        mkdir -p $(top_builddir)/tmp/modules/audio_output
        mkdir -p $(top_builddir)/tmp/modules/gui/macosx
        for i in \
@@ -575,8 +575,8 @@ VLC.app: vlc $(top_builddir)/src/.libs/libvlccore.dylib $(top_builddir)/src/.lib
        done
        mkdir -p $(top_builddir)/tmp/extras/contrib/Sparkle
        cp -R $(CONTRIB_DIR)/Sparkle/Sparkle.framework $(top_builddir)/tmp/extras/contrib/Sparkle
-       mkdir -p $(top_builddir)/tmp/extras/contrib/BWToolKit
-       cp -R $(CONTRIB_DIR)/BWToolKit/BWToolKitFramework.framework $(top_builddir)/tmp/extras/contrib/BWToolKit
+       mkdir -p $(top_builddir)/tmp/extras/contrib/BGHUDAppKit
+       cp -R $(CONTRIB_DIR)/BGHUDAppKit/BGHUDAppKit.framework $(top_builddir)/tmp/extras/contrib/BGHUDAppKit
        mkdir -p $(top_builddir)/tmp/modules/audio_output
        mkdir -p $(top_builddir)/tmp/modules/gui/macosx
        for i in \

diff --git a/configure.ac b/configure.ac
index 247d86d7ea175b09a00da266b2a0681c1a24fca7..20c9221fe5d6e66816992c4738c0c2ebdb051418 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -3678,8 +3678,8 @@ then
   VLC_ADD_LDFLAGS([macosx],                           [-Wl,-framework,IOKit])
   VLC_ADD_LDFLAGS([macosx],                           [-F${CONTRIB_DIR}/Sparkle -Wl,-framework,Sparkle])
   VLC_ADD_OBJCFLAGS([macosx],                         [-F${CONTRIB_DIR}/Sparkle])
-  VLC_ADD_LDFLAGS([macosx],                           [-F${CONTRIB_DIR}/BWToolKit -Wl,-framework,BWToolKitFramework])
-  VLC_ADD_OBJCFLAGS([macosx],                         [-F${CONTRIB_DIR}/BWToolKit])
+  VLC_ADD_LDFLAGS([macosx],                           [-F${CONTRIB_DIR}/BGHUDAppKit -Wl,-framework,BGHUDAppKit])
+  VLC_ADD_OBJCFLAGS([macosx],                         [-F${CONTRIB_DIR}/BGHUDAppKit])
   dnl For bug report
   VLC_ADD_LDFLAGS([macosx],                           [-Wl,-framework,AddressBook])
   VLC_ADD_LDFLAGS([macosx],                           [-Wl,-framework,WebKit])

diff --git a/extras/package/macosx/vlc.xcodeproj/project.pbxproj b/extras/package/macosx/vlc.xcodeproj/project.pbxproj
index e7b534ee584512ab5f1a2df8f55939f3efe2107e..b12621bb1c038d09dc97e060dbbf9b55f9fa2e02 100644 (file)
--- a/extras/package/macosx/vlc.xcodeproj/project.pbxproj
+++ b/extras/package/macosx/vlc.xcodeproj/project.pbxproj
@@ -169,8 +169,8 @@
                CC62B9600FC600E90077BB8C /* play_big_down.png in Resources */ = {isa = PBXBuildFile; fileRef = CC62B9580FC600E90077BB8C /* play_big_down.png */; };
                CC62B9610FC600E90077BB8C /* play_big.png in Resources */ = {isa = PBXBuildFile; fileRef = CC62B9590FC600E90077BB8C /* play_big.png */; };
                CC8062641021F8790021EB9A /* dsa_pub.pem in Resources */ = {isa = PBXBuildFile; fileRef = CC8062631021F8790021EB9A /* dsa_pub.pem */; };
-               CC84FB2D130083BB00816D38 /* BWToolkitFramework.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CC84FB2C130083BB00816D38 /* BWToolkitFramework.framework */; };
-               CC84FB481300843200816D38 /* BWToolkitFramework.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = CC84FB2C130083BB00816D38 /* BWToolkitFramework.framework */; };
+               CC84FB2D130083BB00816D38 /* BGHUDAppKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CC84FB2C130083BB00816D38 /* BGHUDAppKit.framework */; };
+               CC84FB481300843200816D38 /* BGHUDAppKit.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = CC84FB2C130083BB00816D38 /* BGHUDAppKit.framework */; };
                CCBE999F0F922C51000705F8 /* CoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CCBE999E0F922C51000705F8 /* CoreServices.framework */; };
                CCF11B540F8BFB520088542D /* ErrorPanel.nib in Resources */ = {isa = PBXBuildFile; fileRef = CCF11B520F8BFB520088542D /* ErrorPanel.nib */; };
 /* End PBXBuildFile section */
@@ -182,7 +182,7 @@
                        dstPath = "";
                        dstSubfolderSpec = 10;
                        files = (
-                               CC84FB481300843200816D38 /* BWToolkitFramework.framework in Copy Frameworks */,
+                               CC84FB481300843200816D38 /* BGHUDAppKit.framework in Copy Frameworks */,
                                CC426FD71020D47100A32659 /* Sparkle.framework in Copy Frameworks */,
                        );
                        name = "Copy Frameworks";
@@ -368,7 +368,7 @@
                CC772DAC10E621C100675C9B /* VLCProgressPanel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = VLCProgressPanel.h; path = ../../../modules/gui/macosx_dialog_provider/VLCProgressPanel.h; sourceTree = SOURCE_ROOT; };
                CC772DAD10E621C100675C9B /* VLCProgressPanel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = VLCProgressPanel.m; path = ../../../modules/gui/macosx_dialog_provider/VLCProgressPanel.m; sourceTree = SOURCE_ROOT; };
                CC8062631021F8790021EB9A /* dsa_pub.pem */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = dsa_pub.pem; path = Resources/dsa_pub.pem; sourceTree = "<group>"; };
-               CC84FB2C130083BB00816D38 /* BWToolkitFramework.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = BWToolkitFramework.framework; path = ../../contrib/BWToolkit/BWToolkitFramework.framework; sourceTree = SOURCE_ROOT; };
+               CC84FB2C130083BB00816D38 /* BGHUDAppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = BGHUDAppKit.framework; path = ../../contrib/BGHUDAppKit/BGHUDAppKit.framework; sourceTree = SOURCE_ROOT; };
                CC962E2C0CC7992800A56695 /* WebKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WebKit.framework; path = /System/Library/Frameworks/WebKit.framework; sourceTree = "<absolute>"; };
                CC965D5D0DA5880F0088F222 /* display_middle.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = display_middle.png; path = Resources/display_middle.png; sourceTree = "<group>"; };
                CC965D5E0DA5880F0088F222 /* display_left.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = display_left.png; path = Resources/display_left.png; sourceTree = "<group>"; };
@@ -443,7 +443,7 @@
                                CC402F440E00ABBB006A4BA4 /* WebKit.framework in Frameworks */,
                                CCBE999F0F922C51000705F8 /* CoreServices.framework in Frameworks */,
                                CC426FD11020D44F00A32659 /* Sparkle.framework in Frameworks */,
-                               CC84FB2D130083BB00816D38 /* BWToolkitFramework.framework in Frameworks */,
+                               CC84FB2D130083BB00816D38 /* BGHUDAppKit.framework in Frameworks */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
@@ -552,7 +552,7 @@
                1058C7ACFEA557BF11CA2CBB /* Linked Frameworks */ = {
                        isa = PBXGroup;
                        children = (
-                               CC84FB2C130083BB00816D38 /* BWToolkitFramework.framework */,
+                               CC84FB2C130083BB00816D38 /* BGHUDAppKit.framework */,
                                CC426FD01020D44F00A32659 /* Sparkle.framework */,
                                CCBE999E0F922C51000705F8 /* CoreServices.framework */,
                                CC962E2C0CC7992800A56695 /* WebKit.framework */,
@@ -1191,7 +1191,7 @@
                                FRAMEWORK_SEARCH_PATHS = (
                                        "$(inherited)",
                                        "$(FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
-                                       "\"$(SRCROOT)/../../contrib/BWToolkit\"",
+                                       "\"$(SRCROOT)/../../contrib/BGHUDAppKit\"",
                                );
                                FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/../../contrib/Sparkle\"";
                                GCC_DYNAMIC_NO_PIC = NO;
@@ -1226,7 +1226,7 @@
                                FRAMEWORK_SEARCH_PATHS = (
                                        "$(inherited)",
                                        "$(FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
-                                       "\"$(SRCROOT)/../../contrib/BWToolkit\"",
+                                       "\"$(SRCROOT)/../../contrib/BGHUDAppKit\"",
                                );
                                FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/../../contrib/Sparkle\"";
                                GCC_ENABLE_FIX_AND_CONTINUE = NO;
@@ -1257,7 +1257,7 @@
                                FRAMEWORK_SEARCH_PATHS = (
                                        "$(inherited)",
                                        "$(FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
-                                       "\"$(SRCROOT)/../../contrib/BWToolkit\"",
+                                       "\"$(SRCROOT)/../../contrib/BGHUDAppKit\"",
                                );
                                FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/../../contrib/Sparkle\"";
                                GCC_SYMBOLS_PRIVATE_EXTERN = NO;