Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Open sidebar
VideoLAN
VLCKit
Commits
9b3d6ab9
Commit
9b3d6ab9
authored
Sep 11, 2017
by
Thomas Guillem
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MVK: fix simulator build with -a
parent
ea926603
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
29 additions
and
8 deletions
+29
-8
buildMobileVLCKit.sh
buildMobileVLCKit.sh
+29
-8
No files found.
buildMobileVLCKit.sh
View file @
9b3d6ab9
...
...
@@ -134,6 +134,14 @@ get_arch() {
fi
}
is_simulator_arch
()
{
if
[
"
$1
"
=
"i386"
-o
"
$1
"
=
"x86_64"
]
;
then
return
0
else
return
1
fi
}
spushd
()
{
pushd
"
$1
"
2>&1> /dev/null
...
...
@@ -814,12 +822,15 @@ build_universal_static_lib() {
fi
done
spushd
$actual_arch
/lib/vlc/plugins
for
i
in
`
ls
*
.a
`
do
VLCMODULES
=
"
$i
$VLCMODULES
"
done
spopd
# $actual_arch/lib/vlc/plugins
if
(!
is_simulator_arch
$arch
)
;
then
echo
"IPHONE OS:
$arch
"
spushd
$actual_arch
/lib/vlc/plugins
for
i
in
`
ls
*
.a
`
do
VLCMODULES
=
"
$i
$VLCMODULES
"
done
spopd
# $actual_arch/lib/vlc/plugins
fi
if
[
"
$OSSTYLE
"
!=
"AppleTV"
-a
\
\(
"
$FARCH
"
=
"all"
-o
"
$FARCH
"
=
"armv7"
-o
"
$FARCH
"
=
"armv7s"
\)
]
;
then
...
...
@@ -836,6 +847,16 @@ build_universal_static_lib() {
if
[
-d
libvlc/vlc/install-
"
$OSSTYLE
"
Simulator
]
;
then
spushd libvlc/vlc/install-
"
$OSSTYLE
"
Simulator
if
(
is_simulator_arch
$arch
)
;
then
echo
"SIMU OS:
$arch
"
spushd
$actual_arch
/lib/vlc/plugins
for
i
in
`
ls
*
.a
`
do
VLCMODULES
=
"
$i
$VLCMODULES
"
done
spopd
# $actual_arch/lib/vlc/plugins
fi
for
i
in
`
ls
.
`
do
local
iarch
=
"
`
get_arch
$i
`
"
...
...
@@ -950,11 +971,11 @@ if [ "$TVOS" != "yes" ]; then
info
"Building static MobileVLCKit.framework"
lipo_libs
=
""
if
[
-d
libvlc/vlc/install-iPhoneOS
]
;
then
if
[
"
$FARCH
"
=
"all"
]
||
(!
is_simulator_arch
$FARCH
)
;
then
buildxcodeproj MobileVLCKit
"MobileVLCKit"
iphoneos
lipo_libs
=
"
$lipo_libs
${
CONFIGURATION
}
-iphoneos/libMobileVLCKit.a"
fi
if
[
-d
libvlc/vlc/install-iPhoneSimulator
]
;
then
if
[
"
$FARCH
"
=
"all"
]
||
(
is_simulator_arch
$arch
)
;
then
buildxcodeproj MobileVLCKit
"MobileVLCKit"
iphonesimulator
lipo_libs
=
"
$lipo_libs
${
CONFIGURATION
}
-iphonesimulator/libMobileVLCKit.a"
fi
...
...
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