commit
a888602f77
|
@ -72,6 +72,10 @@ matrix:
|
|||
if: type!=cron AND type!=pull_request
|
||||
- env: PLATFORM="native_dyn"
|
||||
os: osx
|
||||
- env: PLATFORM="iOS_arm64"
|
||||
os: osx
|
||||
- env: PLATFORM="iOS_i386"
|
||||
os: osx
|
||||
|
||||
notifications:
|
||||
irc:
|
||||
|
|
|
@ -1,5 +1,2 @@
|
|||
include kiwixbuild/templates/cmake_cross_file.txt
|
||||
include kiwixbuild/templates/meson_cross_file.txt
|
||||
include kiwixbuild/templates/cmake_android_cross_file.txt
|
||||
include kiwixbuild/templates/cmake_i586_cross_file.txt
|
||||
include kiwixbuild/templates/*_cross_file.txt
|
||||
include kiwixbuild/patches/*.patch
|
||||
|
|
|
@ -635,7 +635,7 @@ class iOS_sdk(Toolchain):
|
|||
env['CFLAGS'] = " -fembed-bitcode -isysroot {SDKROOT} -arch {arch} -miphoneos-version-min=9.0 ".format(SDKROOT=self.root_path, arch=arch) + env['CFLAGS']
|
||||
env['CXXFLAGS'] = env['CFLAGS'] + " -stdlib=libc++ -std=c++11 "+env['CXXFLAGS']
|
||||
env['LDFLAGS'] = " -arch {arch} -isysroot {SDKROOT} ".format(SDKROOT=self.root_path, arch=arch)
|
||||
env['MACOSX_DEPLOYMENT_TARGET'] = "10.4"
|
||||
env['MACOSX_DEPLOYMENT_TARGET'] = "10.7"
|
||||
|
||||
def set_compiler(self, env):
|
||||
env['CC'] = self.binaries['CC']
|
||||
|
|
|
@ -196,6 +196,8 @@ except URLError:
|
|||
if environ['TRAVIS_EVENT_TYPE'] != 'cron' and not make_release:
|
||||
if PLATFORM.startswith('android'):
|
||||
TARGETS = ('kiwix-android',)
|
||||
elif PLATFORM.startswith('iOS'):
|
||||
TARGETS = ('kiwix-lib',)
|
||||
elif PLATFORM.startswith('native_'):
|
||||
if TRAVIS_OS_NAME == "osx":
|
||||
TARGETS = ('kiwix-lib', 'zim-tools', 'zimwriterfs')
|
||||
|
@ -217,6 +219,8 @@ if PLATFORM.startswith('android'):
|
|||
TARGETS = ('libzim', 'kiwix-lib')
|
||||
else:
|
||||
TARGETS = ('libzim', 'kiwix-lib', 'kiwix-android')
|
||||
elif PLATFORM.startswith('iOS'):
|
||||
TARGETS = ('libzim', 'kiwix-lib')
|
||||
elif PLATFORM.startswith('native_'):
|
||||
if TRAVIS_OS_NAME == "osx":
|
||||
TARGETS = ('libzim', 'zimwriterfs', 'zim-tools', 'kiwix-lib')
|
||||
|
|
Loading…
Reference in New Issue