@@ -51,9 +51,14 @@ IF %SDK% == MSVC2015 (
5151IF %ARCH% == X86 msbuild build\msw\wx_vc12.sln /m /p:Configuration=" DLL Release" %PlatformToolset% || GOTO :ERROR
5252IF %ARCH% == X64 msbuild build\msw\wx_vc12.sln /m /p:Configuration=" Release" %PlatformToolset% || GOTO :ERROR
5353IF %ARCH% == X64 msbuild build\msw\wx_vc12.sln /m /p:Configuration=" DLL Release" %PlatformToolset% || GOTO :ERROR
54+ REM Upgrade hhp2cached project to VS2015
55+ devenv utils\hhp2cached\hhp2cached_vc9.vcproj /Upgrade
56+ IF %ARCH% == X86 msbuild utils\hhp2cached\hhp2cached_vc9.vcxproj /m /p:Configuration=" Release" %PlatformToolset% || GOTO :ERROR
57+ IF %ARCH% == X86 msbuild utils\hhp2cached\hhp2cached_vc9.vcxproj /m /p:Configuration=" DLL Release" %PlatformToolset% || GOTO :ERROR
5458)
5559
56- cp -va%DEPENDENCIES_SRC_DIR% /wxWidgets-3*/lib%DEPENDENCIES_BIN_DIR% \wxwidgets|| GOTO :ERROR
60+ cp -va%DEPENDENCIES_SRC_DIR% /wxWidgets-3*/lib%DEPENDENCIES_BIN_DIR% \wxwidgets|| GOTO :ERROR
61+ cp -va%DEPENDENCIES_SRC_DIR% /wxWidgets-3*/utils%DEPENDENCIES_BIN_DIR% \wxwidgets|| GOTO :ERROR
5762IF %ARCH% == X64 (
5863 mv -v%DEPENDENCIES_BIN_DIR% /wxwidgets/lib/vc_*dll%DEPENDENCIES_BIN_DIR% \wxwidgets\lib\vc_dll|| GOTO :ERROR
5964 mv -v%DEPENDENCIES_BIN_DIR% /wxwidgets/lib/vc_*lib%DEPENDENCIES_BIN_DIR% \wxwidgets\lib\vc_lib|| GOTO :ERROR