From 9f43cd159e6f7dd21ec18f33cc9d962db3b1a8e5 Mon Sep 17 00:00:00 2001 From: Diego Caceres Date: Thu, 15 Dec 2011 16:52:01 +0000 Subject: [PATCH] *** empty log message *** --- .../scripts/move_thirdparty_dlls.bat | 27 ++++++++------- .../scripts/move_thirdparty_libraries.bat | 34 +++++++++++-------- 2 files changed, 34 insertions(+), 27 deletions(-) diff --git a/Install_ThirdParty/scripts/move_thirdparty_dlls.bat b/Install_ThirdParty/scripts/move_thirdparty_dlls.bat index 9a07814..3b37ad9 100644 --- a/Install_ThirdParty/scripts/move_thirdparty_dlls.bat +++ b/Install_ThirdParty/scripts/move_thirdparty_dlls.bat @@ -59,18 +59,21 @@ echo ----------------------------------- echo -------------wxWidgets------------- echo ----------------------------------- -copy /V /Y %WXDIR%\lib\vc_dll\wxbase292u_net_vc_custom.dll %creaThirdPartydlls% -copy /V /Y %WXDIR%\lib\vc_dll\wxbase292u_vc_custom.dll %creaThirdPartydlls% -copy /V /Y %WXDIR%\lib\vc_dll\wxbase292u_xml_vc_custom.dll %creaThirdPartydlls% -copy /V /Y %WXDIR%\lib\vc_dll\wxmsw292u_adv_vc_custom.dll %creaThirdPartydlls% -copy /V /Y %WXDIR%\lib\vc_dll\wxmsw292u_aui_vc_custom.dll %creaThirdPartydlls% -copy /V /Y %WXDIR%\lib\vc_dll\wxmsw292u_core_vc_custom.dll %creaThirdPartydlls% -copy /V /Y %WXDIR%\lib\vc_dll\wxmsw292u_gl_vc_custom.dll %creaThirdPartydlls% -copy /V /Y %WXDIR%\lib\vc_dll\wxmsw292u_html_vc_custom.dll %creaThirdPartydlls% -copy /V /Y %WXDIR%\lib\vc_dll\wxmsw292u_media_vc_custom.dll %creaThirdPartydlls% -copy /V /Y %WXDIR%\lib\vc_dll\wxmsw292u_qa_vc_custom.dll %creaThirdPartydlls% -copy /V /Y %WXDIR%\lib\vc_dll\wxmsw292u_richtext_vc_custom.dll %creaThirdPartydlls% -copy /V /Y %WXDIR%\lib\vc_dll\wxmsw292u_xrc_vc_custom.dll %creaThirdPartydlls% +set wxPrefixBase=wxbase292 +set wxPrefixmsw=wxmsw292 + +copy /V /Y %WXDIR%\lib\vc_dll\%wxPrefixBase%_net_vc_custom.dll %creaThirdPartydlls% +copy /V /Y %WXDIR%\lib\vc_dll\%wxPrefixBase%_vc_custom.dll %creaThirdPartydlls% +copy /V /Y %WXDIR%\lib\vc_dll\%wxPrefixBase%_xml_vc_custom.dll %creaThirdPartydlls% +copy /V /Y %WXDIR%\lib\vc_dll\%wxPrefixmsw%_adv_vc_custom.dll %creaThirdPartydlls% +copy /V /Y %WXDIR%\lib\vc_dll\%wxPrefixmsw%_aui_vc_custom.dll %creaThirdPartydlls% +copy /V /Y %WXDIR%\lib\vc_dll\%wxPrefixmsw%_core_vc_custom.dll %creaThirdPartydlls% +copy /V /Y %WXDIR%\lib\vc_dll\%wxPrefixmsw%_gl_vc_custom.dll %creaThirdPartydlls% +copy /V /Y %WXDIR%\lib\vc_dll\%wxPrefixmsw%_html_vc_custom.dll %creaThirdPartydlls% +copy /V /Y %WXDIR%\lib\vc_dll\%wxPrefixmsw%_media_vc_custom.dll %creaThirdPartydlls% +copy /V /Y %WXDIR%\lib\vc_dll\%wxPrefixmsw%_qa_vc_custom.dll %creaThirdPartydlls% +copy /V /Y %WXDIR%\lib\vc_dll\%wxPrefixmsw%_richtext_vc_custom.dll %creaThirdPartydlls% +copy /V /Y %WXDIR%\lib\vc_dll\%wxPrefixmsw%_xrc_vc_custom.dll %creaThirdPartydlls% echo ----------------------------------- diff --git a/Install_ThirdParty/scripts/move_thirdparty_libraries.bat b/Install_ThirdParty/scripts/move_thirdparty_libraries.bat index b7f9863..9a1eb77 100644 --- a/Install_ThirdParty/scripts/move_thirdparty_libraries.bat +++ b/Install_ThirdParty/scripts/move_thirdparty_libraries.bat @@ -145,6 +145,10 @@ XCOPY %QTDIR%\src\gui\* %creaThirdPartyLibraries%\%qt%\src\gui /s /i echo ----------------------------------- echo -------------wxWidgets------------- echo ----------------------------------- + +set wxPrefixBase=wxbase292 +set wxPrefixmsw=wxmsw292 + mkdir %creaThirdPartyLibraries%\%wxWidgets% mkdir %creaThirdPartyLibraries%\%wxWidgets%\include\ @@ -161,23 +165,23 @@ copy /V /Y %WXDIR%\lib\vms_gtk.opt %creaThirdPartyLibraries%\%wxWidgets%\lib\ mkdir %creaThirdPartyLibraries%\%wxWidgets%\lib\vc_dll -copy /V /Y %WXDIR%\lib\vc_dll\wxbase29u.lib %creaThirdPartyLibraries%\%wxWidgets%\lib\vc_dll -copy /V /Y %WXDIR%\lib\vc_dll\wxbase29u_net.lib %creaThirdPartyLibraries%\%wxWidgets%\lib\vc_dll -copy /V /Y %WXDIR%\lib\vc_dll\wxbase29u_xml.lib %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\wxmsw29u_adv.lib %creaThirdPartyLibraries%\%wxWidgets%\lib\vc_dll -copy /V /Y %WXDIR%\lib\vc_dll\wxmsw29u_aui.lib %creaThirdPartyLibraries%\%wxWidgets%\lib\vc_dll -copy /V /Y %WXDIR%\lib\vc_dll\wxmsw29u_core.lib %creaThirdPartyLibraries%\%wxWidgets%\lib\vc_dll -copy /V /Y %WXDIR%\lib\vc_dll\wxmsw29u_gl.lib %creaThirdPartyLibraries%\%wxWidgets%\lib\vc_dll -copy /V /Y %WXDIR%\lib\vc_dll\wxmsw29u_html.lib %creaThirdPartyLibraries%\%wxWidgets%\lib\vc_dll -copy /V /Y %WXDIR%\lib\vc_dll\wxmsw29u_media.lib %creaThirdPartyLibraries%\%wxWidgets%\lib\vc_dll -copy /V /Y %WXDIR%\lib\vc_dll\wxmsw29u_propgrid.lib %creaThirdPartyLibraries%\%wxWidgets%\lib\vc_dll -copy /V /Y %WXDIR%\lib\vc_dll\wxmsw29u_qa.lib %creaThirdPartyLibraries%\%wxWidgets%\lib\vc_dll -copy /V /Y %WXDIR%\lib\vc_dll\wxmsw29u_ribbon.lib %creaThirdPartyLibraries%\%wxWidgets%\lib\vc_dll -copy /V /Y %WXDIR%\lib\vc_dll\wxmsw29u_richtext.lib %creaThirdPartyLibraries%\%wxWidgets%\lib\vc_dll -copy /V /Y %WXDIR%\lib\vc_dll\wxmsw29u_stc.lib %creaThirdPartyLibraries%\%wxWidgets%\lib\vc_dll -copy /V /Y %WXDIR%\lib\vc_dll\wxmsw29u_xrc.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 +copy /V /Y %WXDIR%\lib\vc_dll\%wxPrefixmsw%_gl.lib %creaThirdPartyLibraries%\%wxWidgets%\lib\vc_dll +copy /V /Y %WXDIR%\lib\vc_dll\%wxPrefixmsw%_html.lib %creaThirdPartyLibraries%\%wxWidgets%\lib\vc_dll +copy /V /Y %WXDIR%\lib\vc_dll\%wxPrefixmsw%_media.lib %creaThirdPartyLibraries%\%wxWidgets%\lib\vc_dll +copy /V /Y %WXDIR%\lib\vc_dll\%wxPrefixmsw%_propgrid.lib %creaThirdPartyLibraries%\%wxWidgets%\lib\vc_dll +copy /V /Y %WXDIR%\lib\vc_dll\%wxPrefixmsw%_qa.lib %creaThirdPartyLibraries%\%wxWidgets%\lib\vc_dll +copy /V /Y %WXDIR%\lib\vc_dll\%wxPrefixmsw%_ribbon.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%_stc.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\wxpng.lib %creaThirdPartyLibraries%\%wxWidgets%\lib\vc_dll copy /V /Y %WXDIR%\lib\vc_dll\wxregexu.lib %creaThirdPartyLibraries%\%wxWidgets%\lib\vc_dll copy /V /Y %WXDIR%\lib\vc_dll\wxscintilla.lib %creaThirdPartyLibraries%\%wxWidgets%\lib\vc_dll -- 2.45.0