mirror of
https://github.com/kovidgoyal/calibre.git
synced 2025-07-09 03:04:10 -04:00
OS X builds again
This commit is contained in:
parent
209980eb04
commit
fab6127966
@ -230,7 +230,7 @@ _check_symlinks_prescript()
|
|||||||
all_functions = main_functions['console'] + main_functions['gui']
|
all_functions = main_functions['console'] + main_functions['gui']
|
||||||
print
|
print
|
||||||
print 'Adding PoDoFo'
|
print 'Adding PoDoFo'
|
||||||
pdf = glob.glob(os.path.expanduser('/Volumes/sw/podofo/libpodofo.0.7.0.dylib'))[0]
|
pdf = glob.glob(os.path.expanduser('/Volumes/sw/podofo/libpodofo.0.7.00.dylib'))[0]
|
||||||
shutil.copyfile(pdf, os.path.join(frameworks_dir, os.path.basename(pdf)))
|
shutil.copyfile(pdf, os.path.join(frameworks_dir, os.path.basename(pdf)))
|
||||||
|
|
||||||
|
|
||||||
|
4
setup.py
4
setup.py
@ -62,9 +62,9 @@ if __name__ == '__main__':
|
|||||||
|
|
||||||
podofo_inc = '/usr/include/podofo' if islinux else \
|
podofo_inc = '/usr/include/podofo' if islinux else \
|
||||||
'C:\\podofo\\include\\podofo' if iswindows else \
|
'C:\\podofo\\include\\podofo' if iswindows else \
|
||||||
'/Volumes/sw/podofo/include/podofo'
|
'/usr/local/include/podofo'
|
||||||
podofo_lib = '/usr/lib' if islinux else r'C:\podofo' if iswindows else \
|
podofo_lib = '/usr/lib' if islinux else r'C:\podofo' if iswindows else \
|
||||||
'/Volumes/sw/podofo/lib'
|
'/usr/local/lib'
|
||||||
podofo_inc = os.environ.get('PODOFO_INC_DIR', podofo_inc)
|
podofo_inc = os.environ.get('PODOFO_INC_DIR', podofo_inc)
|
||||||
if os.path.exists(os.path.join(podofo_inc, 'podofo.h')):
|
if os.path.exists(os.path.join(podofo_inc, 'podofo.h')):
|
||||||
optional.append(Extension('calibre.plugins.podofo',
|
optional.append(Extension('calibre.plugins.podofo',
|
||||||
|
@ -548,7 +548,7 @@ class build_windows(VMInstaller):
|
|||||||
|
|
||||||
class build_osx(VMInstaller):
|
class build_osx(VMInstaller):
|
||||||
description = 'Build OS X app bundle'
|
description = 'Build OS X app bundle'
|
||||||
VM = '/vmware/Mac OSX/Mac OSX.vmx'
|
VM = '/mnt/backup/calibre_os_x/Mac OSX.vmx'
|
||||||
if not os.path.exists(VM):
|
if not os.path.exists(VM):
|
||||||
VM = '/home/kovid/calibre_os_x/Mac OSX.vmx'
|
VM = '/home/kovid/calibre_os_x/Mac OSX.vmx'
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user