update move-thirdparty-libraries

diff --git a/Install_ThirdParty/scripts/move_thirdparty_libraries.bat b/Install_ThirdParty/scripts/move_thirdparty_libraries.bat
index 42dab7ddd4b85c6163106b18e20cf105468fab54..3893940721fd87cbc376a91615000184e8430ff4 100644 (file)
--- a/Install_ThirdParty/scripts/move_thirdparty_libraries.bat
+++ b/Install_ThirdParty/scripts/move_thirdparty_libraries.bat
@@ -65,8 +65,8 @@ if not exist %MIKTEXPFDIR% (
 
 echo if(%buildType%==release)(
        set qtBtype=4
-       set wxPrefixBase=wxbase293
-       set wxPrefixmsw=wxmsw293
+       set wxPrefixBase=wxbase29
+       set wxPrefixmsw=wxmsw29
        set boostMT=-vc100-mt-1_49.lib
        set boostMTGD=-vc100-mt-gd-1_49.lib
        set boostMTS=-vc100-mt-s-1_49.lib
@@ -181,8 +181,6 @@ mkdir %creaThirdPartyLibraries%\%wxWidgets%\lib\vc_dll
 copy /V /Y %WXDIR%\lib\vc_dll\%wxPrefixBase%.lib %creaThirdPartyLibraries%\%wxWidgets%\lib\vc_dll
 copy /V /Y %WXDIR%\lib\vc_dll\%wxPrefixBase%_net.lib %creaThirdPartyLibraries%\%wxWidgets%\lib\vc_dll
 copy /V /Y %WXDIR%\lib\vc_dll\%wxPrefixBase%_xml.lib %creaThirdPartyLibraries%\%wxWidgets%\lib\vc_dll
-copy /V /Y %WXDIR%\lib\vc_dll\wxexpat.lib %creaThirdPartyLibraries%\%wxWidgets%\lib\vc_dll
-copy /V /Y %WXDIR%\lib\vc_dll\wxjpeg.lib %creaThirdPartyLibraries%\%wxWidgets%\lib\vc_dll
 copy /V /Y %WXDIR%\lib\vc_dll\%wxPrefixmsw%_adv.lib %creaThirdPartyLibraries%\%wxWidgets%\lib\vc_dll
 copy /V /Y %WXDIR%\lib\vc_dll\%wxPrefixmsw%_aui.lib %creaThirdPartyLibraries%\%wxWidgets%\lib\vc_dll
 copy /V /Y %WXDIR%\lib\vc_dll\%wxPrefixmsw%_core.lib %creaThirdPartyLibraries%\%wxWidgets%\lib\vc_dll
@@ -191,6 +189,8 @@ copy /V /Y %WXDIR%\lib\vc_dll\%wxPrefixmsw%_media.lib %creaThirdPartyLibraries%\
 copy /V /Y %WXDIR%\lib\vc_dll\%wxPrefixmsw%_qa.lib %creaThirdPartyLibraries%\%wxWidgets%\lib\vc_dll
 copy /V /Y %WXDIR%\lib\vc_dll\%wxPrefixmsw%_richtext.lib %creaThirdPartyLibraries%\%wxWidgets%\lib\vc_dll
 copy /V /Y %WXDIR%\lib\vc_dll\%wxPrefixmsw%_xrc.lib %creaThirdPartyLibraries%\%wxWidgets%\lib\vc_dll
+copy /V /Y %WXDIR%\lib\vc_dll\wxexpat.lib %creaThirdPartyLibraries%\%wxWidgets%\lib\vc_dll
+copy /V /Y %WXDIR%\lib\vc_dll\wxjpeg.lib %creaThirdPartyLibraries%\%wxWidgets%\lib\vc_dll
 copy /V /Y %WXDIR%\lib\vc_dll\wxpng.lib %creaThirdPartyLibraries%\%wxWidgets%\lib\vc_dll
 copy /V /Y %WXDIR%\lib\vc_dll\wxregex.lib %creaThirdPartyLibraries%\%wxWidgets%\lib\vc_dll
 copy /V /Y %WXDIR%\lib\vc_dll\wxtiff.lib %creaThirdPartyLibraries%\%wxWidgets%\lib\vc_dll