]> git.saurik.com Git - wxWidgets.git/commitdiff
Correct wxCOMPILER_PREFIX definition when wxMSVC_VERSION is predefined.
authorVadim Zeitlin <vadim@wxwidgets.org>
Thu, 1 Mar 2012 01:05:25 +0000 (01:05 +0000)
committerVadim Zeitlin <vadim@wxwidgets.org>
Thu, 1 Mar 2012 01:05:25 +0000 (01:05 +0000)
Fix the wrong concatenation macro name that was used as using wxMSVC_VERSION
could not work as expected before (which also shows that nobody ever used it).

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70758 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

include/msvc/wx/setup.h

index 096bdb0abc0d9b53770ba1e9595c8a394b85f646..799914175fc38bbce6c9cbf413281511c74a887a 100644 (file)
@@ -46,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