Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Handle ANSI release configuration correctly in msvc/wx/setup.h.

Browse Source 
Preprocessor operations don't work with empty values so check for the case of
empty suffix specially.

This avoid warnings about "not enough actual parameters for macro
'wxSTRINGIZE_HELPER'" from MSVC.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67015 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2011-02-24 20:34:48 +00:00
parent 3f0e574aa7
commit d70fe85f46
1 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
include/msvc/wx/setup.h
View File

@@ -35,7 +35,8 @@
#ifdef _UNICODE #ifdef _UNICODE
#define wxSUFFIX u #define wxSUFFIX u
#else // !_UNICODE #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 // _UNICODE/!_UNICODE
#endif #endif
@@ -84,8 +85,14 @@
// the real setup.h header file we need is in the build-specific directory, // the real setup.h header file we need is in the build-specific directory,
// construct the path to it // construct the path to it
#define wxSETUPH_PATH \ #ifdef wxSUFFIX
#define wxSETUPH_PATH \
wxCONCAT5(../../../lib/, wxLIB_SUBDIR, /msw, wxSUFFIX, /wx/setup.h) wxCONCAT5(../../../lib/, wxLIB_SUBDIR, /msw, wxSUFFIX, /wx/setup.h)
#else // suffix is empty
#define wxSETUPH_PATH \
wxCONCAT3(../../../lib/, wxLIB_SUBDIR, /msw/wx/setup.h)
#endif
#define wxSETUPH_PATH_STR wxSTRINGIZE(wxSETUPH_PATH) #define wxSETUPH_PATH_STR wxSTRINGIZE(wxSETUPH_PATH)
#include wxSETUPH_PATH_STR #include wxSETUPH_PATH_STR
@@ -93,7 +100,11 @@
// the library names depend on the build, these macro builds the correct // the library names depend on the build, these macro builds the correct
// library name for the given base name // 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 \ #define wxSHORT_VERSION_STRING \
wxSTRINGIZE(wxMAJOR_VERSION) wxSTRINGIZE(wxMINOR_VERSION) wxSTRINGIZE(wxMAJOR_VERSION) wxSTRINGIZE(wxMINOR_VERSION)