From 35e585bd0d24eb46f84a93767f15236ffb9bf8c8 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Wed, 7 May 2014 21:42:27 +0530
Subject: [PATCH] Update build instructions for PoDoFo and ImageMagick

---
 setup/installer/windows/notes.rst | 32 +++++++++++++++++++++----------
 1 file changed, 22 insertions(+), 10 deletions(-)

diff --git a/setup/installer/windows/notes.rst b/setup/installer/windows/notes.rst
index a0b49471aa..5bb93e2e9a 100644
--- a/setup/installer/windows/notes.rst
+++ b/setup/installer/windows/notes.rst
@@ -385,14 +385,25 @@ podofo
 
 Download from http://podofo.sourceforge.net/download.html
 
+mkdir build
+
 Add the following three lines near the top of CMakeLists.txt
 SET(WANT_LIB64 FALSE)
 SET(PODOFO_BUILD_SHARED TRUE)
 SET(PODOFO_BUILD_STATIC FALSE)
 
+PoDoFo's CMakeLists.txt is pretty bad. Run the cmake-gui and fill in values for
+freetype2 and open ssl (choose any one .lib for the libcrypto variable, you
+will have to fix it manually in Visual Studio later anyway). Then generate the
+VisualStudio solution. In the solution. In the Solution got to
+Project->Properties->Linker->Input and add the second ssl library. And in
+C++->General add the openssl include dir.
+
+Now build only the project podofo_shared (release mode)
+
 Run::
-    cp "`find . -name *.dll`" ~/sw/bin/
-    cp "`find . -name *.lib`" ~/sw/lib/
+    cp "`find . -name '*.dll'`" ~/sw/bin/
+    cp "`find . -name '*.lib'`" ~/sw/lib/
     mkdir ~/sw/include/podofo
     cp build/podofo_config.h ~/sw/include/podofo
     cp -r src/* ~/sw/include/podofo/
@@ -402,24 +413,25 @@ ImageMagick
 --------------
 
 Get the source from: http://www.imagemagick.org/download/windows/ImageMagick-windows.zip
+Unzip it and then run::
+    chmod +x `find . -name '*.exe'`
 
 Edit VisualMagick/configure/configure.cpp to set
 
 int projectType = MULTITHREADEDDLL;
 
-Run configure.bat in a  visual studio command prompt
+Open configure.sln and build it to create configure.exe
 
-Run configure.exe generated by configure.bat
+Run configure.exe set 32/64 bit disable X11 and OpenMPI and click the Edit
+magick-baseconfig.h button
 
-Edit magick/magick-config.h
-
-Undefine ProvideDllMain and MAGICKCORE_X11_DELEGATE
+Undefine ProvideDllMain 
 
 Now open VisualMagick/VisualDynamicMT.sln set to Release
-Remove the CORE_xlib, UTIL_Imdisplay and CORE_Magick++ projects.
 
-F7 for build solution, you will get one error due to the removal of xlib, ignore
-it.
+Remove the UTIL_IMdisplay and CORE_Magick++ projects.
+
+F7 for build solution.
 
 netifaces
 ------------