Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-2-2
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-2-2
Commits
215c6ac6
Commit
215c6ac6
authored
Nov 30, 2013
by
Felix Paul Kühne
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
contrib: fix compilation of libraries for iOS which deploy cmake
parent
bcd00e3b
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
24 additions
and
0 deletions
+24
-0
contrib/bootstrap
contrib/bootstrap
+19
-0
contrib/src/main.mak
contrib/src/main.mak
+3
-0
extras/package/ios/build.sh
extras/package/ios/build.sh
+2
-0
No files found.
contrib/bootstrap
View file @
215c6ac6
...
...
@@ -151,6 +151,24 @@ add_make_enabled()
done
}
check_ios_sdk
()
{
if
test
-z
"
$SDKROOT
"
then
SDKROOT
=
`
xcode-select
-print-path
`
/Platforms/iPhone
${
PLATFORM
}
.platform/Developer/SDKs/iPhone
${
PLATFORM
}${
SDK_VERSION
}
.sdk
echo
"SDKROOT not specified, assuming
$SDKROOT
"
else
SDKROOT
=
"
$SDKROOT
"
fi
if
[
!
-d
"
${
SDKROOT
}
"
]
then
echo
"***
${
SDKROOT
}
does not exist, please install required SDK, or set SDKROOT manually. ***"
exit
1
fi
add_make
"IOS_SDK=
${
SDKROOT
}
"
}
check_macosx_sdk
()
{
[
-z
"
${
OSX_VERSION
}
"
]
&&
echo
"OSX_VERSION not specified, assuming 10.7"
&&
OSX_VERSION
=
10.7
...
...
@@ -206,6 +224,7 @@ case "${OS}" in
check_macosx_sdk
add_make_enabled
"HAVE_MACOSX"
"HAVE_DARWIN_OS"
"HAVE_BSD"
else
check_ios_sdk
add_make_enabled
"HAVE_IOS"
"HAVE_DARWIN_OS"
"HAVE_BSD"
"HAVE_NEON"
"HAVE_ARMV7A"
fi
;;
...
...
contrib/src/main.mak
View file @
215c6ac6
...
...
@@ -397,6 +397,9 @@ ifdef HAVE_DARWIN_OS
echo
"set(CMAKE_LD_FLAGS
$(LDFLAGS)
)"
>>
$@
ifdef
HAVE_IOS
echo
"set(CMAKE_AR ar CACHE FILEPATH "
Archiver
")"
>>
$@
echo
"set(CMAKE_OSX_SYSROOT
$(IOS_SDK)
)"
>>
$@
else
echo
"set(CMAKE_OSX_SYSROOT
$(MACOSX_SDK)
)"
>>
$@
endif
endif
ifdef
HAVE_CROSS_COMPILE
...
...
extras/package/ios/build.sh
View file @
215c6ac6
...
...
@@ -136,6 +136,8 @@ export CXX="xcrun clang++"
export
LD
=
"xcrun ld"
export
STRIP
=
"xcrun strip"
export
PLATFORM
=
$PLATFORM
export
SDK_VERSION
=
$SDK_VERSION
CFLAGS
=
"-isysroot
${
SDKROOT
}
-arch
${
ARCH
}
-miphoneos-version-min=
${
SDK_MIN
}
${
OPTIM
}
"
if
[
"
$ARCH
"
=
"armv7"
-o
"
$ARCH
"
=
"armv7s"
]
;
then
...
...
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