Reuse wxMessageOutputStderr for wxLogStderr implementation.

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

diff --git a/include/msvc/wx/setup.h b/include/msvc/wx/setup.h
index 4fb08d2013ebcd44f94da00040466ef11fb506f6..f60059a208b91802fb89eac1628d2405ada36a12 100644 (file)
--- a/include/msvc/wx/setup.h
+++ b/include/msvc/wx/setup.h
@@ -60,6 +60,8 @@
         #define wxCOMPILER_PREFIX vc90
     #elif _MSC_VER == 1600
         #define wxCOMPILER_PREFIX vc100
         #define wxCOMPILER_PREFIX vc90
     #elif _MSC_VER == 1600
         #define wxCOMPILER_PREFIX vc100

+    #elif _MSC_VER == 1700
+        #define wxCOMPILER_PREFIX vc110

     #else
         #error "Unknown MSVC compiler version, please report to wx-dev."
     #endif
     #else
         #error "Unknown MSVC compiler version, please report to wx-dev."
     #endif


@@ -69,7 +71,7 @@
 
 // architecture-specific part: not used (again, for compatibility), for x86
 #if defined(_M_X64)
 
 // architecture-specific part: not used (again, for compatibility), for x86
 #if defined(_M_X64)

-    #define wxARCH_SUFFIX _amd64
+    #define wxARCH_SUFFIX _x64

 #elif defined(_M_IA64)
     #define wxARCH_SUFFIX _ia64
 #else // assume _M_IX86
 #elif defined(_M_IA64)
     #define wxARCH_SUFFIX _ia64
 #else // assume _M_IX86


@@ -85,7 +87,11 @@
 // The user can predefine a different prefix if not using the default MSW port
 // with MSVC.
 #ifndef wxTOOLKIT_PREFIX
 // The user can predefine a different prefix if not using the default MSW port
 // with MSVC.
 #ifndef wxTOOLKIT_PREFIX

-    #define wxTOOLKIT_PREFIX msw
+    #if defined(__WXGTK__)
+        #define wxTOOLKIT_PREFIX gtk2
+    #else
+        #define wxTOOLKIT_PREFIX msw
+    #endif

 #endif // wxTOOLKIT_PREFIX
 
 // the real setup.h header file we need is in the build-specific directory,
 #endif // wxTOOLKIT_PREFIX
 
 // the real setup.h header file we need is in the build-specific directory,


@@ -197,6 +203,9 @@
             #pragma comment(lib, wx3RD_PARTY_LIB_NAME("scintilla"))
         #endif
     #endif
             #pragma comment(lib, wx3RD_PARTY_LIB_NAME("scintilla"))
         #endif
     #endif

+    #if wxUSE_WEBVIEW && !defined(wxNO_WEBVIEW_LIB)
+        #pragma comment(lib, wxTOOLKIT_LIB_NAME("webview"))
+    #endif

 #endif // wxUSE_GUI
 
 
 #endif // wxUSE_GUI
 
 


@@ -220,4 +229,16 @@
     #if wxUSE_URL_NATIVE
         #pragma comment(lib, "wininet")
     #endif
     #if wxUSE_URL_NATIVE
         #pragma comment(lib, "wininet")
     #endif

+
+    #ifdef __WXGTK__
+        #pragma comment(lib, "gtk-win32-2.0.lib")
+        #pragma comment(lib, "gdk-win32-2.0.lib")
+        #pragma comment(lib, "pangocairo-1.0.lib")
+        #pragma comment(lib, "gdk_pixbuf-2.0.lib")
+        #pragma comment(lib, "cairo.lib")
+        #pragma comment(lib, "pango-1.0.lib")
+        #pragma comment(lib, "gobject-2.0.lib")
+        #pragma comment(lib, "gthread-2.0.lib")
+        #pragma comment(lib, "glib-2.0.lib")
+    #endif

 #endif // !WXUSINGDLL
 #endif // !WXUSINGDLL