Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
J
jami-daemon
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
130
Issues
130
List
Boards
Labels
Service Desk
Milestones
Iterations
Requirements
Requirements
List
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Operations
Operations
Incidents
Analytics
Analytics
Insights
Issue
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
savoirfairelinux
jami-daemon
Commits
ba088bf2
Commit
ba088bf2
authored
Jun 02, 2016
by
Edric Milaret
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
contrib: allow ios build
Change-Id: Ib5deee2d0172f92febe72d4d3a57a7c3334414c4 Tuleap:
#313
parent
f6ac9c34
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
24 additions
and
9 deletions
+24
-9
contrib/bootstrap
contrib/bootstrap
+3
-2
contrib/src/get-arch.sh
contrib/src/get-arch.sh
+8
-0
contrib/src/main.mak
contrib/src/main.mak
+13
-7
No files found.
contrib/bootstrap
View file @
ba088bf2
...
...
@@ -132,11 +132,11 @@ check_ios_sdk()
{
if
test
-z
"
$SDKROOT
"
then
SDKROOT
=
`
xcode-select
-print-path
`
/Platforms/
iPhone
${
PLATFORM
}
.platform/Developer/SDKs/iPhone
${
PLATFORM
}${
SDK_VERSION
}
.sdk
SDKROOT
=
`
xcode-select
-print-path
`
/Platforms/
${
IOS_TARGET_PLATFORM
}
.platform/Developer/SDKs/
${
IOS_TARGET_
PLATFORM
}${
SDK_VERSION
}
.sdk
echo
"SDKROOT not specified, assuming
$SDKROOT
"
else
SDKROOT
=
"
$SDKROOT
"
fi
fi
if
[
!
-d
"
${
SDKROOT
}
"
]
then
...
...
@@ -144,6 +144,7 @@ check_ios_sdk()
exit
1
fi
add_make
"IOS_SDK=
${
SDKROOT
}
"
add_make
"IOS_TARGET_PLATFORM=
${
IOS_TARGET_PLATFORM
}
"
}
check_macosx_sdk
()
...
...
contrib/src/get-arch.sh
View file @
ba088bf2
...
...
@@ -19,6 +19,14 @@ case "$HOST" in
powerpc64-
*
|
ppc64-
*
)
ARCH
=
"ppc64"
;;
aarch64-
*
)
if
$HAVE_IOS
then
ARCH
=
"arm64"
else
ARCH
=
"aarch64"
fi
;;
*
-
*
)
ARCH
=
"
${
HOST
%%-*
}
"
;;
...
...
contrib/src/main.mak
View file @
ba088bf2
...
...
@@ -151,20 +151,26 @@ endif
CCAS
=
$(CC)
-c
ifdef
HAVE_IOS
MIN_IOS_VERSION
=
8.0
CC
=
xcrun clang
CXX
=
xcrun clang++
ifdef
HAVE_NEON
AS
=
perl
$(
abspath
../../extras/tools/build/bin/gas-preprocessor.pl
)
$(CC)
CCAS
=
gas-preprocessor.pl
$(CC)
-c
else
CCAS
=
$(CC)
-c
endif
AR
=
xcrun ar
LD
=
xcrun ld
STRIP
=
xcrun strip
RANLIB
=
xcrun ranlib
EXTRA_CFLAGS
+=
$(CFLAGS)
EXTRA_LDFLAGS
+=
$(LDFLAGS)
EXTRA_CFLAGS
=
-arch
$(ARCH)
-isysroot
$(IOS_SDK)
ifeq
($(IOS_TARGET_PLATFORM),iPhoneOS)
EXTRA_CFLAGS
+=
-miphoneos-version-min
=
$(MIN_IOS_VERSION)
-fembed-bitcode
else
EXTRA_CFLAGS
+=
-mios-simulator-version-min
=
$(MIN_IOS_VERSION)
endif
EXTRA_CXXFLAGS
=
$(EXTRA_CFLAGS)
-std
=
c++11
-stdlib
=
libc++
EXTRA_LDFLAGS
=
$(EXTRA_CFLAGS)
endif
ifdef
HAVE_WIN32
...
...
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