AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use correct directory names in msvc/wx/setup.h for 64 bit builds.

Browse Source 
Use _amd64 and _ia64 suffixes if _M_X64 or _M_IA64 is defined.

Closes #11022.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63616 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2010-03-03 14:19:18 +00:00
parent 55ef931807
commit d48a4705ab
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -39,10 +39,23 @@
#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
// architecture-specific part: not used (again, for compatibility), for x86
#if defined(_M_X64)
#define wxARCH_SUFFIX _amd64
#elif defined(_M_IA64)
#define wxARCH_SUFFIX _ia64
#else // assume _M_IX86
#define wxARCH_SUFFIX
#endif
#ifdef WXUSINGDLL
#define wxLIB_SUBDIR vc_dll
#define wxLIB_SUBDIR wxCONCAT3(wxCOMPILER_PREFIX, wxARCH_SUFFIX, _dll)
#else // !DLL
#define wxLIB_SUBDIR vc_lib
#define wxLIB_SUBDIR wxCONCAT3(wxCOMPILER_PREFIX, wxARCH_SUFFIX, _lib)
#endif // DLL/!DLL