Skip to content

V
vlc-2-2
Commit 652fbde4 authored by Felix Paul Kühne's avatar Felix Paul Kühne
Browse files
Options

VLCKit: fixed typo which prevented the creation of re-distributable bundles... 

VLCKit: fixed typo which prevented the creation of re-distributable bundles and added the libvlc headers to the project file (not distributed in any target)
parent 6e57b286
Hide whitespace changes
Inline Side-by-side
Showing with 34 additions and 2 deletions
projects/macosx/framework/Pre-Compile.sh
View file @ 652fbde4
...@@ -72,7 +72,7 @@ vlc_install_object() { ...@@ -72,7 +72,7 @@ vlc_install_object() {
local destination_name=${5} local destination_name=${5}
local suffix=${6} local suffix=${6}
if [ $type = "lib" ]; then if [ $type = "library" ]; then
local install_name="@loader_path/lib" local install_name="@loader_path/lib"
elif [ $type = "module" ]; then elif [ $type = "module" ]; then
local install_name="@loader_path/plugins" local install_name="@loader_path/plugins"
...@@ -109,7 +109,7 @@ vlc_install_object() { ...@@ -109,7 +109,7 @@ vlc_install_object() {
# Update the dynamic library so it will know where to look for the other libraries # Update the dynamic library so it will know where to look for the other libraries
echo "Installing ${type} `basename ${lib_dest}`" echo "Installing ${type} `basename ${lib_dest}`"
if [ "${type}" = "lib" ]; then if [ "${type}" = "library" ]; then
# Change the reference of libvlc.1 stored in the usr directory to libvlc.dylib in the framework's library directory # Change the reference of libvlc.1 stored in the usr directory to libvlc.dylib in the framework's library directory
install_name_tool -id "${install_name}/${lib_name}" ${lib_dest} > /dev/null install_name_tool -id "${install_name}/${lib_name}" ${lib_dest} > /dev/null
fi fi
......
projects/macosx/framework/VLCKit.xcodeproj/project.pbxproj
View file @ 652fbde4
...@@ -182,6 +182,18 @@ ...@@ -182,6 +182,18 @@
8DC2EF5B0486A6940098B216 /* VLCKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = VLCKit.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>"; };
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; };
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; };
CCEC5B76114D9BE800D34AAB /* libvlc_media_library.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = libvlc_media_library.h; path = ../../../include/vlc/libvlc_media_library.h; sourceTree = SOURCE_ROOT; };
CCEC5B77114D9BE800D34AAB /* libvlc_media_list_player.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = libvlc_media_list_player.h; path = ../../../include/vlc/libvlc_media_list_player.h; sourceTree = SOURCE_ROOT; };
CCEC5B78114D9BE800D34AAB /* libvlc_media_list.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = libvlc_media_list.h; path = ../../../include/vlc/libvlc_media_list.h; sourceTree = SOURCE_ROOT; };
CCEC5B79114D9BE800D34AAB /* libvlc_media_player.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = libvlc_media_player.h; path = ../../../include/vlc/libvlc_media_player.h; sourceTree = SOURCE_ROOT; };
CCEC5B7A114D9BE800D34AAB /* libvlc_media.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = libvlc_media.h; path = ../../../include/vlc/libvlc_media.h; sourceTree = SOURCE_ROOT; };
CCEC5B7B114D9BE800D34AAB /* libvlc_structures.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = libvlc_structures.h; path = ../../../include/vlc/libvlc_structures.h; sourceTree = SOURCE_ROOT; };
CCEC5B7C114D9BE800D34AAB /* libvlc_vlm.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = libvlc_vlm.h; path = ../../../include/vlc/libvlc_vlm.h; sourceTree = SOURCE_ROOT; };
CCEC5B7D114D9BE800D34AAB /* libvlc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = libvlc.h; path = ../../../include/vlc/libvlc.h; sourceTree = SOURCE_ROOT; };
CCEC5B7E114D9BE800D34AAB /* vlc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = vlc.h; path = ../../../include/vlc/vlc.h; sourceTree = SOURCE_ROOT; };
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>"; };
...@@ -337,6 +349,25 @@ ...@@ -337,6 +349,25 @@
name = Internal; name = Internal;
sourceTree = "<group>"; sourceTree = "<group>";
}; };
CCEC5B6C114D9BD300D34AAB /* libvlc (not distributed) */ = {
isa = PBXGroup;
children = (
CCEC5B73114D9BE800D34AAB /* deprecated.h */,
CCEC5B74114D9BE800D34AAB /* libvlc_events.h */,
CCEC5B75114D9BE800D34AAB /* libvlc_media_discoverer.h */,
CCEC5B76114D9BE800D34AAB /* libvlc_media_library.h */,
CCEC5B77114D9BE800D34AAB /* libvlc_media_list_player.h */,
CCEC5B78114D9BE800D34AAB /* libvlc_media_list.h */,
CCEC5B79114D9BE800D34AAB /* libvlc_media_player.h */,
CCEC5B7A114D9BE800D34AAB /* libvlc_media.h */,
CCEC5B7B114D9BE800D34AAB /* libvlc_structures.h */,
CCEC5B7C114D9BE800D34AAB /* libvlc_vlm.h */,
CCEC5B7D114D9BE800D34AAB /* libvlc.h */,
CCEC5B7E114D9BE800D34AAB /* vlc.h */,
);
name = "libvlc (not distributed)";
sourceTree = "<group>";
};
EF53DD5F0CBD7BD100D3D4D0 /* Linked Libraries */ = { EF53DD5F0CBD7BD100D3D4D0 /* Linked Libraries */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
...@@ -369,6 +400,7 @@ ...@@ -369,6 +400,7 @@
EF78BD3B0CAEEFD000354E6E /* Headers */ = { EF78BD3B0CAEEFD000354E6E /* Headers */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
CCEC5B6C114D9BD300D34AAB /* libvlc (not distributed) */,
637CFB960D2D281900A041B6 /* Internal */, 637CFB960D2D281900A041B6 /* Internal */,
EF6BC9110DA1932F00DD37EF /* Public */, EF6BC9110DA1932F00DD37EF /* Public */,
); );
......
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