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 c1703080f7c19cd5cd760509b3e9c91ebbdf53ff..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
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     2004-12-12

-// RCS-ID:      $Id$

 // Copyright:   (c) 2004 Vadim Zeitlin <vadim@wxwindows.org>
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // 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
         #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
     #else
         #error "Unknown MSVC compiler version, please report to wx-dev."
     #endif


@@ -78,16 +79,29 @@
     #define wxARCH_SUFFIX
 #endif
 
     #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
 #ifdef WXUSINGDLL

-    #define wxLIB_SUBDIR wxCONCAT3(wxCOMPILER_PREFIX, wxARCH_SUFFIX, _dll)
+    #define wxLIB_SUBDIR \
+        wxCONCAT4(wxCOMPILER_PREFIX, wxARCH_SUFFIX, _dll, wxCFG)

 #else // !DLL
 #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
 #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,
 #endif // wxTOOLKIT_PREFIX
 
 // the real setup.h header file we need is in the build-specific directory,


@@ -225,4 +239,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