X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/14a3591de2c178664d64f2d0efd477a87bc93543..399754a6836ef144bd354982b25fab43f548414e:/include/msvc/wx/setup.h

diff --git a/include/msvc/wx/setup.h b/include/msvc/wx/setup.h
index d534594cd4..e5a5155172 100644
--- a/include/msvc/wx/setup.h
+++ b/include/msvc/wx/setup.h
@@ -29,26 +29,6 @@
             #endif
         #endif
 
-        // if we're using MSLU, ensure that the first library we use is
-        // unicows.lib
-        #if wxUSE_UNICODE_MSLU
-            // for this, first tell linker not to use the standard libraries
-            #pragma comment(linker, "/nod:kernel32.lib /nod:advapi32.lib /nod:user32.lib /nod:gdi32.lib /nod:shell32.lib /nod:comdlg32.lib /nod:version.lib /nod:mpr.lib /nod:rasapi32.lib /nod:winmm.lib /nod:winspool.lib /nod:vfw32.lib /nod:secur32.lib /nod:oleacc.lib /nod:oledlg.lib /nod:sensapi.lib")
-
-            // then tell it to link with unicows.lib
-            #pragma comment(lib, "unicows.lib")
-
-            // and only then readd all standard libraries back
-            #pragma comment(lib, "kernel32.lib")
-            #pragma comment(lib, "user32.lib")
-            #pragma comment(lib, "gdi32.lib")
-            #pragma comment(lib, "winspool.lib")
-            #pragma comment(lib, "comdlg32.lib")
-            #pragma comment(lib, "advapi32.lib")
-            #pragma comment(lib, "shell32.lib")
-            #pragma comment(lib, "oleacc.lib")
-        #endif // wxUSE_UNICODE_MSLU
-
         #ifdef _DEBUG
             #if wxUSE_XML
                 #pragma comment(lib,"wxexpatd")
@@ -68,16 +48,23 @@
             #if wxUSE_ZLIB
                 #pragma comment(lib,"wxzlibd")
             #endif
-            #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")
+            #pragma comment(lib,"wxbase27ud")
+            #pragma comment(lib,"wxbase27ud_net")
+            #pragma comment(lib,"wxbase27ud_xml")
+            #pragma comment(lib,"wxmsw27ud_adv")
+            #pragma comment(lib,"wxmsw27ud_core")
+            #pragma comment(lib,"wxmsw27ud_html")
+            #if wxUSE_DEBUGREPORT
+            #pragma comment(lib,"wxmsw27ud_qa")
+            #endif
+            #pragma comment(lib,"wxmsw27ud_xrc")
+            #pragma comment(lib,"wxmsw27ud_aui")
+            #pragma comment(lib,"wxmsw27ud_richtext")
             #if wxUSE_MEDIACTRL
-                #pragma comment(lib,"wxmsw26ud_media")
+                #pragma comment(lib,"wxmsw27ud_media")
+            #endif
+            #if wxUSE_ODBC
+                #pragma comment(lib,"wxbase27ud_odbc")
             #endif
         #else // release
             #if wxUSE_XML
@@ -98,16 +85,23 @@
             #if wxUSE_ZLIB
                 #pragma comment(lib,"wxzlib")
             #endif
-            #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")
+            #pragma comment(lib,"wxbase27u")
+            #pragma comment(lib,"wxbase27u_net")
+            #pragma comment(lib,"wxbase27u_xml")
+            #pragma comment(lib,"wxmsw27u_adv")
+            #pragma comment(lib,"wxmsw27u_core")
+            #pragma comment(lib,"wxmsw27u_html")
+            #if wxUSE_DEBUGREPORT
+            #pragma comment(lib,"wxmsw27u_qa")
+            #endif
+            #pragma comment(lib,"wxmsw27u_xrc")
+            #pragma comment(lib,"wxmsw27u_aui")
+            #pragma comment(lib,"wxmsw27u_richtext")
             #if wxUSE_MEDIACTRL
-                #pragma comment(lib,"wxmsw26u_media")
+                #pragma comment(lib,"wxmsw27u_media")
+            #endif
+            #if wxUSE_ODBC
+                #pragma comment(lib,"wxbase27u_odbc")
             #endif
         #endif // debug/release
     #else // !_UNICODE
@@ -144,16 +138,23 @@
             #if wxUSE_ZLIB
                 #pragma comment(lib,"wxzlibd")
             #endif
-            #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")
+            #pragma comment(lib,"wxbase27d")
+            #pragma comment(lib,"wxbase27d_net")
+            #pragma comment(lib,"wxbase27d_xml")
+            #pragma comment(lib,"wxmsw27d_adv")
+            #pragma comment(lib,"wxmsw27d_core")
+            #pragma comment(lib,"wxmsw27d_html")
+            #if wxUSE_DEBUGREPORT
+            #pragma comment(lib,"wxmsw27d_qa")
+            #endif
+            #pragma comment(lib,"wxmsw27d_xrc")
+            #pragma comment(lib,"wxmsw27d_aui")
+            #pragma comment(lib,"wxmsw27d_richtext")
             #if wxUSE_MEDIACTRL
-                #pragma comment(lib,"wxmsw26d_media")
+                #pragma comment(lib,"wxmsw27d_media")
+            #endif
+            #if wxUSE_ODBC
+                #pragma comment(lib,"wxbase27d_odbc")
             #endif
         #else // release
             #if wxUSE_XML
@@ -174,16 +175,23 @@
             #if wxUSE_ZLIB
                 #pragma comment(lib,"wxzlib")
             #endif
-            #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")
+            #pragma comment(lib,"wxbase27")
+            #pragma comment(lib,"wxbase27_net")
+            #pragma comment(lib,"wxbase27_xml")
+            #pragma comment(lib,"wxmsw27_adv")
+            #pragma comment(lib,"wxmsw27_core")
+            #pragma comment(lib,"wxmsw27_html")
+            #if wxUSE_DEBUGREPORT
+            #pragma comment(lib,"wxmsw27_qa")
+            #endif
+            #pragma comment(lib,"wxmsw27_xrc")
+            #pragma comment(lib,"wxmsw27_aui")
+            #pragma comment(lib,"wxmsw27_richtext")
             #if wxUSE_MEDIACTRL
-                #pragma comment(lib,"wxmsw26_media")
+                #pragma comment(lib,"wxmsw27_media")
+            #endif
+            #if wxUSE_ODBC
+                #pragma comment(lib,"wxbase27_odbc")
             #endif
         #endif // debug/release
     #endif // _UNICODE/!_UNICODE