diff --git a/setup/installer/windows/freeze.py b/setup/installer/windows/freeze.py index c5ea18e2e9..0278e77a23 100644 --- a/setup/installer/windows/freeze.py +++ b/setup/installer/windows/freeze.py @@ -18,7 +18,7 @@ QT_DIR = 'Q:\\Qt\\4.8.1' QT_DLLS = ['Core', 'Gui', 'Network', 'Svg', 'WebKit', 'Xml', 'XmlPatterns'] LIBUNRAR = 'C:\\Program Files\\UnrarDLL\\unrar.dll' SW = r'C:\cygwin\home\kovid\sw' -IMAGEMAGICK = os.path.join(SW, 'build', 'ImageMagick-6.6.6', +IMAGEMAGICK = os.path.join(SW, 'build', 'ImageMagick-6.7.6', 'VisualMagick', 'bin') CRT = r'C:\Microsoft.VC90.CRT' diff --git a/setup/installer/windows/notes.rst b/setup/installer/windows/notes.rst index 36acacdb55..49fcd95cc1 100644 --- a/setup/installer/windows/notes.rst +++ b/setup/installer/windows/notes.rst @@ -336,6 +336,8 @@ Index: src/PdfFiltersPrivate.cpp ImageMagick -------------- +Get the source from: http://www.imagemagick.org/download/windows/ImageMagick-windows.zip + Edit VisualMagick/configure/configure.cpp to set int projectType = MULTITHREADEDDLL; @@ -349,7 +351,10 @@ Edit magick/magick-config.h Undefine ProvideDllMain and MAGICKCORE_X11_DELEGATE Now open VisualMagick/VisualDynamicMT.sln set to Release -Remove the CORE_xlib and UTIL_Imdisplay project CORE_Magick++ +Remove the CORE_xlib, UTIL_Imdisplay and CORE_Magick++ projects. + +F7 for build project, you will get one error due to the removal of xlib, ignore +it. calibre ---------