Don't define __STRICT_ANSI__, we should build both with and without it.

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

diff --git a/include/msvc/wx/setup.h b/include/msvc/wx/setup.h
index 06fa7d7ddc9ea6d36b461ab6280ca623db4d3b71..31c5efc42f5fdd7fe24ed70cd79bed7aa2e5d38c 100644 (file)
--- a/include/msvc/wx/setup.h
+++ b/include/msvc/wx/setup.h
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     2004-12-12
-// RCS-ID:      $Id$
 // Copyright:   (c) 2004 Vadim Zeitlin <vadim@wxwindows.org>
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -62,6 +61,8 @@
         #define wxCOMPILER_PREFIX vc100
     #elif _MSC_VER == 1700
         #define wxCOMPILER_PREFIX vc110
+    #elif _MSC_VER == 1800
+        #define wxCOMPILER_PREFIX vc120
     #else
         #error "Unknown MSVC compiler version, please report to wx-dev."
     #endif
@@ -71,23 +72,36 @@
 
 // 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
     #define wxARCH_SUFFIX
 #endif
 
+// Ensure the library configuration is defined
+#ifndef wxCFG
+    #define wxCFG
+#endif
+
+// Construct the path for the subdirectory under /lib/ that the included setup.h
+// will be used from
 #ifdef WXUSINGDLL
-    #define wxLIB_SUBDIR wxCONCAT3(wxCOMPILER_PREFIX, wxARCH_SUFFIX, _dll)
+    #define wxLIB_SUBDIR \
+        wxCONCAT4(wxCOMPILER_PREFIX, wxARCH_SUFFIX, _dll, wxCFG)
 #else // !DLL
-    #define wxLIB_SUBDIR wxCONCAT3(wxCOMPILER_PREFIX, wxARCH_SUFFIX, _lib)
+    #define wxLIB_SUBDIR \
+        wxCONCAT4(wxCOMPILER_PREFIX, wxARCH_SUFFIX, _lib, wxCFG)
 #endif // DLL/!DLL
 
 // 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,
@@ -199,6 +213,9 @@
             #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
 
 
@@ -222,4 +239,16 @@
     #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