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

Change windows build environment detection to work with the new automatic build system

Browse Source
This commit is contained in:
Kovid Goyal 2016-07-17 09:13:27 +05:30
parent 4c3d3ecae8
commit 7bce30a9db
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
setup/build_environment.py
View File

@ -135,24 +135,18 @@ if iswindows:
prefix = sw = os.environ.get('SW', r'C:\cygwin64\home\kovid\sw') prefix = sw = os.environ.get('SW', r'C:\cygwin64\home\kovid\sw')
sw_inc_dir = os.path.join(prefix, 'include') sw_inc_dir = os.path.join(prefix, 'include')
sw_lib_dir = os.path.join(prefix, 'lib') sw_lib_dir = os.path.join(prefix, 'lib')
ICU = os.environ.get('ICU_DIR', os.path.join(prefix, 'private', 'icu')) icu_inc_dirs = [sw_inc_dir]
icu_inc_dirs = [os.path.join(ICU, 'source', 'common'), os.path.join(ICU, icu_lib_dirs = [sw_lib_dir]
'source', 'i18n')] openssl_inc_dirs = [sw_inc_dir]
icu_lib_dirs = [os.path.join(ICU, 'source', 'lib')] openssl_lib_dirs = [sw_lib_dir]
SSL = os.environ.get('OPENSSL_DIR', os.path.join(prefix, 'private', 'openssl'))
openssl_inc_dirs = [os.path.join(SSL, 'include')]
openssl_lib_dirs = [os.path.join(SSL, 'lib')]
sqlite_inc_dirs = [sw_inc_dir] sqlite_inc_dirs = [sw_inc_dir]
chmlib_inc_dirs = consolidate('CHMLIB_INC_DIR', os.path.join(prefix, chmlib_inc_dirs = [sw_inc_dir]
'build', 'chmlib-0.40', 'src')) chmlib_lib_dirs = [sw_lib_dir]
chmlib_lib_dirs = consolidate('CHMLIB_LIB_DIR', os.path.join(prefix,
'build', 'chmlib-0.40', 'src', 'Release'))
ft_lib_dirs = [sw_lib_dir] ft_lib_dirs = [sw_lib_dir]
ft_libs = ['freetype'] ft_libs = ['freetype']
ft_inc_dirs = [os.path.join(sw_inc_dir, 'freetype2'), sw_inc_dir] ft_inc_dirs = [os.path.join(sw_inc_dir, 'freetype2'), sw_inc_dir]
zlib_inc_dirs = [sw_inc_dir] zlib_inc_dirs = [sw_inc_dir]
zlib_lib_dirs = [sw_lib_dir] zlib_lib_dirs = [sw_lib_dir]
podofo_inc = os.path.join(sw_inc_dir, 'podofo') podofo_inc = os.path.join(sw_inc_dir, 'podofo')
podofo_lib = sw_lib_dir podofo_lib = sw_lib_dir
elif isosx: elif isosx: