kiwix/kiwix-android
1
0
Fork 0
mirror of https://github.com/kiwix/kiwix-android.git synced 2025-09-08 14:52:13 -04:00
Code Issues Packages Projects Releases Wiki Activity

+ fix compilation with external zimlib

Browse Source
This commit is contained in:
kelson42 2013-12-14 12:40:23 +01:00
parent ce4caa266f
commit 5261fd2143
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
build-android-with-native.py
View File

@ -7,6 +7,7 @@
. Compile libkiwix ''' . Compile libkiwix '''
import os import os
import re
import sys import sys
import copy import copy
import shutil import shutil
@ -408,7 +409,7 @@ for arch in ARCHS:
+ platform_includes)}) + platform_includes)})
link_cmd = ('ar rvs libzim.a ' link_cmd = ('ar rvs libzim.a '
'%(obj_files)s ' '%(obj_files)s '
% {'obj_files': ' '.join([n.replace('.cpp', '.o') % {'obj_files': ' '.join([re.sub('(\.c[p]*)', '.o', n)
for n in LIBZIM_SOURCE_FILES])}) for n in LIBZIM_SOURCE_FILES])})
if COMPILE_LIBZIM: if COMPILE_LIBZIM:
@ -420,7 +421,7 @@ for arch in ARCHS:
os.remove(libzim_file) os.remove(libzim_file)
for src in LIBZIM_SOURCE_FILES: for src in LIBZIM_SOURCE_FILES:
os.remove(src.replace('.cpp', '.o')) os.remove(re.sub('(\.c[p]*)', '.o', src))
# check that the step went well # check that the step went well
if COMPILE_LIBZIM or COMPILE_LIBKIWIX: if COMPILE_LIBZIM or COMPILE_LIBKIWIX: