Force wide char environment version initialization in wxGetEnvMap().

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

diff --git a/include/msvc/wx/setup.h b/include/msvc/wx/setup.h
index 0cd34e3451ab39b93b33aadf643d418114717508..06fa7d7ddc9ea6d36b461ab6280ca623db4d3b71 100644 (file)
--- a/include/msvc/wx/setup.h
+++ b/include/msvc/wx/setup.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        msvc/wx/msw/setup.h
+// Name:        msvc/wx/setup.h

 // Purpose:     wrapper around the real wx/setup.h for Visual C++
 // Author:      Vadim Zeitlin
 // Modified by:
 // Purpose:     wrapper around the real wx/setup.h for Visual C++
 // Author:      Vadim Zeitlin
 // Modified by:


@@ -35,7 +35,8 @@
     #ifdef _UNICODE
         #define wxSUFFIX u
     #else // !_UNICODE
     #ifdef _UNICODE
         #define wxSUFFIX u
     #else // !_UNICODE

-        #define wxSUFFIX
+        // don't define wxSUFFIX at all as preprocessor operations don't work
+        // with empty values so we need to check for this case specially below

     #endif // _UNICODE/!_UNICODE
 #endif
 
     #endif // _UNICODE/!_UNICODE
 #endif
 


@@ -45,7 +46,7 @@
 // wxMSVC_VERSION as "XX" or define wxMSVC_VERSION_AUTO to use the appropriate
 // version depending on the compiler used
 #ifdef wxMSVC_VERSION
 // wxMSVC_VERSION as "XX" or define wxMSVC_VERSION_AUTO to use the appropriate
 // version depending on the compiler used
 #ifdef wxMSVC_VERSION

-    #define wxCOMPILER_PREFIX wxCONCAT2(vc, wxMSVC_VERSION)
+    #define wxCOMPILER_PREFIX wxCONCAT(vc, wxMSVC_VERSION)

 #elif defined(wxMSVC_VERSION_AUTO)
     #if _MSC_VER == 1200
         #define wxCOMPILER_PREFIX vc60
 #elif defined(wxMSVC_VERSION_AUTO)
     #if _MSC_VER == 1200
         #define wxCOMPILER_PREFIX vc60


@@ -59,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


@@ -81,11 +84,22 @@
     #define wxLIB_SUBDIR wxCONCAT3(wxCOMPILER_PREFIX, wxARCH_SUFFIX, _lib)
 #endif // DLL/!DLL
 
     #define wxLIB_SUBDIR wxCONCAT3(wxCOMPILER_PREFIX, wxARCH_SUFFIX, _lib)
 #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
+#endif // wxTOOLKIT_PREFIX

 
 // the real setup.h header file we need is in the build-specific directory,
 // construct the path to it
 
 // the real setup.h header file we need is in the build-specific directory,
 // construct the path to it

-#define wxSETUPH_PATH \
-    wxCONCAT5(../../../lib/, wxLIB_SUBDIR, /msw, wxSUFFIX, /wx/setup.h)
+#ifdef wxSUFFIX
+    #define wxSETUPH_PATH \
+        wxCONCAT6(../../../lib/, wxLIB_SUBDIR, /, wxTOOLKIT_PREFIX, wxSUFFIX, /wx/setup.h)
+#else // suffix is empty
+    #define wxSETUPH_PATH \
+        wxCONCAT5(../../../lib/, wxLIB_SUBDIR, /, wxTOOLKIT_PREFIX, /wx/setup.h)
+#endif
+

 #define wxSETUPH_PATH_STR wxSTRINGIZE(wxSETUPH_PATH)
 
 #include wxSETUPH_PATH_STR
 #define wxSETUPH_PATH_STR wxSTRINGIZE(wxSETUPH_PATH)
 
 #include wxSETUPH_PATH_STR


@@ -93,7 +107,11 @@
 
 // the library names depend on the build, these macro builds the correct
 // library name for the given base name
 
 // the library names depend on the build, these macro builds the correct
 // library name for the given base name

-#define wxSUFFIX_STR wxSTRINGIZE(wxSUFFIX)
+#ifdef wxSUFFIX
+    #define wxSUFFIX_STR wxSTRINGIZE(wxSUFFIX)
+#else // suffix is empty
+    #define wxSUFFIX_STR ""
+#endif

 #define wxSHORT_VERSION_STRING \
     wxSTRINGIZE(wxMAJOR_VERSION) wxSTRINGIZE(wxMINOR_VERSION)
 
 #define wxSHORT_VERSION_STRING \
     wxSTRINGIZE(wxMAJOR_VERSION) wxSTRINGIZE(wxMINOR_VERSION)
 


@@ -101,10 +119,13 @@
     "wx" name wxSHORT_VERSION_STRING wxSUFFIX_STR subname
 
 #define wxBASE_LIB_NAME(name) wxWX_LIB_NAME("base", "_" name)
     "wx" name wxSHORT_VERSION_STRING wxSUFFIX_STR subname
 
 #define wxBASE_LIB_NAME(name) wxWX_LIB_NAME("base", "_" name)

-#define wxMSW_LIB_NAME(name) wxWX_LIB_NAME("msw", "_" name)
+#define wxTOOLKIT_LIB_NAME(name) wxWX_LIB_NAME(wxSTRINGIZE(wxTOOLKIT_PREFIX), "_" name)

 
 

-// this one is for 3rd party libraries: they don't have the version number
+// This one is for 3rd party libraries: they don't have the version number

 // in their names and usually exist in ANSI version only (except for regex)
 // in their names and usually exist in ANSI version only (except for regex)

+//
+// 3rd party libraries are also are not linked in when using DLLs as they're
+// embedded inside our own DLLs and don't need to be linked with the user code.

 #define wx3RD_PARTY_LIB_NAME(name) "wx" name wxSUFFIX_DEBUG
 
 // special version for regex as it does have a Unicode version
 #define wx3RD_PARTY_LIB_NAME(name) "wx" name wxSUFFIX_DEBUG
 
 // special version for regex as it does have a Unicode version


@@ -118,63 +139,65 @@
 #ifndef wxNO_XML_LIB
     #pragma comment(lib, wxBASE_LIB_NAME("xml"))
 #endif
 #ifndef wxNO_XML_LIB
     #pragma comment(lib, wxBASE_LIB_NAME("xml"))
 #endif

-#if wxUSE_REGEX && !defined(wxNO_REGEX_LIB)
+#if wxUSE_REGEX && !defined(wxNO_REGEX_LIB) && !defined(WXUSINGDLL)

     #pragma comment(lib, wx3RD_PARTY_LIB_NAME_U("regex"))
 #endif
 
 #if wxUSE_GUI
     #pragma comment(lib, wx3RD_PARTY_LIB_NAME_U("regex"))
 #endif
 
 #if wxUSE_GUI

-    #if wxUSE_XML && !defined(wxNO_EXPAT_LIB)
+    #if wxUSE_XML && !defined(wxNO_EXPAT_LIB) && !defined(WXUSINGDLL)

         #pragma comment(lib, wx3RD_PARTY_LIB_NAME("expat"))
     #endif
         #pragma comment(lib, wx3RD_PARTY_LIB_NAME("expat"))
     #endif

-    #if wxUSE_LIBJPEG && !defined(wxNO_JPEG_LIB)
+    #if wxUSE_LIBJPEG && !defined(wxNO_JPEG_LIB) && !defined(WXUSINGDLL)

         #pragma comment(lib, wx3RD_PARTY_LIB_NAME("jpeg"))
     #endif
         #pragma comment(lib, wx3RD_PARTY_LIB_NAME("jpeg"))
     #endif

-    #if wxUSE_LIBPNG && !defined(wxNO_PNG_LIB)
+    #if wxUSE_LIBPNG && !defined(wxNO_PNG_LIB) && !defined(WXUSINGDLL)

         #pragma comment(lib, wx3RD_PARTY_LIB_NAME("png"))
     #endif
         #pragma comment(lib, wx3RD_PARTY_LIB_NAME("png"))
     #endif

-    #if wxUSE_LIBTIFF && !defined(wxNO_TIFF_LIB)
+    #if wxUSE_LIBTIFF && !defined(wxNO_TIFF_LIB) && !defined(WXUSINGDLL)

         #pragma comment(lib, wx3RD_PARTY_LIB_NAME("tiff"))
     #endif
         #pragma comment(lib, wx3RD_PARTY_LIB_NAME("tiff"))
     #endif

-    #if wxUSE_ZLIB && !defined(wxNO_ZLIB_LIB)
+    #if wxUSE_ZLIB && !defined(wxNO_ZLIB_LIB) && !defined(WXUSINGDLL)

         #pragma comment(lib, wx3RD_PARTY_LIB_NAME("zlib"))
     #endif
 
         #pragma comment(lib, wx3RD_PARTY_LIB_NAME("zlib"))
     #endif
 

-    #pragma comment(lib, wxMSW_LIB_NAME("core"))
+    #pragma comment(lib, wxTOOLKIT_LIB_NAME("core"))

 
     #ifndef wxNO_ADV_LIB
 
     #ifndef wxNO_ADV_LIB

-        #pragma comment(lib, wxMSW_LIB_NAME("adv"))
+        #pragma comment(lib, wxTOOLKIT_LIB_NAME("adv"))

     #endif
 
     #ifndef wxNO_HTML_LIB
     #endif
 
     #ifndef wxNO_HTML_LIB

-        #pragma comment(lib, wxMSW_LIB_NAME("html"))
+        #pragma comment(lib, wxTOOLKIT_LIB_NAME("html"))

     #endif
     #if wxUSE_GLCANVAS && !defined(wxNO_GL_LIB)
     #endif
     #if wxUSE_GLCANVAS && !defined(wxNO_GL_LIB)

-        #pragma comment(lib, wxMSW_LIB_NAME("gl"))
+        #pragma comment(lib, wxTOOLKIT_LIB_NAME("gl"))

     #endif
     #if wxUSE_DEBUGREPORT && !defined(wxNO_QA_LIB)
     #endif
     #if wxUSE_DEBUGREPORT && !defined(wxNO_QA_LIB)

-        #pragma comment(lib, wxMSW_LIB_NAME("qa"))
+        #pragma comment(lib, wxTOOLKIT_LIB_NAME("qa"))

     #endif
     #if wxUSE_XRC && !defined(wxNO_XRC_LIB)
     #endif
     #if wxUSE_XRC && !defined(wxNO_XRC_LIB)

-        #pragma comment(lib, wxMSW_LIB_NAME("xrc"))
+        #pragma comment(lib, wxTOOLKIT_LIB_NAME("xrc"))

     #endif
     #if wxUSE_AUI && !defined(wxNO_AUI_LIB)
     #endif
     #if wxUSE_AUI && !defined(wxNO_AUI_LIB)

-        #pragma comment(lib, wxMSW_LIB_NAME("aui"))
+        #pragma comment(lib, wxTOOLKIT_LIB_NAME("aui"))

     #endif
     #if wxUSE_PROPGRID && !defined(wxNO_PROPGRID_LIB)
     #endif
     #if wxUSE_PROPGRID && !defined(wxNO_PROPGRID_LIB)

-        #pragma comment(lib, wxMSW_LIB_NAME("propgrid"))
+        #pragma comment(lib, wxTOOLKIT_LIB_NAME("propgrid"))

     #endif
     #if wxUSE_RIBBON && !defined(wxNO_RIBBON_LIB)
     #endif
     #if wxUSE_RIBBON && !defined(wxNO_RIBBON_LIB)

-        #pragma comment(lib, wxMSW_LIB_NAME("ribbon"))
+        #pragma comment(lib, wxTOOLKIT_LIB_NAME("ribbon"))

     #endif
     #if wxUSE_RICHTEXT && !defined(wxNO_RICHTEXT_LIB)
     #endif
     #if wxUSE_RICHTEXT && !defined(wxNO_RICHTEXT_LIB)

-        #pragma comment(lib, wxMSW_LIB_NAME("richtext"))
+        #pragma comment(lib, wxTOOLKIT_LIB_NAME("richtext"))

     #endif
     #if wxUSE_MEDIACTRL && !defined(wxNO_MEDIA_LIB)
     #endif
     #if wxUSE_MEDIACTRL && !defined(wxNO_MEDIA_LIB)

-        #pragma comment(lib, wxMSW_LIB_NAME("media"))
+        #pragma comment(lib, wxTOOLKIT_LIB_NAME("media"))

     #endif
     #if wxUSE_STC && !defined(wxNO_STC_LIB)
     #endif
     #if wxUSE_STC && !defined(wxNO_STC_LIB)

-        #pragma comment(lib, wxMSW_LIB_NAME("stc"))
-        #pragma comment(lib, wx3RD_PARTY_LIB_NAME("scintilla"))
+        #pragma comment(lib, wxTOOLKIT_LIB_NAME("stc"))
+        #ifndef WXUSINGDLL
+            #pragma comment(lib, wx3RD_PARTY_LIB_NAME("scintilla"))
+        #endif

     #endif
 #endif // wxUSE_GUI
 
     #endif
 #endif // wxUSE_GUI