small fix

[wxWidgets.git] / include / msvc / wx / setup.h

diff --git a/include/msvc/wx/setup.h b/include/msvc/wx/setup.h
index b4f006ae2e039fb7bc12227bbf0fbba4e1b76e8e..041c5f9c4e032d207583238dace55884e09d0b49 100644 (file)
--- a/include/msvc/wx/setup.h
+++ b/include/msvc/wx/setup.h
@@ -17,15 +17,15 @@
     #ifdef _UNICODE
         #ifdef WXUSINGDLL
             #ifdef _DEBUG
     #ifdef _UNICODE
         #ifdef WXUSINGDLL
             #ifdef _DEBUG

-                #include "../../lib/vc_dll/mswud/wx/setup.h"
+                #include "../../../lib/vc_dll/mswud/wx/setup.h"

             #else
             #else

-                #include "../../lib/vc_dll/mswu/wx/setup.h"
+                #include "../../../lib/vc_dll/mswu/wx/setup.h"

             #endif
         #else
             #ifdef _DEBUG
             #endif
         #else
             #ifdef _DEBUG

-                #include "../../lib/vc_lib/mswud/wx/setup.h"
+                #include "../../../lib/vc_lib/mswud/wx/setup.h"

             #else
             #else

-                #include "../../lib/vc_lib/mswu/wx/setup.h"
+                #include "../../../lib/vc_lib/mswu/wx/setup.h"

             #endif
         #endif
 
             #endif
         #endif
 


@@ -36,13 +36,14 @@
             #pragma comment(lib,"wxregexud")
             #pragma comment(lib,"wxtiffd")
             #pragma comment(lib,"wxzlibd")
             #pragma comment(lib,"wxregexud")
             #pragma comment(lib,"wxtiffd")
             #pragma comment(lib,"wxzlibd")

-            #pragma comment(lib,"wxbase25ud")
-            #pragma comment(lib,"wxbase25ud_net")
-            #pragma comment(lib,"wxbase25ud_xml")
-            #pragma comment(lib,"wxmsw25ud_adv")
-            #pragma comment(lib,"wxmsw25ud_core")
-            #pragma comment(lib,"wxmsw25ud_html")
-            #pragma comment(lib,"wxmsw25ud_xrc")
+            #pragma comment(lib,"wxbase26ud")
+            #pragma comment(lib,"wxbase26ud_net")
+            #pragma comment(lib,"wxbase26ud_xml")
+            #pragma comment(lib,"wxmsw26ud_adv")
+            #pragma comment(lib,"wxmsw26ud_core")
+            #pragma comment(lib,"wxmsw26ud_html")
+            #pragma comment(lib,"wxmsw26ud_qa")
+            #pragma comment(lib,"wxmsw26ud_xrc")

         #else // release
             #pragma comment(lib,"wxexpat")
             #pragma comment(lib,"wxjpeg")
         #else // release
             #pragma comment(lib,"wxexpat")
             #pragma comment(lib,"wxjpeg")


@@ -50,26 +51,27 @@
             #pragma comment(lib,"wxregexu")
             #pragma comment(lib,"wxtiff")
             #pragma comment(lib,"wxzlib")
             #pragma comment(lib,"wxregexu")
             #pragma comment(lib,"wxtiff")
             #pragma comment(lib,"wxzlib")

-            #pragma comment(lib,"wxbase25u")
-            #pragma comment(lib,"wxbase25u_net")
-            #pragma comment(lib,"wxbase25u_xml")
-            #pragma comment(lib,"wxmsw25u_adv")
-            #pragma comment(lib,"wxmsw25u_core")
-            #pragma comment(lib,"wxmsw25u_html")
-            #pragma comment(lib,"wxmsw25u_xrc")
+            #pragma comment(lib,"wxbase26u")
+            #pragma comment(lib,"wxbase26u_net")
+            #pragma comment(lib,"wxbase26u_xml")
+            #pragma comment(lib,"wxmsw26u_adv")
+            #pragma comment(lib,"wxmsw26u_core")
+            #pragma comment(lib,"wxmsw26u_html")
+            #pragma comment(lib,"wxmsw26u_qa")
+            #pragma comment(lib,"wxmsw26u_xrc")

         #endif // debug/release
     #else // !_UNICODE
         #ifdef WXUSINGDLL
             #ifdef _DEBUG
         #endif // debug/release
     #else // !_UNICODE
         #ifdef WXUSINGDLL
             #ifdef _DEBUG

-                #include "../../lib/vc_dll/mswd/wx/setup.h"
+                #include "../../../lib/vc_dll/mswd/wx/setup.h"

             #else
             #else

-                #include "../../lib/vc_dll/msw/wx/setup.h"
+                #include "../../../lib/vc_dll/msw/wx/setup.h"

             #endif
         #else // static lib
             #ifdef _DEBUG
             #endif
         #else // static lib
             #ifdef _DEBUG

-                #include "../../lib/vc_lib/mswd/wx/setup.h"
+                #include "../../../lib/vc_lib/mswd/wx/setup.h"

             #else
             #else

-                #include "../../lib/vc_lib/msw/wx/setup.h"
+                #include "../../../lib/vc_lib/msw/wx/setup.h"

             #endif
         #endif // shared/static
 
             #endif
         #endif // shared/static
 


@@ -80,13 +82,14 @@
             #pragma comment(lib,"wxregexd")
             #pragma comment(lib,"wxtiffd")
             #pragma comment(lib,"wxzlibd")
             #pragma comment(lib,"wxregexd")
             #pragma comment(lib,"wxtiffd")
             #pragma comment(lib,"wxzlibd")

-            #pragma comment(lib,"wxbase25d")
-            #pragma comment(lib,"wxbase25d_net")
-            #pragma comment(lib,"wxbase25d_xml")
-            #pragma comment(lib,"wxmsw25d_adv")
-            #pragma comment(lib,"wxmsw25d_core")
-            #pragma comment(lib,"wxmsw25d_html")
-            #pragma comment(lib,"wxmsw25d_xrc")
+            #pragma comment(lib,"wxbase26d")
+            #pragma comment(lib,"wxbase26d_net")
+            #pragma comment(lib,"wxbase26d_xml")
+            #pragma comment(lib,"wxmsw26d_adv")
+            #pragma comment(lib,"wxmsw26d_core")
+            #pragma comment(lib,"wxmsw26d_html")
+            #pragma comment(lib,"wxmsw26d_qa")
+            #pragma comment(lib,"wxmsw26d_xrc")

         #else // release
             #pragma comment(lib,"wxexpat")
             #pragma comment(lib,"wxjpeg")
         #else // release
             #pragma comment(lib,"wxexpat")
             #pragma comment(lib,"wxjpeg")


@@ -94,13 +97,14 @@
             #pragma comment(lib,"wxregex")
             #pragma comment(lib,"wxtiff")
             #pragma comment(lib,"wxzlib")
             #pragma comment(lib,"wxregex")
             #pragma comment(lib,"wxtiff")
             #pragma comment(lib,"wxzlib")

-            #pragma comment(lib,"wxbase25")
-            #pragma comment(lib,"wxbase25_net")
-            #pragma comment(lib,"wxbase25_xml")
-            #pragma comment(lib,"wxmsw25_adv")
-            #pragma comment(lib,"wxmsw25_core")
-            #pragma comment(lib,"wxmsw25_html")
-            #pragma comment(lib,"wxmsw25_xrc")
+            #pragma comment(lib,"wxbase26")
+            #pragma comment(lib,"wxbase26_net")
+            #pragma comment(lib,"wxbase26_xml")
+            #pragma comment(lib,"wxmsw26_adv")
+            #pragma comment(lib,"wxmsw26_core")
+            #pragma comment(lib,"wxmsw26_html")
+            #pragma comment(lib,"wxmsw26_qa")
+            #pragma comment(lib,"wxmsw26_xrc")

         #endif // debug/release
     #endif // _UNICODE/!_UNICODE
 #else
         #endif // debug/release
     #endif // _UNICODE/!_UNICODE
 #else