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 0e3fdc72c81a7797acc38dd78328c9f6a65cb776..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
 /////////////////////////////////////////////////////////////////////////////


@@ -80,10 +79,19 @@
     #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
 #endif // DLL/!DLL
 
 // The user can predefine a different prefix if not using the default MSW port