Skip to content

V
vlc-2-2
Commit 10a3c487 authored by Sebastien Zwickert's avatar Sebastien Zwickert Committed by Felix Paul Kühne
Browse files
Options

VLCKit: fixes compilation issues. 

Signed-off-by: default avatarFelix Paul Kühne <fkuehne@videolan.org>
parent 3b851f4e
Hide whitespace changes
Inline Side-by-side
Showing with 11 additions and 14 deletions
projects/macosx/framework/Sources/VLCExtensionsManager.m
View file @ 10a3c487
...@@ -16,8 +16,8 @@ ...@@ -16,8 +16,8 @@
// Here comes the nasty hack. // Here comes the nasty hack.
#define MODULE_STRING "VLCKit" #define MODULE_STRING "VLCKit"
#import "../../../../src/control/media_player_internal.h" #import "../../../../lib/media_player_internal.h"
#import "../../../../src/control/libvlc_internal.h" #import "../../../../lib/libvlc_internal.h"
static input_thread_t *libvlc_media_player_get_input_thread(libvlc_media_player_t *player) static input_thread_t *libvlc_media_player_get_input_thread(libvlc_media_player_t *player)
{ {
......
projects/macosx/framework/VLCKit.xcodeproj/project.pbxproj
View file @ 10a3c487
...@@ -213,11 +213,10 @@ ...@@ -213,11 +213,10 @@
63D88C56124E9A5100F65FA0 /* Quartz.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Quartz.framework; path = System/Library/Frameworks/Quartz.framework; sourceTree = SDKROOT; }; 63D88C56124E9A5100F65FA0 /* Quartz.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Quartz.framework; path = System/Library/Frameworks/Quartz.framework; sourceTree = SDKROOT; };
63D88CA9124E9A8200F65FA0 /* ApplicationServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ApplicationServices.framework; path = System/Library/Frameworks/ApplicationServices.framework; sourceTree = SDKROOT; }; 63D88CA9124E9A8200F65FA0 /* ApplicationServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ApplicationServices.framework; path = System/Library/Frameworks/ApplicationServices.framework; sourceTree = SDKROOT; };
63D88D92124E9BF600F65FA0 /* VLCMediaThumbnailer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = VLCMediaThumbnailer.h; path = Public/VLCMediaThumbnailer.h; sourceTree = "<group>"; }; 63D88D92124E9BF600F65FA0 /* VLCMediaThumbnailer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = VLCMediaThumbnailer.h; path = Public/VLCMediaThumbnailer.h; sourceTree = "<group>"; };
8DC2EF5B0486A6940098B216 /* VLCKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = VLCKit.framework; sourceTree = BUILT_PRODUCTS_DIR; }; A26DCC7314279D2400EA47A0 /* 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>"; };
CC4C593F13F53EA400FB0EFC /* VLCKit copy.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = "VLCKit copy.framework"; sourceTree = BUILT_PRODUCTS_DIR; }; CC4C594013F53EA400FB0EFC /* VLCKit-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = "VLCKit-Info.plist"; path = "/Users/dilaroga/dev/vlc_workspace/vlc/projects/macosx/framework/VLCKit-Info.plist"; sourceTree = "<absolute>"; };
CC4C594013F53EA400FB0EFC /* VLCKit copy-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = "VLCKit copy-Info.plist"; path = "/Users/fpk/Desktop/videolan/vlc/projects/macosx/framework/VLCKit copy-Info.plist"; sourceTree = "<absolute>"; };
CCEC5B73114D9BE800D34AAB /* deprecated.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = deprecated.h; path = ../../../include/vlc/deprecated.h; sourceTree = SOURCE_ROOT; }; CCEC5B73114D9BE800D34AAB /* deprecated.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = deprecated.h; path = ../../../include/vlc/deprecated.h; sourceTree = SOURCE_ROOT; };
CCEC5B74114D9BE800D34AAB /* libvlc_events.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = libvlc_events.h; path = ../../../include/vlc/libvlc_events.h; sourceTree = SOURCE_ROOT; }; CCEC5B74114D9BE800D34AAB /* libvlc_events.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = libvlc_events.h; path = ../../../include/vlc/libvlc_events.h; sourceTree = SOURCE_ROOT; };
CCEC5B75114D9BE800D34AAB /* libvlc_media_discoverer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = libvlc_media_discoverer.h; path = ../../../include/vlc/libvlc_media_discoverer.h; sourceTree = SOURCE_ROOT; }; CCEC5B75114D9BE800D34AAB /* libvlc_media_discoverer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = libvlc_media_discoverer.h; path = ../../../include/vlc/libvlc_media_discoverer.h; sourceTree = SOURCE_ROOT; };
...@@ -278,8 +277,7 @@ ...@@ -278,8 +277,7 @@
034768DFFF38A50411DB9C8B /* Products */ = { 034768DFFF38A50411DB9C8B /* Products */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
8DC2EF5B0486A6940098B216 /* VLCKit.framework */, A26DCC7314279D2400EA47A0 /* VLCKit.framework */,
CC4C593F13F53EA400FB0EFC /* VLCKit copy.framework */,
); );
name = Products; name = Products;
sourceTree = "<group>"; sourceTree = "<group>";
...@@ -295,7 +293,7 @@ ...@@ -295,7 +293,7 @@
034768DFFF38A50411DB9C8B /* Products */, 034768DFFF38A50411DB9C8B /* Products */,
63D88C56124E9A5100F65FA0 /* Quartz.framework */, 63D88C56124E9A5100F65FA0 /* Quartz.framework */,
63D88CA9124E9A8200F65FA0 /* ApplicationServices.framework */, 63D88CA9124E9A8200F65FA0 /* ApplicationServices.framework */,
CC4C594013F53EA400FB0EFC /* VLCKit copy-Info.plist */, CC4C594013F53EA400FB0EFC /* VLCKit-Info.plist */,
); );
name = VLC; name = VLC;
sourceTree = "<group>"; sourceTree = "<group>";
...@@ -537,7 +535,7 @@ ...@@ -537,7 +535,7 @@
name = "Build just VLCKit"; name = "Build just VLCKit";
productInstallPath = "$(HOME)/Library/Frameworks"; productInstallPath = "$(HOME)/Library/Frameworks";
productName = VLC; productName = VLC;
productReference = 8DC2EF5B0486A6940098B216 /* VLCKit.framework */; productReference = A26DCC7314279D2400EA47A0 /* VLCKit.framework */;
productType = "com.apple.product-type.framework"; productType = "com.apple.product-type.framework";
}; };
CC4C590813F53EA400FB0EFC /* Build Everything */ = { CC4C590813F53EA400FB0EFC /* Build Everything */ = {
...@@ -561,7 +559,6 @@ ...@@ -561,7 +559,6 @@
name = "Build Everything"; name = "Build Everything";
productInstallPath = "$(HOME)/Library/Frameworks"; productInstallPath = "$(HOME)/Library/Frameworks";
productName = VLC; productName = VLC;
productReference = CC4C593F13F53EA400FB0EFC /* VLCKit copy.framework */;
productType = "com.apple.product-type.framework"; productType = "com.apple.product-type.framework";
}; };
/* End PBXNativeTarget section */ /* End PBXNativeTarget section */
...@@ -1008,7 +1005,7 @@ ...@@ -1008,7 +1005,7 @@
"$(VLC_SRC_DIR)/include", "$(VLC_SRC_DIR)/include",
"Headers/**", "Headers/**",
); );
INFOPLIST_FILE = "VLCKit copy-Info.plist"; INFOPLIST_FILE = "VLCKit-Info.plist";
INSTALL_PATH = "@loader_path/../Frameworks"; INSTALL_PATH = "@loader_path/../Frameworks";
LIBRARY_SEARCH_PATHS = "$(CONFIGURATION_BUILD_DIR)/$(PRODUCT_NAME).$(WRAPPER_EXTENSION)/lib"; LIBRARY_SEARCH_PATHS = "$(CONFIGURATION_BUILD_DIR)/$(PRODUCT_NAME).$(WRAPPER_EXTENSION)/lib";
OTHER_LDFLAGS = ( OTHER_LDFLAGS = (
...@@ -1019,7 +1016,7 @@ ...@@ -1019,7 +1016,7 @@
"-lvlc", "-lvlc",
); );
PRIVATE_HEADERS_FOLDER_PATH = "$(CONTENTS_FOLDER_PATH)/PrivateHeaders"; PRIVATE_HEADERS_FOLDER_PATH = "$(CONTENTS_FOLDER_PATH)/PrivateHeaders";
PRODUCT_NAME = "VLCKit copy"; PRODUCT_NAME = VLCKit;
SCAN_ALL_SOURCE_FILES_FOR_INCLUDES = YES; SCAN_ALL_SOURCE_FILES_FOR_INCLUDES = YES;
SDKROOT = macosx; SDKROOT = macosx;
WRAPPER_EXTENSION = framework; WRAPPER_EXTENSION = framework;
...@@ -1042,7 +1039,7 @@ ...@@ -1042,7 +1039,7 @@
"$(VLC_SRC_DIR)/include", "$(VLC_SRC_DIR)/include",
"Headers/**", "Headers/**",
); );
INFOPLIST_FILE = "VLCKit copy-Info.plist"; INFOPLIST_FILE = "VLCKit-Info.plist";
INSTALL_PATH = "@loader_path/../Frameworks"; INSTALL_PATH = "@loader_path/../Frameworks";
LIBRARY_SEARCH_PATHS = "$(CONFIGURATION_BUILD_DIR)/$(PRODUCT_NAME).$(WRAPPER_EXTENSION)/lib"; LIBRARY_SEARCH_PATHS = "$(CONFIGURATION_BUILD_DIR)/$(PRODUCT_NAME).$(WRAPPER_EXTENSION)/lib";
OTHER_LDFLAGS = ( OTHER_LDFLAGS = (
...@@ -1053,7 +1050,7 @@ ...@@ -1053,7 +1050,7 @@
"-lvlc", "-lvlc",
); );
PRIVATE_HEADERS_FOLDER_PATH = "$(CONTENTS_FOLDER_PATH)/PrivateHeaders"; PRIVATE_HEADERS_FOLDER_PATH = "$(CONTENTS_FOLDER_PATH)/PrivateHeaders";
PRODUCT_NAME = "VLCKit copy"; PRODUCT_NAME = VLCKit;
SCAN_ALL_SOURCE_FILES_FOR_INCLUDES = YES; SCAN_ALL_SOURCE_FILES_FOR_INCLUDES = YES;
SDKROOT = macosx; SDKROOT = macosx;
WRAPPER_EXTENSION = framework; WRAPPER_EXTENSION = framework;
......
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