Adjust post-build event scripts for wxWidgets 3.1.x libraries

codereader · Dec 6, 2019 · a6af4bd · a6af4bd
1 parent ed7427f
commit a6af4bd
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 17 deletions.
diff --git a/tools/msvc/post_build_event.cmd b/tools/msvc/post_build_event.cmd
@@ -13,14 +13,14 @@ IF "%1" == "Debug" (SET WXLIB_SUFFIX=ud) ELSE (SET WXLIB_SUFFIX=u)
 
 @echo Copying wxWidgets binaries
 
-copy ..\..\w32deps\wxWidgets\bin\wxmsw30%WXLIB_SUFFIX%_gl_%2.dll	   ..\..\install /Y
-copy ..\..\w32deps\wxWidgets\bin\wxmsw30%WXLIB_SUFFIX%_html_%2.dll  ..\..\install /Y
-copy ..\..\w32deps\wxWidgets\bin\wxmsw30%WXLIB_SUFFIX%_xrc_%2.dll   ..\..\install /Y
-copy ..\..\w32deps\wxWidgets\bin\wxmsw30%WXLIB_SUFFIX%_stc_%2.dll   ..\..\install /Y
-copy ..\..\w32deps\wxWidgets\bin\wxbase30%WXLIB_SUFFIX%_%2.dll	   ..\..\install /Y
-copy ..\..\w32deps\wxWidgets\bin\wxbase30%WXLIB_SUFFIX%_xml_%2.dll  ..\..\install /Y
-copy ..\..\w32deps\wxWidgets\bin\wxmsw30%WXLIB_SUFFIX%_adv_%2.dll   ..\..\install /Y
-copy ..\..\w32deps\wxWidgets\bin\wxmsw30%WXLIB_SUFFIX%_core_%2.dll  ..\..\install /Y
+copy ..\..\w32deps\wxWidgets\bin\wxmsw313%WXLIB_SUFFIX%_gl_vc*.dll	   ..\..\install /Y
+copy ..\..\w32deps\wxWidgets\bin\wxmsw313%WXLIB_SUFFIX%_html_vc*.dll  ..\..\install /Y
+copy ..\..\w32deps\wxWidgets\bin\wxmsw313%WXLIB_SUFFIX%_xrc_vc*.dll   ..\..\install /Y
+copy ..\..\w32deps\wxWidgets\bin\wxmsw313%WXLIB_SUFFIX%_stc_vc*.dll   ..\..\install /Y
+copy ..\..\w32deps\wxWidgets\bin\wxbase313%WXLIB_SUFFIX%_vc*.dll	   ..\..\install /Y
+copy ..\..\w32deps\wxWidgets\bin\wxbase313%WXLIB_SUFFIX%_xml_vc*.dll  ..\..\install /Y
+copy ..\..\w32deps\wxWidgets\bin\wxmsw313%WXLIB_SUFFIX%_adv_vc*.dll   ..\..\install /Y
+copy ..\..\w32deps\wxWidgets\bin\wxmsw313%WXLIB_SUFFIX%_core_vc*.dll  ..\..\install /Y
 
 IF "%1" == "Debug" (SET DEBUG_SUFFIX=-d) ELSE (SET DEBUG_SUFFIX=)
 

diff --git a/tools/msvc/post_build_event_x64.cmd b/tools/msvc/post_build_event_x64.cmd
@@ -13,14 +13,14 @@ IF "%1" == "Debug" (SET WXLIB_SUFFIX=ud) ELSE (SET WXLIB_SUFFIX=u)
 
 @echo Copying wxWidgets binaries
 
-copy ..\..\w64deps\wxWidgets\bin\wxmsw30%WXLIB_SUFFIX%_gl_%2_x64.dll	   ..\..\install /Y
-copy ..\..\w64deps\wxWidgets\bin\wxmsw30%WXLIB_SUFFIX%_html_%2_x64.dll  ..\..\install /Y
-copy ..\..\w64deps\wxWidgets\bin\wxmsw30%WXLIB_SUFFIX%_xrc_%2_x64.dll   ..\..\install /Y
-copy ..\..\w64deps\wxWidgets\bin\wxmsw30%WXLIB_SUFFIX%_stc_%2_x64.dll   ..\..\install /Y
-copy ..\..\w64deps\wxWidgets\bin\wxbase30%WXLIB_SUFFIX%_%2_x64.dll	   ..\..\install /Y
-copy ..\..\w64deps\wxWidgets\bin\wxbase30%WXLIB_SUFFIX%_xml_%2_x64.dll  ..\..\install /Y
-copy ..\..\w64deps\wxWidgets\bin\wxmsw30%WXLIB_SUFFIX%_adv_%2_x64.dll   ..\..\install /Y
-copy ..\..\w64deps\wxWidgets\bin\wxmsw30%WXLIB_SUFFIX%_core_%2_x64.dll  ..\..\install /Y
+copy ..\..\w64deps\wxWidgets\bin\wxmsw313%WXLIB_SUFFIX%_gl_vc*_x64.dll	   ..\..\install /Y
+copy ..\..\w64deps\wxWidgets\bin\wxmsw313%WXLIB_SUFFIX%_html_vc*_x64.dll  ..\..\install /Y
+copy ..\..\w64deps\wxWidgets\bin\wxmsw313%WXLIB_SUFFIX%_xrc_vc*_x64.dll   ..\..\install /Y
+copy ..\..\w64deps\wxWidgets\bin\wxmsw313%WXLIB_SUFFIX%_stc_vc*_x64.dll   ..\..\install /Y
+copy ..\..\w64deps\wxWidgets\bin\wxbase313%WXLIB_SUFFIX%_vc*_x64.dll	   ..\..\install /Y
+copy ..\..\w64deps\wxWidgets\bin\wxbase313%WXLIB_SUFFIX%_xml_vc*_x64.dll  ..\..\install /Y
+copy ..\..\w64deps\wxWidgets\bin\wxmsw313%WXLIB_SUFFIX%_adv_vc*_x64.dll   ..\..\install /Y
+copy ..\..\w64deps\wxWidgets\bin\wxmsw313%WXLIB_SUFFIX%_core_vc*_x64.dll  ..\..\install /Y
 
 IF "%1" == "Debug" (SET DEBUG_SUFFIX=-d) ELSE (SET DEBUG_SUFFIX=)
 
@@ -31,4 +31,4 @@ copy ..\..\w64deps\ftgl\bin\ftgl%DEBUG_SUFFIX%-%2.dll ..\..\install /Y
 copy "..\..\w64deps\libsigc++\bin\libsigc++%DEBUG_SUFFIX%-%2.dll" ..\..\install /Y
 
 @echo Copying libxml2 library (64 bit)
-copy ..\..\w64deps\libxml2\bin\libxml2%DEBUG_SUFFIX%-%2.dll ..\..\install /Y
+copy ..\..\w64deps\libxml2\bin\libxml2%DEBUG_SUFFIX%-%2.dll ..\..\install /Y