This commit is contained in:
Kovid Goyal 2012-10-21 15:41:33 +05:30
parent c8358bb266
commit c85a932d4d
3 changed files with 13 additions and 7 deletions

View File

@ -95,6 +95,9 @@ chmlib_inc_dirs = chmlib_lib_dirs = []
sqlite_inc_dirs = [] sqlite_inc_dirs = []
icu_inc_dirs = [] icu_inc_dirs = []
icu_lib_dirs = [] icu_lib_dirs = []
zlib_inc_dirs = []
zlib_lib_dirs = []
zlib_libs = ['z']
if iswindows: if iswindows:
prefix = r'C:\cygwin\home\kovid\sw' prefix = r'C:\cygwin\home\kovid\sw'
@ -118,6 +121,9 @@ if iswindows:
ft_lib_dirs = [sw_lib_dir] ft_lib_dirs = [sw_lib_dir]
ft_libs = ['freetype'] ft_libs = ['freetype']
ft_inc_dirs = [sw_inc_dir] ft_inc_dirs = [sw_inc_dir]
zlib_inc_dirs = [sw_inc_dir]
zlib_lib_dirs = [sw_lib_dir]
zlib_libs = ['zlib']
magick_inc_dirs = [os.path.join(prefix, 'build', 'ImageMagick-6.7.6')] magick_inc_dirs = [os.path.join(prefix, 'build', 'ImageMagick-6.7.6')]
magick_lib_dirs = [os.path.join(magick_inc_dirs[0], 'VisualMagick', 'lib')] magick_lib_dirs = [os.path.join(magick_inc_dirs[0], 'VisualMagick', 'lib')]

View File

@ -17,7 +17,8 @@ from setup.build_environment import (fc_inc, fc_lib, chmlib_inc_dirs, fc_error,
podofo_inc, podofo_lib, podofo_error, pyqt, OSX_SDK, NMAKE, QMAKE, podofo_inc, podofo_lib, podofo_error, pyqt, OSX_SDK, NMAKE, QMAKE,
msvc, MT, win_inc, win_lib, win_ddk, magick_inc_dirs, magick_lib_dirs, msvc, MT, win_inc, win_lib, win_ddk, magick_inc_dirs, magick_lib_dirs,
magick_libs, chmlib_lib_dirs, sqlite_inc_dirs, icu_inc_dirs, magick_libs, chmlib_lib_dirs, sqlite_inc_dirs, icu_inc_dirs,
icu_lib_dirs, win_ddk_lib_dirs, ft_libs, ft_lib_dirs, ft_inc_dirs) icu_lib_dirs, win_ddk_lib_dirs, ft_libs, ft_lib_dirs, ft_inc_dirs,
zlib_libs, zlib_lib_dirs, zlib_inc_dirs)
MT MT
isunix = islinux or isosx or isbsd isunix = islinux or isosx or isbsd
@ -50,10 +51,6 @@ class Extension(object):
reflow_sources = glob.glob(os.path.join(SRC, 'calibre', 'ebooks', 'pdf', '*.cpp')) reflow_sources = glob.glob(os.path.join(SRC, 'calibre', 'ebooks', 'pdf', '*.cpp'))
reflow_headers = glob.glob(os.path.join(SRC, 'calibre', 'ebooks', 'pdf', '*.h')) reflow_headers = glob.glob(os.path.join(SRC, 'calibre', 'ebooks', 'pdf', '*.h'))
woff_libs = ['z']
if iswindows:
woff_libs = ['zlib']
icu_libs = ['icudata', 'icui18n', 'icuuc', 'icuio'] icu_libs = ['icudata', 'icui18n', 'icuuc', 'icuio']
icu_cflags = [] icu_cflags = []
if iswindows: if iswindows:
@ -138,7 +135,9 @@ extensions = [
headers=[ headers=[
'calibre/utils/fonts/woff/woff.h', 'calibre/utils/fonts/woff/woff.h',
'calibre/utils/fonts/woff/woff-private.h'], 'calibre/utils/fonts/woff/woff-private.h'],
libraries=woff_libs libraries=zlib_libs,
lib_dirs=zlib_lib_dirs,
inc_dirs=zlib_inc_dirs,
), ),

View File

@ -33,7 +33,7 @@ def test_lxml():
raise RuntimeError('lxml failed') raise RuntimeError('lxml failed')
def test_freetype(): def test_freetype():
from calibre.utils.fonts.freetype import test from calibre.utils.fonts.free_type import test
test() test()
print ('FreeType OK!') print ('FreeType OK!')
@ -117,6 +117,7 @@ def test_wpd():
def test_woff(): def test_woff():
from calibre.utils.fonts.woff import test from calibre.utils.fonts.woff import test
test() test()
print ('WOFF ok!')
def test(): def test():
test_plugins() test_plugins()