--- builddocs.bat.org	2015-02-24 09:31:49.902200082 +0000
+++ builddocs.bat	2015-02-24 09:48:06.724848153 +0000
@@ -8,13 +8,16 @@
 REM Compile the HTML Help
 "%ProgramFiles%\HTML Help Workshop\hhc.exe" ./en_US/_build/htmlhelp/pgadmin3.hhp
 
+IF EXIST %WXWIN%\utils\hhp2cached\vc_mswu SET BUILDDIR=vc_mswu
+else SET BUILDDIR=vc_mswudll
+
 REM Regenerate the cache file used by the wx viewer.
-IF NOT EXIST %WXWIN%\utils\hhp2cached\vc_mswu\hhp2cached.exe GOTO NO_HHP2CACHED
+IF NOT EXIST %WXWIN%\utils\hhp2cached\%BUILDDIR%\hhp2cached.exe GOTO NO_HHP2CACHED
 
-"%WXWIN%\utils\hhp2cached\vc_mswu\hhp2cached.exe" ./en_US/_build/htmlhelp/pgadmin3.hhp
+"%WXWIN%\utils\hhp2cached\%BUILDDIR%\hhp2cached.exe" ./en_US/_build/htmlhelp/pgadmin3.hhp
 
 EXIT 0
 
 :NO_HHP2CACHED
-ECHO Could not find %WXWIN%\utils\hhp2cached\vc_mswu\hhp2cached.exe!!
+ECHO Could not find %WXWIN%\utils\hhp2cached\%BUILDDIR%\hhp2cached.exe!!
 EXIT 1