X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d48a4705abed4dd435ffcc4e4bdc4b087c73bbf3..6041f69ca7bbb7c39e4ba64e407bc3ac39e3687f:/include/msvc/wx/setup.h diff --git a/include/msvc/wx/setup.h b/include/msvc/wx/setup.h index b123899eb2..99362ff09a 100644 --- 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: @@ -35,13 +35,37 @@ #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 -// compiler-specific prefix, we may use version-specific one in the future but -// for now it's just "vc" for all versions for compatibility -#define wxCOMPILER_PREFIX vc +// compiler-specific prefix: by default it's always just "vc" for compatibility +// reasons but if you use multiple MSVC versions you probably build them with +// COMPILER_PREFIX=vcXX and in this case you may want to either predefine +// 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) +#elif defined(wxMSVC_VERSION_AUTO) + #if _MSC_VER == 1200 + #define wxCOMPILER_PREFIX vc60 + #elif _MSC_VER == 1300 + #define wxCOMPILER_PREFIX vc70 + #elif _MSC_VER == 1310 + #define wxCOMPILER_PREFIX vc71 + #elif _MSC_VER == 1400 + #define wxCOMPILER_PREFIX vc80 + #elif _MSC_VER == 1500 + #define wxCOMPILER_PREFIX vc90 + #elif _MSC_VER == 1600 + #define wxCOMPILER_PREFIX vc100 + #else + #error "Unknown MSVC compiler version, please report to wx-dev." + #endif +#else + #define wxCOMPILER_PREFIX vc +#endif // architecture-specific part: not used (again, for compatibility), for x86 #if defined(_M_X64) @@ -61,8 +85,14 @@ // 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 \ + 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) #include wxSETUPH_PATH_STR @@ -70,7 +100,11 @@ // 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) @@ -154,3 +188,26 @@ #pragma comment(lib, wx3RD_PARTY_LIB_NAME("scintilla")) #endif #endif // wxUSE_GUI + + +#ifndef WXUSINGDLL + // Make sure all required system libraries are added to the linker too when + // using static libraries. + #pragma comment(lib, "kernel32") + #pragma comment(lib, "user32") + #pragma comment(lib, "gdi32") + #pragma comment(lib, "comdlg32") + #pragma comment(lib, "winspool") + #pragma comment(lib, "winmm") + #pragma comment(lib, "shell32") + #pragma comment(lib, "comctl32") + #pragma comment(lib, "ole32") + #pragma comment(lib, "oleaut32") + #pragma comment(lib, "uuid") + #pragma comment(lib, "rpcrt4") + #pragma comment(lib, "advapi32") + #pragma comment(lib, "wsock32") + #if wxUSE_URL_NATIVE + #pragma comment(lib, "wininet") + #endif +#endif // !WXUSINGDLL