Skip to content

V
vlc-2-2
Commit dc7425e3 authored by Pierre d'Herbemont's avatar Pierre d'Herbemont
Browse files
Options

MacOSX: Rename the framework to VLCKit.

parent d8ad30f9
Hide whitespace changes
Inline Side-by-side
Showing with 78 additions and 89 deletions
extras/MacOSX/Framework/Pre-Compile.sh
View file @ dc7425e3
if test "${ACTION}" = ""; then if test "${ACTION}" = ""; then
# Debug -- # Debug --
TARGET_BUILD_DIR="." TARGET_BUILD_DIR="."
FULL_PRODUCT_NAME="VLC.framework" FULL_PRODUCT_NAME="VLCKit.framework"
CONTENTS_FOLDER_PATH="${FULL_PRODUCT_NAME}/Versions/A" CONTENTS_FOLDER_PATH="${FULL_PRODUCT_NAME}/Versions/A"
VLC_BUILD_DIR="../../.." VLC_BUILD_DIR="../../.."
VLC_SRC_DIR="../../.." VLC_SRC_DIR="../../.."
...@@ -68,7 +68,7 @@ if test "${ACTION}" = "build"; then ...@@ -68,7 +68,7 @@ if test "${ACTION}" = "build"; then
########################## ##########################
########################## ##########################
# Build the modules folder (Same as VLC.framework/modules in Makefile) # Build the modules folder (Same as VLCKit.framework/modules in Makefile)
echo "Building modules folder..." echo "Building modules folder..."
# Figure out what modules are available to install # Figure out what modules are available to install
for module in `top_builddir="${VLC_BUILD_DIR}" ${vlc_config} --target plugin` ; do for module in `top_builddir="${VLC_BUILD_DIR}" ${vlc_config} --target plugin` ; do
...@@ -97,7 +97,7 @@ if test "${ACTION}" = "build"; then ...@@ -97,7 +97,7 @@ if test "${ACTION}" = "build"; then
########################## ##########################
########################## ##########################
# Build the library folder (Same as VLC.framework/lib in Makefile) # Build the library folder (Same as VLCKit.framework/lib in Makefile)
echo "Building library folder..." echo "Building library folder..."
for linked_lib in ${linked_libs} ; do for linked_lib in ${linked_libs} ; do
case "${linked_lib}" in case "${linked_lib}" in
......
extras/MacOSX/Framework/Resources/Info.plist
View file @ dc7425e3
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0"> <plist version="1.0">
<dict> <dict>
<key>CFBundleDevelopmentRegion</key> <key>CFBundleDevelopmentRegion</key>
<string>English</string> <string>English</string>
<key>CFBundleExecutable</key> <key>CFBundleExecutable</key>
<string>Quartz</string> <string>Quartz</string>
<key>CFBundleIdentifier</key> <key>CFBundleIdentifier</key>
<string>org.videolan.vlcframework</string> <string>org.videolan.vlckitframework</string>
<key>CFBundleInfoDictionaryVersion</key> <key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string> <string>6.0</string>
<key>CFBundleName</key> <key>CFBundleName</key>
<string>VLC</string> <string>VLC</string>
<key>CFBundlePackageType</key> <key>CFBundlePackageType</key>
<string>FMWK</string> <string>FMWK</string>
<key>CFBundleShortVersionString</key> <key>CFBundleShortVersionString</key>
<string>0.1</string> <string>0.1</string>
<key>CFBundleVersion</key> <key>CFBundleVersion</key>
<string>0.1</string> <string>0.1</string>
</dict> </dict>
</plist> </plist>
extras/MacOSX/Framework/VLC.xcodeproj/project.pbxproj → extras/MacOSX/Framework/VLCKit.xcodeproj/project.pbxproj
View file @ dc7425e3
...@@ -61,7 +61,7 @@ ...@@ -61,7 +61,7 @@
EF7311900CB5797B009473B4 /* VLCAudio.h in Headers */ = {isa = PBXBuildFile; fileRef = EF73118E0CB5797B009473B4 /* VLCAudio.h */; settings = {ATTRIBUTES = (Public, ); }; }; EF7311900CB5797B009473B4 /* VLCAudio.h in Headers */ = {isa = PBXBuildFile; fileRef = EF73118E0CB5797B009473B4 /* VLCAudio.h */; settings = {ATTRIBUTES = (Public, ); }; };
EF7311910CB5797B009473B4 /* VLCAudio.m in Sources */ = {isa = PBXBuildFile; fileRef = EF73118F0CB5797B009473B4 /* VLCAudio.m */; }; EF7311910CB5797B009473B4 /* VLCAudio.m in Sources */ = {isa = PBXBuildFile; fileRef = EF73118F0CB5797B009473B4 /* VLCAudio.m */; };
EF78BD100CAEEEC300354E6E /* VLCEventManager.h in Headers */ = {isa = PBXBuildFile; fileRef = EF78BD0D0CAEEEC300354E6E /* VLCEventManager.h */; settings = {ATTRIBUTES = (); }; }; EF78BD100CAEEEC300354E6E /* VLCEventManager.h in Headers */ = {isa = PBXBuildFile; fileRef = EF78BD0D0CAEEEC300354E6E /* VLCEventManager.h */; settings = {ATTRIBUTES = (); }; };
EF78BD1B0CAEEEE700354E6E /* VLC.h in Headers */ = {isa = PBXBuildFile; fileRef = EF78BD120CAEEEE700354E6E /* VLC.h */; settings = {ATTRIBUTES = (Public, ); }; }; EF78BD1B0CAEEEE700354E6E /* VLCKit.h in Headers */ = {isa = PBXBuildFile; fileRef = EF78BD120CAEEEE700354E6E /* VLCKit.h */; settings = {ATTRIBUTES = (Public, ); }; };
EF78BD1C0CAEEEE700354E6E /* VLCMedia.h in Headers */ = {isa = PBXBuildFile; fileRef = EF78BD130CAEEEE700354E6E /* VLCMedia.h */; settings = {ATTRIBUTES = (Public, ); }; }; EF78BD1C0CAEEEE700354E6E /* VLCMedia.h in Headers */ = {isa = PBXBuildFile; fileRef = EF78BD130CAEEEE700354E6E /* VLCMedia.h */; settings = {ATTRIBUTES = (Public, ); }; };
EF78BD1E0CAEEEE700354E6E /* VLCMediaLibrary.h in Headers */ = {isa = PBXBuildFile; fileRef = EF78BD150CAEEEE700354E6E /* VLCMediaLibrary.h */; settings = {ATTRIBUTES = (Public, ); }; }; EF78BD1E0CAEEEE700354E6E /* VLCMediaLibrary.h in Headers */ = {isa = PBXBuildFile; fileRef = EF78BD150CAEEEE700354E6E /* VLCMediaLibrary.h */; settings = {ATTRIBUTES = (Public, ); }; };
EF78BD1F0CAEEEE700354E6E /* VLCMediaList.h in Headers */ = {isa = PBXBuildFile; fileRef = EF78BD160CAEEEE700354E6E /* VLCMediaList.h */; settings = {ATTRIBUTES = (Public, ); }; }; EF78BD1F0CAEEEE700354E6E /* VLCMediaList.h in Headers */ = {isa = PBXBuildFile; fileRef = EF78BD160CAEEEE700354E6E /* VLCMediaList.h */; settings = {ATTRIBUTES = (Public, ); }; };
...@@ -124,14 +124,14 @@ ...@@ -124,14 +124,14 @@
637D5ABC0CF6F2650073EA45 /* VLCMediaDiscoverer.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = VLCMediaDiscoverer.h; path = Public/VLCMediaDiscoverer.h; sourceTree = "<group>"; }; 637D5ABC0CF6F2650073EA45 /* VLCMediaDiscoverer.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = VLCMediaDiscoverer.h; path = Public/VLCMediaDiscoverer.h; sourceTree = "<group>"; };
637D5ADB0CF6F2720073EA45 /* VLCMediaDiscoverer.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = VLCMediaDiscoverer.m; sourceTree = "<group>"; }; 637D5ADB0CF6F2720073EA45 /* VLCMediaDiscoverer.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = VLCMediaDiscoverer.m; sourceTree = "<group>"; };
6384FD070D0DBA20005EB1F7 /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = /System/Library/Frameworks/QuartzCore.framework; sourceTree = "<absolute>"; }; 6384FD070D0DBA20005EB1F7 /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = /System/Library/Frameworks/QuartzCore.framework; sourceTree = "<absolute>"; };
8DC2EF5B0486A6940098B216 /* VLC.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = VLC.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 8DC2EF5B0486A6940098B216 /* VLCKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = VLCKit.framework; sourceTree = BUILT_PRODUCTS_DIR; };
A7A0CEA20D2EF13000F2C039 /* VLCVideoCommon.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = VLCVideoCommon.h; path = Internal/VLCVideoCommon.h; sourceTree = "<group>"; }; A7A0CEA20D2EF13000F2C039 /* VLCVideoCommon.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = VLCVideoCommon.h; path = Internal/VLCVideoCommon.h; sourceTree = "<group>"; };
A7A0CEA30D2EF13000F2C039 /* VLCVideoCommon.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = VLCVideoCommon.m; sourceTree = "<group>"; }; A7A0CEA30D2EF13000F2C039 /* VLCVideoCommon.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = VLCVideoCommon.m; sourceTree = "<group>"; };
D2F7E79907B2D74100F64583 /* CoreData.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreData.framework; path = /System/Library/Frameworks/CoreData.framework; sourceTree = "<absolute>"; }; D2F7E79907B2D74100F64583 /* CoreData.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreData.framework; path = /System/Library/Frameworks/CoreData.framework; sourceTree = "<absolute>"; };
EF73118E0CB5797B009473B4 /* VLCAudio.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = VLCAudio.h; path = Public/VLCAudio.h; sourceTree = "<group>"; }; EF73118E0CB5797B009473B4 /* VLCAudio.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = VLCAudio.h; path = Public/VLCAudio.h; sourceTree = "<group>"; };
EF73118F0CB5797B009473B4 /* VLCAudio.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = VLCAudio.m; sourceTree = "<group>"; }; EF73118F0CB5797B009473B4 /* VLCAudio.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = VLCAudio.m; sourceTree = "<group>"; };
EF78BD0D0CAEEEC300354E6E /* VLCEventManager.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = VLCEventManager.h; path = Internal/VLCEventManager.h; sourceTree = "<group>"; }; EF78BD0D0CAEEEC300354E6E /* VLCEventManager.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = VLCEventManager.h; path = Internal/VLCEventManager.h; sourceTree = "<group>"; };
EF78BD120CAEEEE700354E6E /* VLC.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = VLC.h; path = Public/VLC.h; sourceTree = "<group>"; }; EF78BD120CAEEEE700354E6E /* VLCKit.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = VLCKit.h; path = Public/VLCKit.h; sourceTree = "<group>"; };
EF78BD130CAEEEE700354E6E /* VLCMedia.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = VLCMedia.h; path = Public/VLCMedia.h; sourceTree = "<group>"; }; EF78BD130CAEEEE700354E6E /* VLCMedia.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = VLCMedia.h; path = Public/VLCMedia.h; sourceTree = "<group>"; };
EF78BD150CAEEEE700354E6E /* VLCMediaLibrary.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = VLCMediaLibrary.h; path = Public/VLCMediaLibrary.h; sourceTree = "<group>"; }; EF78BD150CAEEEE700354E6E /* VLCMediaLibrary.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = VLCMediaLibrary.h; path = Public/VLCMediaLibrary.h; sourceTree = "<group>"; };
EF78BD160CAEEEE700354E6E /* VLCMediaList.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = VLCMediaList.h; path = Public/VLCMediaList.h; sourceTree = "<group>"; }; EF78BD160CAEEEE700354E6E /* VLCMediaList.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = VLCMediaList.h; path = Public/VLCMediaList.h; sourceTree = "<group>"; };
...@@ -166,7 +166,7 @@ ...@@ -166,7 +166,7 @@
034768DFFF38A50411DB9C8B /* Products */ = { 034768DFFF38A50411DB9C8B /* Products */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
8DC2EF5B0486A6940098B216 /* VLC.framework */, 8DC2EF5B0486A6940098B216 /* VLCKit.framework */,
); );
name = Products; name = Products;
sourceTree = "<group>"; sourceTree = "<group>";
...@@ -269,7 +269,7 @@ ...@@ -269,7 +269,7 @@
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
637CFB960D2D281900A041B6 /* Internal */, 637CFB960D2D281900A041B6 /* Internal */,
EF78BD120CAEEEE700354E6E /* VLC.h */, EF78BD120CAEEEE700354E6E /* VLCKit.h */,
637CFB930D2D280800A041B6 /* VLCLibrary.h */, 637CFB930D2D280800A041B6 /* VLCLibrary.h */,
EF78BD0D0CAEEEC300354E6E /* VLCEventManager.h */, EF78BD0D0CAEEEC300354E6E /* VLCEventManager.h */,
EF78BD130CAEEEE700354E6E /* VLCMedia.h */, EF78BD130CAEEEE700354E6E /* VLCMedia.h */,
...@@ -296,7 +296,7 @@ ...@@ -296,7 +296,7 @@
files = ( files = (
6303C43C0CF45CC30000ECC8 /* VLCMediaListAspect.h in Headers */, 6303C43C0CF45CC30000ECC8 /* VLCMediaListAspect.h in Headers */,
EF78BD100CAEEEC300354E6E /* VLCEventManager.h in Headers */, EF78BD100CAEEEC300354E6E /* VLCEventManager.h in Headers */,
EF78BD1B0CAEEEE700354E6E /* VLC.h in Headers */, EF78BD1B0CAEEEE700354E6E /* VLCKit.h in Headers */,
EF78BD1C0CAEEEE700354E6E /* VLCMedia.h in Headers */, EF78BD1C0CAEEEE700354E6E /* VLCMedia.h in Headers */,
EF78BD1E0CAEEEE700354E6E /* VLCMediaLibrary.h in Headers */, EF78BD1E0CAEEEE700354E6E /* VLCMediaLibrary.h in Headers */,
EF78BD1F0CAEEEE700354E6E /* VLCMediaList.h in Headers */, EF78BD1F0CAEEEE700354E6E /* VLCMediaList.h in Headers */,
...@@ -332,9 +332,9 @@ ...@@ -332,9 +332,9 @@
/* End PBXLegacyTarget section */ /* End PBXLegacyTarget section */
/* Begin PBXNativeTarget section */ /* Begin PBXNativeTarget section */
8DC2EF4F0486A6940098B216 /* VLC */ = { 8DC2EF4F0486A6940098B216 /* VLCKit */ = {
isa = PBXNativeTarget; isa = PBXNativeTarget;
buildConfigurationList = 1DEB91AD08733DA50010E9CD /* Build configuration list for PBXNativeTarget "VLC" */; buildConfigurationList = 1DEB91AD08733DA50010E9CD /* Build configuration list for PBXNativeTarget "VLCKit" */;
buildPhases = ( buildPhases = (
EF78BD2E0CAEEF9500354E6E /* ShellScript */, EF78BD2E0CAEEF9500354E6E /* ShellScript */,
8DC2EF540486A6940098B216 /* Sources */, 8DC2EF540486A6940098B216 /* Sources */,
...@@ -347,10 +347,10 @@ ...@@ -347,10 +347,10 @@
comments = "-lvlc -lvlc-control -dylib_file @loader_path/../lib/vlc_libintl.dylib:$(TARGET_BUILD_DIR)/$(PROJECT_NAME).framework/lib/vlc_libintl.dylib -dylib_file @loader_path/../lib/libvlc.dylib:$(TARGET_BUILD_DIR)/$(PROJECT_NAME).framework/lib/libvlc.dylib"; comments = "-lvlc -lvlc-control -dylib_file @loader_path/../lib/vlc_libintl.dylib:$(TARGET_BUILD_DIR)/$(PROJECT_NAME).framework/lib/vlc_libintl.dylib -dylib_file @loader_path/../lib/libvlc.dylib:$(TARGET_BUILD_DIR)/$(PROJECT_NAME).framework/lib/libvlc.dylib";
dependencies = ( dependencies = (
); );
name = VLC; name = VLCKit;
productInstallPath = "$(HOME)/Library/Frameworks"; productInstallPath = "$(HOME)/Library/Frameworks";
productName = VLC; productName = VLC;
productReference = 8DC2EF5B0486A6940098B216 /* VLC.framework */; productReference = 8DC2EF5B0486A6940098B216 /* VLCKit.framework */;
productType = "com.apple.product-type.framework"; productType = "com.apple.product-type.framework";
}; };
/* End PBXNativeTarget section */ /* End PBXNativeTarget section */
...@@ -358,7 +358,7 @@ ...@@ -358,7 +358,7 @@
/* Begin PBXProject section */ /* Begin PBXProject section */
0867D690FE84028FC02AAC07 /* Project object */ = { 0867D690FE84028FC02AAC07 /* Project object */ = {
isa = PBXProject; isa = PBXProject;
buildConfigurationList = 1DEB91B108733DA50010E9CD /* Build configuration list for PBXProject "VLC" */; buildConfigurationList = 1DEB91B108733DA50010E9CD /* Build configuration list for PBXProject "VLCKit" */;
compatibilityVersion = "Xcode 2.4"; compatibilityVersion = "Xcode 2.4";
hasScannedForEncodings = 1; hasScannedForEncodings = 1;
mainGroup = 0867D691FE84028FC02AAC07 /* VLC */; mainGroup = 0867D691FE84028FC02AAC07 /* VLC */;
...@@ -367,7 +367,7 @@ ...@@ -367,7 +367,7 @@
projectRoot = ""; projectRoot = "";
targets = ( targets = (
633BD6D20D2ADE040012A314 /* vlc-contrib-core-framework */, 633BD6D20D2ADE040012A314 /* vlc-contrib-core-framework */,
8DC2EF4F0486A6940098B216 /* VLC */, 8DC2EF4F0486A6940098B216 /* VLCKit */,
633BD6E40D2ADF030012A314 /* vlc-contrib */, 633BD6E40D2ADF030012A314 /* vlc-contrib */,
633BD6DB0D2ADE4E0012A314 /* vlc-core */, 633BD6DB0D2ADE4E0012A314 /* vlc-core */,
63FFDBCE0D2AE2AE0092FC96 /* vlc-configure */, 63FFDBCE0D2AE2AE0092FC96 /* vlc-configure */,
...@@ -485,7 +485,7 @@ ...@@ -485,7 +485,7 @@
}; };
633BD6F20D2AE0430012A314 /* PBXTargetDependency */ = { 633BD6F20D2AE0430012A314 /* PBXTargetDependency */ = {
isa = PBXTargetDependency; isa = PBXTargetDependency;
target = 8DC2EF4F0486A6940098B216 /* VLC */; target = 8DC2EF4F0486A6940098B216 /* VLCKit */;
targetProxy = 633BD6F10D2AE0430012A314 /* PBXContainerItemProxy */; targetProxy = 633BD6F10D2AE0430012A314 /* PBXContainerItemProxy */;
}; };
63FFDBD30D2AE3070092FC96 /* PBXTargetDependency */ = { 63FFDBD30D2AE3070092FC96 /* PBXTargetDependency */ = {
...@@ -530,7 +530,8 @@ ...@@ -530,7 +530,8 @@
"$(LD_FLAGS_LIBVLC)", "$(LD_FLAGS_LIBVLC)",
"$(LD_FLAGS_LIBVLC_CONTROL)", "$(LD_FLAGS_LIBVLC_CONTROL)",
); );
PRODUCT_NAME = VLC; PRIVATE_HEADERS_FOLDER_PATH = "$(CONTENTS_FOLDER_PATH)/PrivateHeaders";
PRODUCT_NAME = VLCKit;
SCAN_ALL_SOURCE_FILES_FOR_INCLUDES = YES; SCAN_ALL_SOURCE_FILES_FOR_INCLUDES = YES;
VLC_BUILD_DIR = "$(VLC_SRC_DIR)"; VLC_BUILD_DIR = "$(VLC_SRC_DIR)";
VLC_FRAMEWORK = "$(TARGET_BUILD_DIR)/$(PROJECT_NAME).framework"; VLC_FRAMEWORK = "$(TARGET_BUILD_DIR)/$(PROJECT_NAME).framework";
...@@ -572,7 +573,8 @@ ...@@ -572,7 +573,8 @@
"$(LD_FLAGS_LIBVLC)", "$(LD_FLAGS_LIBVLC)",
"$(LD_FLAGS_LIBVLC_CONTROL)", "$(LD_FLAGS_LIBVLC_CONTROL)",
); );
PRODUCT_NAME = VLC; PRIVATE_HEADERS_FOLDER_PATH = "$(CONTENTS_FOLDER_PATH)/PrivateHeaders";
PRODUCT_NAME = VLCKit;
SCAN_ALL_SOURCE_FILES_FOR_INCLUDES = YES; SCAN_ALL_SOURCE_FILES_FOR_INCLUDES = YES;
VLC_BUILD_DIR = "$(VLC_SRC_DIR)"; VLC_BUILD_DIR = "$(VLC_SRC_DIR)";
VLC_FRAMEWORK = "$(TARGET_BUILD_DIR)/$(PROJECT_NAME).framework"; VLC_FRAMEWORK = "$(TARGET_BUILD_DIR)/$(PROJECT_NAME).framework";
...@@ -691,7 +693,7 @@ ...@@ -691,7 +693,7 @@
/* End XCBuildConfiguration section */ /* End XCBuildConfiguration section */
/* Begin XCConfigurationList section */ /* Begin XCConfigurationList section */
1DEB91AD08733DA50010E9CD /* Build configuration list for PBXNativeTarget "VLC" */ = { 1DEB91AD08733DA50010E9CD /* Build configuration list for PBXNativeTarget "VLCKit" */ = {
isa = XCConfigurationList; isa = XCConfigurationList;
buildConfigurations = ( buildConfigurations = (
1DEB91AE08733DA50010E9CD /* Debug */, 1DEB91AE08733DA50010E9CD /* Debug */,
...@@ -700,7 +702,7 @@ ...@@ -700,7 +702,7 @@
defaultConfigurationIsVisible = 0; defaultConfigurationIsVisible = 0;
defaultConfigurationName = Debug; defaultConfigurationName = Debug;
}; };
1DEB91B108733DA50010E9CD /* Build configuration list for PBXProject "VLC" */ = { 1DEB91B108733DA50010E9CD /* Build configuration list for PBXProject "VLCKit" */ = {
isa = XCConfigurationList; isa = XCConfigurationList;
buildConfigurations = ( buildConfigurations = (
1DEB91B208733DA50010E9CD /* Debug */, 1DEB91B208733DA50010E9CD /* Debug */,
......
extras/MacOSX/VLC_app/Sources/VLCAppBindings.h
View file @ dc7425e3
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
*****************************************************************************/ *****************************************************************************/
#import <Cocoa/Cocoa.h> #import <Cocoa/Cocoa.h>
#import <VLC/VLC.h> #import <VLCKit/VLCKit.h>
/* We do implement some category functions, /* We do implement some category functions,
* But we don't publicise them, as they should * But we don't publicise them, as they should
......
extras/MacOSX/VLC_app/Sources/VLCBrowsableVideoView.h
View file @ dc7425e3
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
*****************************************************************************/ *****************************************************************************/
#import <QuartzCore/QuartzCore.h> #import <QuartzCore/QuartzCore.h>
#import <VLC/VLC.h> #import <VLCKit/VLCKit.h>
@interface VLCBrowsableVideoView : VLCVideoView { @interface VLCBrowsableVideoView : VLCVideoView {
BOOL menuDisplayed; BOOL menuDisplayed;
......
extras/MacOSX/VLC_app/Sources/VLCController.h
View file @ dc7425e3
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
*****************************************************************************/ *****************************************************************************/
#import <Cocoa/Cocoa.h> #import <Cocoa/Cocoa.h>
#import <VLC/VLC.h> #import <VLCKit/VLCKit.h>
@class VLCMainWindow; @class VLCMainWindow;
......
extras/MacOSX/VLC_app/Sources/VLCController.m
View file @ dc7425e3
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/ *****************************************************************************/
#import <VLC/VLC.h> #import <VLCKit/VLCKit.h>
#import "VLCController.h" #import "VLCController.h"
#import "VLCAppAdditions.h" #import "VLCAppAdditions.h"
......
extras/MacOSX/VLC_app/Sources/VLCMediaArrayController.h
View file @ dc7425e3
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
*****************************************************************************/ *****************************************************************************/
#import <Cocoa/Cocoa.h> #import <Cocoa/Cocoa.h>
#import <VLC/VLC.h> #import <VLCKit/VLCKit.h>
@interface VLCMediaArrayController : NSArrayController @interface VLCMediaArrayController : NSArrayController
{ {
......
extras/MacOSX/VLC_app/VLC.xcodeproj/project.pbxproj
View file @ dc7425e3
...@@ -13,7 +13,6 @@ ...@@ -13,7 +13,6 @@
buildPhases = ( buildPhases = (
); );
dependencies = ( dependencies = (
633BD7110D2AE0E50012A314 /* PBXTargetDependency */,
637F33EB0D2AEE4B001E70AB /* PBXTargetDependency */, 637F33EB0D2AEE4B001E70AB /* PBXTargetDependency */,
); );
name = "vlc-contrib-core-framework-app"; name = "vlc-contrib-core-framework-app";
...@@ -25,8 +24,8 @@ ...@@ -25,8 +24,8 @@
buildPhases = ( buildPhases = (
); );
dependencies = ( dependencies = (
637F33E50D2AEE29001E70AB /* PBXTargetDependency */, 632F3C260D316FAD003BBC56 /* PBXTargetDependency */,
637F33E90D2AEE48001E70AB /* PBXTargetDependency */, 632F3C280D316FB5003BBC56 /* PBXTargetDependency */,
); );
name = "vlc-framework-app"; name = "vlc-framework-app";
productName = "vlc-framework-app"; productName = "vlc-framework-app";
...@@ -34,6 +33,7 @@ ...@@ -34,6 +33,7 @@
/* End PBXAggregateTarget section */ /* End PBXAggregateTarget section */
/* Begin PBXBuildFile section */ /* Begin PBXBuildFile section */
632F3C380D31711C003BBC56 /* VLCKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 632F3C230D316F37003BBC56 /* VLCKit.framework */; };
633BD4BC0D2A90470012A314 /* VLCValueTransformer.m in Sources */ = {isa = PBXBuildFile; fileRef = 633BD4AA0D2A90470012A314 /* VLCValueTransformer.m */; }; 633BD4BC0D2A90470012A314 /* VLCValueTransformer.m in Sources */ = {isa = PBXBuildFile; fileRef = 633BD4AA0D2A90470012A314 /* VLCValueTransformer.m */; };
633BD4BD0D2A90470012A314 /* VLCMediaArrayController.m in Sources */ = {isa = PBXBuildFile; fileRef = 633BD4AC0D2A90470012A314 /* VLCMediaArrayController.m */; }; 633BD4BD0D2A90470012A314 /* VLCMediaArrayController.m in Sources */ = {isa = PBXBuildFile; fileRef = 633BD4AC0D2A90470012A314 /* VLCMediaArrayController.m */; };
633BD4BE0D2A90470012A314 /* VLCMainWindow.m in Sources */ = {isa = PBXBuildFile; fileRef = 633BD4AD0D2A90470012A314 /* VLCMainWindow.m */; }; 633BD4BE0D2A90470012A314 /* VLCMainWindow.m in Sources */ = {isa = PBXBuildFile; fileRef = 633BD4AD0D2A90470012A314 /* VLCMainWindow.m */; };
...@@ -45,7 +45,6 @@ ...@@ -45,7 +45,6 @@
633BD4C40D2A90470012A314 /* ImageAndTextCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 633BD4BA0D2A90470012A314 /* ImageAndTextCell.m */; }; 633BD4C40D2A90470012A314 /* ImageAndTextCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 633BD4BA0D2A90470012A314 /* ImageAndTextCell.m */; };
633BD4DA0D2A90C80012A314 /* dialog-error.png in Resources */ = {isa = PBXBuildFile; fileRef = 633BD4D80D2A90C80012A314 /* dialog-error.png */; }; 633BD4DA0D2A90C80012A314 /* dialog-error.png in Resources */ = {isa = PBXBuildFile; fileRef = 633BD4D80D2A90C80012A314 /* dialog-error.png */; };
633BD4DB0D2A90C80012A314 /* applications-internet.png in Resources */ = {isa = PBXBuildFile; fileRef = 633BD4D90D2A90C80012A314 /* applications-internet.png */; }; 633BD4DB0D2A90C80012A314 /* applications-internet.png in Resources */ = {isa = PBXBuildFile; fileRef = 633BD4D90D2A90C80012A314 /* applications-internet.png */; };
633BD6BB0D2AD7480012A314 /* VLC.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 633BD6A20D2ACE520012A314 /* VLC.framework */; };
63874B190D25960600F738AD /* MainWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = 63874B170D25960600F738AD /* MainWindow.xib */; }; 63874B190D25960600F738AD /* MainWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = 63874B170D25960600F738AD /* MainWindow.xib */; };
638F47110D216C8F008E4912 /* type_playlist.png in Resources */ = {isa = PBXBuildFile; fileRef = 638F47100D216C8F008E4912 /* type_playlist.png */; }; 638F47110D216C8F008E4912 /* type_playlist.png in Resources */ = {isa = PBXBuildFile; fileRef = 638F47100D216C8F008E4912 /* type_playlist.png */; };
63A742B30D2759C1002D41A0 /* ExceptionHandling.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 63A742B20D2759C1002D41A0 /* ExceptionHandling.framework */; }; 63A742B30D2759C1002D41A0 /* ExceptionHandling.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 63A742B20D2759C1002D41A0 /* ExceptionHandling.framework */; };
...@@ -65,32 +64,25 @@ ...@@ -65,32 +64,25 @@
/* End PBXBuildFile section */ /* End PBXBuildFile section */
/* Begin PBXContainerItemProxy section */ /* Begin PBXContainerItemProxy section */
633BD6A10D2ACE520012A314 /* PBXContainerItemProxy */ = { 632F3C220D316F37003BBC56 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy; isa = PBXContainerItemProxy;
containerPortal = 633BD69D0D2ACE520012A314 /* VLC.xcodeproj */; containerPortal = 633BD69D0D2ACE520012A314 /* VLCKit.xcodeproj */;
proxyType = 2; proxyType = 2;
remoteGlobalIDString = 8DC2EF5B0486A6940098B216; remoteGlobalIDString = 8DC2EF5B0486A6940098B216 /* VLCKit.framework */;
remoteInfo = VLC; remoteInfo = VLCKit;
}; };
633BD7100D2AE0E50012A314 /* PBXContainerItemProxy */ = { 632F3C250D316FAD003BBC56 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy; isa = PBXContainerItemProxy;
containerPortal = 633BD69D0D2ACE520012A314 /* VLC.xcodeproj */; containerPortal = 633BD69D0D2ACE520012A314 /* VLCKit.xcodeproj */;
proxyType = 1; proxyType = 1;
remoteGlobalIDString = 633BD6D20D2ADE040012A314; remoteGlobalIDString = 8DC2EF4F0486A6940098B216 /* VLCKit */;
remoteInfo = "vlc-contrib-core-framework"; remoteInfo = VLCKit;
};
637F33E40D2AEE29001E70AB /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 633BD69D0D2ACE520012A314 /* VLC.xcodeproj */;
proxyType = 1;
remoteGlobalIDString = 8DC2EF4F0486A6940098B216;
remoteInfo = VLC;
}; };
637F33E80D2AEE48001E70AB /* PBXContainerItemProxy */ = { 632F3C270D316FB5003BBC56 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy; isa = PBXContainerItemProxy;
containerPortal = 29B97313FDCFA39411CA2CEA /* Project object */; containerPortal = 29B97313FDCFA39411CA2CEA /* Project object */;
proxyType = 1; proxyType = 1;
remoteGlobalIDString = 8D1107260486CEB800E47090; remoteGlobalIDString = 8D1107260486CEB800E47090 /* VLC */;
remoteInfo = VLC; remoteInfo = VLC;
}; };
637F33EA0D2AEE4B001E70AB /* PBXContainerItemProxy */ = { 637F33EA0D2AEE4B001E70AB /* PBXContainerItemProxy */ = {
...@@ -131,7 +123,7 @@ ...@@ -131,7 +123,7 @@
633BD4BB0D2A90470012A314 /* ImageAndTextCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ImageAndTextCell.h; path = Sources/ImageAndTextCell.h; sourceTree = "<group>"; }; 633BD4BB0D2A90470012A314 /* ImageAndTextCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ImageAndTextCell.h; path = Sources/ImageAndTextCell.h; sourceTree = "<group>"; };
633BD4D80D2A90C80012A314 /* dialog-error.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "dialog-error.png"; path = "Icons/dialog-error.png"; sourceTree = "<group>"; }; 633BD4D80D2A90C80012A314 /* dialog-error.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "dialog-error.png"; path = "Icons/dialog-error.png"; sourceTree = "<group>"; };
633BD4D90D2A90C80012A314 /* applications-internet.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "applications-internet.png"; path = "Icons/applications-internet.png"; sourceTree = "<group>"; }; 633BD4D90D2A90C80012A314 /* applications-internet.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "applications-internet.png"; path = "Icons/applications-internet.png"; sourceTree = "<group>"; };
633BD69D0D2ACE520012A314 /* VLC.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = VLC.xcodeproj; path = ../Framework/VLC.xcodeproj; sourceTree = SOURCE_ROOT; }; 633BD69D0D2ACE520012A314 /* VLCKit.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = VLCKit.xcodeproj; path = ../Framework/VLCKit.xcodeproj; sourceTree = SOURCE_ROOT; };
63874B180D25960600F738AD /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/MainWindow.xib; sourceTree = "<group>"; }; 63874B180D25960600F738AD /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/MainWindow.xib; sourceTree = "<group>"; };
638F47100D216C8F008E4912 /* type_playlist.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = type_playlist.png; path = ../../../modules/gui/qt4/pixmaps/type_playlist.png; sourceTree = SOURCE_ROOT; }; 638F47100D216C8F008E4912 /* type_playlist.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = type_playlist.png; path = ../../../modules/gui/qt4/pixmaps/type_playlist.png; sourceTree = SOURCE_ROOT; };
63A742B20D2759C1002D41A0 /* ExceptionHandling.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ExceptionHandling.framework; path = /System/Library/Frameworks/ExceptionHandling.framework; sourceTree = "<absolute>"; }; 63A742B20D2759C1002D41A0 /* ExceptionHandling.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ExceptionHandling.framework; path = /System/Library/Frameworks/ExceptionHandling.framework; sourceTree = "<absolute>"; };
...@@ -153,7 +145,7 @@ ...@@ -153,7 +145,7 @@
isa = PBXFrameworksBuildPhase; isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647; buildActionMask = 2147483647;
files = ( files = (
633BD6BB0D2AD7480012A314 /* VLC.framework in Frameworks */, 632F3C380D31711C003BBC56 /* VLCKit.framework in Frameworks */,
8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */, 8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */,
63E380DF0D1C6FD800FD6958 /* QuartzCore.framework in Frameworks */, 63E380DF0D1C6FD800FD6958 /* QuartzCore.framework in Frameworks */,
63A742B30D2759C1002D41A0 /* ExceptionHandling.framework in Frameworks */, 63A742B30D2759C1002D41A0 /* ExceptionHandling.framework in Frameworks */,
...@@ -234,27 +226,27 @@ ...@@ -234,27 +226,27 @@
name = Frameworks; name = Frameworks;
sourceTree = "<group>"; sourceTree = "<group>";
}; };
633BD4620D2A8DF30012A314 /* Internals */ = { 632F3C1B0D316F37003BBC56 /* Products */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
633BD4B20D2A90470012A314 /* VLCExceptionHandler.h */, 632F3C230D316F37003BBC56 /* VLCKit.framework */,
633BD4AF0D2A90470012A314 /* VLCExceptionHandler.m */,
); );
name = Internals; name = Products;
sourceTree = "<group>"; sourceTree = "<group>";
}; };
633BD69E0D2ACE520012A314 /* Products */ = { 633BD4620D2A8DF30012A314 /* Internals */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
633BD6A20D2ACE520012A314 /* VLC.framework */, 633BD4B20D2A90470012A314 /* VLCExceptionHandler.h */,
633BD4AF0D2A90470012A314 /* VLCExceptionHandler.m */,
); );
name = Products; name = Internals;
sourceTree = "<group>"; sourceTree = "<group>";
}; };
633BD6A40D2ACE5E0012A314 /* Dependencies */ = { 633BD6A40D2ACE5E0012A314 /* Dependencies */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
633BD69D0D2ACE520012A314 /* VLC.xcodeproj */, 633BD69D0D2ACE520012A314 /* VLCKit.xcodeproj */,
); );
name = Dependencies; name = Dependencies;
sourceTree = "<group>"; sourceTree = "<group>";
...@@ -367,8 +359,8 @@ ...@@ -367,8 +359,8 @@
projectDirPath = ""; projectDirPath = "";
projectReferences = ( projectReferences = (
{ {
ProductGroup = 633BD69E0D2ACE520012A314 /* Products */; ProductGroup = 632F3C1B0D316F37003BBC56 /* Products */;
ProjectRef = 633BD69D0D2ACE520012A314 /* VLC.xcodeproj */; ProjectRef = 633BD69D0D2ACE520012A314 /* VLCKit.xcodeproj */;
}, },
); );
projectRoot = ""; projectRoot = "";
...@@ -381,11 +373,11 @@ ...@@ -381,11 +373,11 @@
/* End PBXProject section */ /* End PBXProject section */
/* Begin PBXReferenceProxy section */ /* Begin PBXReferenceProxy section */
633BD6A20D2ACE520012A314 /* VLC.framework */ = { 632F3C230D316F37003BBC56 /* VLCKit.framework */ = {
isa = PBXReferenceProxy; isa = PBXReferenceProxy;
fileType = wrapper.framework; fileType = wrapper.framework;
path = VLC.framework; path = VLCKit.framework;
remoteRef = 633BD6A10D2ACE520012A314 /* PBXContainerItemProxy */; remoteRef = 632F3C220D316F37003BBC56 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR; sourceTree = BUILT_PRODUCTS_DIR;
}; };
/* End PBXReferenceProxy section */ /* End PBXReferenceProxy section */
...@@ -428,7 +420,7 @@ ...@@ -428,7 +420,7 @@
); );
runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh; shellPath = /bin/sh;
shellScript = "if test \"$SYMROOT\" == \"$PROJECT_DIR/build\"\nthen\n\tVLCFRAMEWORK=\"$SRCROOT/../Framework/build/$CONFIGURATION/VLC.framework\"\nelse\n\tVLCFRAMEWORK=\"$SYMROOT/VLC.framework\"\nfi\n/Developer/Library/PrivateFrameworks/DevToolsCore.framework/Resources/pbxcp -exclude .DS_Store -exclude CVS -exclude .svn -resolve-src-symlinks $VLCFRAMEWORK $BUILT_PRODUCTS_DIR/$FRAMEWORKS_FOLDER_PATH\n\n\n"; shellScript = "if test \"$SYMROOT\" == \"$PROJECT_DIR/build\"\nthen\n\tVLCFRAMEWORK=\"$SRCROOT/../Framework/build/$CONFIGURATION/VLCKit.framework\"\nelse\n\tVLCFRAMEWORK=\"$SYMROOT/VLCKit.framework\"\nfi\n/Developer/Library/PrivateFrameworks/DevToolsCore.framework/Resources/pbxcp -exclude .DS_Store -exclude CVS -exclude .svn -resolve-src-symlinks $VLCFRAMEWORK $BUILT_PRODUCTS_DIR/$FRAMEWORKS_FOLDER_PATH\n\n\n";
showEnvVarsInLog = 0; showEnvVarsInLog = 0;
}; };
/* End PBXShellScriptBuildPhase section */ /* End PBXShellScriptBuildPhase section */
...@@ -454,20 +446,15 @@ ...@@ -454,20 +446,15 @@
/* End PBXSourcesBuildPhase section */ /* End PBXSourcesBuildPhase section */
/* Begin PBXTargetDependency section */ /* Begin PBXTargetDependency section */
633BD7110D2AE0E50012A314 /* PBXTargetDependency */ = { 632F3C260D316FAD003BBC56 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
name = "vlc-contrib-core-framework";
targetProxy = 633BD7100D2AE0E50012A314 /* PBXContainerItemProxy */;
};
637F33E50D2AEE29001E70AB /* PBXTargetDependency */ = {
isa = PBXTargetDependency; isa = PBXTargetDependency;
name = VLC; name = VLCKit;
targetProxy = 637F33E40D2AEE29001E70AB /* PBXContainerItemProxy */; targetProxy = 632F3C250D316FAD003BBC56 /* PBXContainerItemProxy */;
}; };
637F33E90D2AEE48001E70AB /* PBXTargetDependency */ = { 632F3C280D316FB5003BBC56 /* PBXTargetDependency */ = {
isa = PBXTargetDependency; isa = PBXTargetDependency;
target = 8D1107260486CEB800E47090 /* VLC */; target = 8D1107260486CEB800E47090 /* VLC */;
targetProxy = 637F33E80D2AEE48001E70AB /* PBXContainerItemProxy */; targetProxy = 632F3C270D316FB5003BBC56 /* PBXContainerItemProxy */;
}; };
637F33EB0D2AEE4B001E70AB /* PBXTargetDependency */ = { 637F33EB0D2AEE4B001E70AB /* PBXTargetDependency */ = {
isa = PBXTargetDependency; isa = PBXTargetDependency;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment