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

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

diff --git a/include/msvc/wx/setup.h b/include/msvc/wx/setup.h
index 07932cdaeec24b42b7755b4a390e899c144e60f4..b123899eb21b53def01fbe3c24aaf1ada2f72fee 100644 (file)
--- a/include/msvc/wx/setup.h
+++ b/include/msvc/wx/setup.h
@@ -39,10 +39,23 @@
     #endif // _UNICODE/!_UNICODE
 #endif
 
     #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
 #ifdef WXUSINGDLL

-    #define wxLIB_SUBDIR vc_dll
+    #define wxLIB_SUBDIR wxCONCAT3(wxCOMPILER_PREFIX, wxARCH_SUFFIX, _dll)

 #else // !DLL
 #else // !DLL

-    #define wxLIB_SUBDIR vc_lib
+    #define wxLIB_SUBDIR wxCONCAT3(wxCOMPILER_PREFIX, wxARCH_SUFFIX, _lib)

 #endif // DLL/!DLL
 
 
 #endif // DLL/!DLL