Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc
Commits
54f8fd2b
Commit
54f8fd2b
authored
16 years ago
by
Pierre d'Herbemont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
macosx/framework: Use cmake because we can.
parent
ca2e14dc
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
21 additions
and
20 deletions
+21
-20
projects/macosx/framework/Pre-Compile.sh
projects/macosx/framework/Pre-Compile.sh
+17
-15
projects/macosx/framework/VLCKit.xcodeproj/project.pbxproj
projects/macosx/framework/VLCKit.xcodeproj/project.pbxproj
+4
-5
No files found.
projects/macosx/framework/Pre-Compile.sh
View file @
54f8fd2b
...
...
@@ -21,7 +21,6 @@ if test "${ACTION}" = "VLC-release.app"; then
fi
if
test
"
${
ACTION
}
"
=
"build"
;
then
vlc_config
=
"
${
VLC_SRC_DIR
}
/vlc-config"
lib
=
"lib"
modules
=
"modules"
share
=
"share"
...
...
@@ -74,7 +73,7 @@ if test "${ACTION}" = "build"; then
for
linked_lib
in
`
otool
-L
${
lib_dest
}
|
grep
'('
|
sed
's/\((.*)\)//'
`
;
do
name
=
`
basename
${
linked_lib
}
`
case
"
${
linked_lib
}
"
in
*
/vlc_
install_dir/lib/
*
|
*
/extras/contrib/lib/
*
)
*
/vlc_
build_dir/lib/
*
|
*
vlc
*
|
*
/extras/contrib/lib/
*
)
if
test
-e
${
linked_lib
}
;
then
install_name_tool
-change
${
linked_lib
}
"
${
lib_install_prefix
}
/
${
name
}
"
${
lib_dest
}
linked_libs
=
"
${
linked_libs
}
${
ref_lib
}
"
...
...
@@ -91,15 +90,23 @@ if test "${ACTION}" = "build"; then
# @function install_library
##########################
##########################
# Hack for VLC-release.app
if
[
"
$FULL_PRODUCT_NAME
"
=
"VLC-release.app"
]
;
then
install_library
"
${
VLC_BUILD_DIR
}
/
${
prefix
}
vlc"
"
${
target
}
"
"bin"
"@loader_path/lib"
prefix
=
".libs/"
else
prefix
=
""
fi
##########################
# Build the modules folder (Same as VLCKit.framework/modules in Makefile)
echo
"Building modules folder..."
# Figure out what modules are available to install
for
module
in
`
top_builddir
=
"
${
VLC_BUILD_DIR
}
"
${
vlc_config
}
--target
plugin
`
;
do
for
module
in
`
find
${
VLC_BUILD_DIR
}
/modules
-name
*
.so
`
;
do
# Check to see that the reported module actually exists
if
test
-n
${
module
}
;
then
module_src
=
"
`
dirname
${
module
}
`
/.libs/
`
basename
${
module
}
`
.dylib"
install_library
${
module_src
}
${
target_modules
}
"module"
install_library
${
module
}
${
target_modules
}
"module"
fi
done
# Build the modules folder
...
...
@@ -122,7 +129,7 @@ if test "${ACTION}" = "build"; then
##########################
# Build the library folder
echo
"Building library folder..."
echo
"Building library folder...
${
linked_libs
}
"
for
linked_lib
in
${
linked_libs
}
;
do
case
"
${
linked_lib
}
"
in
*
/extras/contrib/lib/
*
.dylib
)
...
...
@@ -138,20 +145,15 @@ if test "${ACTION}" = "build"; then
esac
done
install_library
"
${
VLC_BUILD_DIR
}
/src/.libs/libvlc-control.dylib"
${
target_lib
}
"library"
install_library
"
${
VLC_BUILD_DIR
}
/src/.libs/libvlc.dylib"
${
target_lib
}
"library"
##########################
# Hack for VLC-release.app
if
[
"
$FULL_PRODUCT_NAME
"
=
"VLC-release.app"
]
;
then
install_library
"
${
VLC_BUILD_DIR
}
/.libs/vlc"
"
${
target
}
"
"bin"
"@loader_path/lib"
fi
install_library
"
${
VLC_BUILD_DIR
}
/src/
${
prefix
}
libvlc-control.dylib"
${
target_lib
}
"library"
install_library
"
${
VLC_BUILD_DIR
}
/src/
${
prefix
}
libvlc.dylib"
${
target_lib
}
"library"
##########################
# Build the share folder
echo
"Building share folder..."
pbxcp
=
"/Developer/Library/PrivateFrameworks/DevToolsCore.framework/Resources/pbxcp -exclude .DS_Store -exclude CVS -exclude .svn -resolve-src-symlinks"
mkdir
-p
${
target_share
}
$pbxcp
${
VLC_
BUILD
_DIR
}
/share/luameta
${
target_share
}
$pbxcp
${
VLC_
BUILD
_DIR
}
/share/luaplaylist
${
target_share
}
$pbxcp
${
VLC_
SRC
_DIR
}
/share/luameta
${
target_share
}
$pbxcp
${
VLC_
SRC
_DIR
}
/share/luaplaylist
${
target_share
}
fi
This diff is collapsed.
Click to expand it.
projects/macosx/framework/VLCKit.xcodeproj/project.pbxproj
View file @
54f8fd2b
...
...
@@ -352,7 +352,7 @@
buildPhases
=
(
);
buildToolPath
=
/usr/bin/make
;
buildWorkingDirectory
=
../../..
;
buildWorkingDirectory
=
"$(SYMROOT)/vlc_build_dir"
;
dependencies
=
(
);
name
=
"vlc-core"
;
...
...
@@ -453,14 +453,13 @@
);
inputPaths
=
(
$SRCROOT/../../../bootstrap
,
$SRCROOT/../../../
configure.ac
,
$SRCROOT/../../../
CMakeLists.txt
,
);
outputPaths
=
(
$SRCROOT/../../../configure
,
);
runOnlyForDeploymentPostprocessing
=
0
;
shellPath
=
/bin/sh
;
shellScript
=
"if test $ACTION = \"clean\"\nthen\n exit 0\nfi\n
cd ../../.. && ./bootstrap && ./configure --enable-debug --disable-nls\n
"
;
shellScript
=
"if test $ACTION = \"clean\"\nthen\n exit 0\nfi\n
top_srcdir=`pwd`/../../..\nmkdir -p $SYMROOT/vlc_build_dir\nrm -Rf $top_srcdir/CMakeCache.txt\ncd $SYMROOT/vlc_build_dir && cmake $top_srcdir
"
;
showEnvVarsInLog
=
0
;
};
EF78BD2E0CAEEF9500354E6E
/* ShellScript */
=
{
...
...
@@ -565,7 +564,7 @@
PRIVATE_HEADERS_FOLDER_PATH
=
"$(CONTENTS_FOLDER_PATH)/PrivateHeaders"
;
PRODUCT_NAME
=
VLCKit
;
SCAN_ALL_SOURCE_FILES_FOR_INCLUDES
=
YES
;
VLC_BUILD_DIR
=
"$(
VLC_SRC_DIR)
"
;
VLC_BUILD_DIR
=
"$(
SYMROOT)/vlc_build_dir
"
;
VLC_FRAMEWORK
=
"$(TARGET_BUILD_DIR)/$(PROJECT_NAME).framework"
;
VLC_SRC_DIR
=
../../..
;
WRAPPER_EXTENSION
=
framework
;
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment