diff --git a/setup/build_environment.py b/setup/build_environment.py index d6581a907d..10ab1b0735 100644 --- a/setup/build_environment.py +++ b/setup/build_environment.py @@ -121,7 +121,7 @@ if iswindows: poppler_lib_dirs = consolidate('POPPLER_LIB_DIR', sw_lib_dir) popplerqt4_lib_dirs = poppler_lib_dirs poppler_libs = ['poppler'] - magick_inc_dirs = [os.path.join(prefix, 'build', 'ImageMagick-6.5.6')] + magick_inc_dirs = [os.path.join(prefix, 'build', 'ImageMagick-6.6.6')] magick_lib_dirs = [os.path.join(magick_inc_dirs[0], 'VisualMagick', 'lib')] magick_libs = ['CORE_RL_wand_', 'CORE_RL_magick_'] podofo_inc = os.path.join(sw_inc_dir, 'podofo') diff --git a/setup/installer/windows/freeze.py b/setup/installer/windows/freeze.py index 7d8ea4d80a..e9e47816fd 100644 --- a/setup/installer/windows/freeze.py +++ b/setup/installer/windows/freeze.py @@ -18,7 +18,7 @@ QT_DLLS = ['Core', 'Gui', 'Network', 'Svg', 'WebKit', 'Xml', 'XmlPatterns'] LIBUSB_DIR = 'C:\\libusb' LIBUNRAR = 'C:\\Program Files\\UnrarDLL\\unrar.dll' SW = r'C:\cygwin\home\kovid\sw' -IMAGEMAGICK = os.path.join(SW, 'build', 'ImageMagick-6.5.6', +IMAGEMAGICK = os.path.join(SW, 'build', 'ImageMagick-6.6.6', 'VisualMagick', 'bin') VERSION = re.sub('[a-z]\d+', '', __version__) diff --git a/setup/installer/windows/notes.rst b/setup/installer/windows/notes.rst index b9aef39657..5dfd956ce2 100644 --- a/setup/installer/windows/notes.rst +++ b/setup/installer/windows/notes.rst @@ -301,12 +301,14 @@ int projectType = MULTITHREADEDDLL; Run configure.bat in a visual studio command prompt +Run configure.exe generated by configure.bat + Edit magick/magick-config.h Undefine ProvideDllMain and MAGICKCORE_X11_DELEGATE Now open VisualMagick/VisualDynamicMT.sln set to Release -Remove the CORE_xlib project +Remove the CORE_xlib and UTIL_Imdisplay project CORE_Magick++ calibre ---------