Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Use bundles ICU on OS X as well, since we are now no longer generating universal builds

Browse Source
This commit is contained in:
Kovid Goyal 2014-05-09 18:49:57 +05:30
parent 0e8bc340eb
commit 243a08ef0e
3 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
setup/build_environment.py
View File

@ -156,19 +156,20 @@ if iswindows:
podofo_inc = os.path.join(sw_inc_dir, 'podofo')
podofo_lib = sw_lib_dir
elif isosx:
podofo_inc = '/sw/podofo'
podofo_lib = '/sw/lib'
magick_inc_dirs = consolidate('MAGICK_INC',
'/sw/include/ImageMagick')
magick_lib_dirs = consolidate('MAGICK_LIB',
'/sw/lib')
sw = os.environ.get('SW', '/sw')
podofo_inc = os.path.join(sw, 'podofo')
podofo_lib = os.path.join(sw, 'lib')
magick_inc_dirs = consolidate('MAGICK_INC', sw + '/include/ImageMagick')
magick_lib_dirs = consolidate('MAGICK_LIB', sw + '/lib')
magick_libs = ['MagickWand', 'MagickCore']
png_inc_dirs = consolidate('PNG_INC_DIR', '/sw/include')
png_lib_dirs = consolidate('PNG_LIB_DIR', '/sw/lib')
png_inc_dirs = consolidate('PNG_INC_DIR', sw + '/include')
png_lib_dirs = consolidate('PNG_LIB_DIR', sw + '/lib')
png_libs = ['png12']
ft_libs = ['freetype']
ft_inc_dirs = ['/sw/include/freetype2']
bq = glob.glob('/sw/build/qt-*/include')[-1]
ft_inc_dirs = [sw + '/include/freetype2']
bq = glob.glob(sw + '/build/qt-*/include')[-1]
icu_inc_dirs = [sw + '/include']
icu_lib_dirs = [sw + '/lib']
else:
# Include directories
png_inc_dirs = pkgconfig_include_dirs('libpng', 'PNG_INC_DIR',

3
setup/extensions.py
View File

@ -65,9 +65,6 @@ icu_libs = ['icudata', 'icui18n', 'icuuc', 'icuio']
icu_cflags = []
if iswindows:
icu_libs = ['icudt', 'icuin', 'icuuc', 'icuio']
if isosx:
icu_libs = ['icucore']
icu_cflags = ['-DU_DISABLE_RENAMING'] # Needed to use system libicucore.dylib
extensions = [

2
setup/installer/osx/app/main.py
View File

@ -437,7 +437,7 @@ class Py2App(object):
@flush
def add_misc_libraries(self):
for x in ('usb-1.0.0', 'mtp.9', 'readline.6.1', 'wmflite-0.2.7',
'chm.0', 'sqlite3.0'):
'chm.0', 'sqlite3.0', 'icudata.53', 'icui18n.53', 'icuio.53', 'icuuc.53'):
info('\nAdding', x)
x = 'lib%s.dylib'%x
shutil.copy2(join(SW, 'lib', x), self.frameworks_dir)