avoid trying to link QA if not required

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35777 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/msvc/wx/setup.h b/include/msvc/wx/setup.h
index 58cd4bba636a7e344b02d405b9c5bcdf7bca8383..06ba8b4e19681be535bf9e0cd439f533fe630f83 100644 (file)
--- a/include/msvc/wx/setup.h
+++ b/include/msvc/wx/setup.h
@@ -54,7 +54,9 @@
             #pragma comment(lib,"wxmsw27ud_adv")
             #pragma comment(lib,"wxmsw27ud_core")
             #pragma comment(lib,"wxmsw27ud_html")
             #pragma comment(lib,"wxmsw27ud_adv")
             #pragma comment(lib,"wxmsw27ud_core")
             #pragma comment(lib,"wxmsw27ud_html")

+            #ifdef USE_QA

             #pragma comment(lib,"wxmsw27ud_qa")
             #pragma comment(lib,"wxmsw27ud_qa")

+            #endif

             #pragma comment(lib,"wxmsw27ud_xrc")
             #if wxUSE_MEDIACTRL
                 #pragma comment(lib,"wxmsw27ud_media")
             #pragma comment(lib,"wxmsw27ud_xrc")
             #if wxUSE_MEDIACTRL
                 #pragma comment(lib,"wxmsw27ud_media")


@@ -84,7 +86,9 @@
             #pragma comment(lib,"wxmsw27u_adv")
             #pragma comment(lib,"wxmsw27u_core")
             #pragma comment(lib,"wxmsw27u_html")
             #pragma comment(lib,"wxmsw27u_adv")
             #pragma comment(lib,"wxmsw27u_core")
             #pragma comment(lib,"wxmsw27u_html")

+            #ifdef USE_QA

             #pragma comment(lib,"wxmsw27u_qa")
             #pragma comment(lib,"wxmsw27u_qa")

+            #endif

             #pragma comment(lib,"wxmsw27u_xrc")
             #if wxUSE_MEDIACTRL
                 #pragma comment(lib,"wxmsw27u_media")
             #pragma comment(lib,"wxmsw27u_xrc")
             #if wxUSE_MEDIACTRL
                 #pragma comment(lib,"wxmsw27u_media")


@@ -130,7 +134,9 @@
             #pragma comment(lib,"wxmsw27d_adv")
             #pragma comment(lib,"wxmsw27d_core")
             #pragma comment(lib,"wxmsw27d_html")
             #pragma comment(lib,"wxmsw27d_adv")
             #pragma comment(lib,"wxmsw27d_core")
             #pragma comment(lib,"wxmsw27d_html")

+            #ifdef USE_QA

             #pragma comment(lib,"wxmsw27d_qa")
             #pragma comment(lib,"wxmsw27d_qa")

+            #endif

             #pragma comment(lib,"wxmsw27d_xrc")
             #if wxUSE_MEDIACTRL
                 #pragma comment(lib,"wxmsw27d_media")
             #pragma comment(lib,"wxmsw27d_xrc")
             #if wxUSE_MEDIACTRL
                 #pragma comment(lib,"wxmsw27d_media")


@@ -160,7 +166,9 @@
             #pragma comment(lib,"wxmsw27_adv")
             #pragma comment(lib,"wxmsw27_core")
             #pragma comment(lib,"wxmsw27_html")
             #pragma comment(lib,"wxmsw27_adv")
             #pragma comment(lib,"wxmsw27_core")
             #pragma comment(lib,"wxmsw27_html")

+            #ifdef USE_QA

             #pragma comment(lib,"wxmsw27_qa")
             #pragma comment(lib,"wxmsw27_qa")

+            #endif

             #pragma comment(lib,"wxmsw27_xrc")
             #if wxUSE_MEDIACTRL
                 #pragma comment(lib,"wxmsw27_media")
             #pragma comment(lib,"wxmsw27_xrc")
             #if wxUSE_MEDIACTRL
                 #pragma comment(lib,"wxmsw27_media")