[mapguide-commits] r6155 - in trunk/MgDev: Oem/php/main Web/src/PhpApi

[svn_mapguide at osgeo.org]

Author: liuar
Date: 2011-09-29 16:25:55 -0700 (Thu, 29 Sep 2011)
New Revision: 6155

Modified:
   trunk/MgDev/Oem/php/main/config.w32.h
   trunk/MgDev/Web/src/PhpApi/PhpApi.vcxproj
Log:
Submit on behalf of Mars Wu
Implement RFC 121. Ticket: http://trac.osgeo.org/mapguide/ticket/1818
Set the compiler ID for x86 and x64.
Because php win32 is built with VC9 and php x64 is built with VC10, the compiler ID has to be set correspondingly.

Modified: trunk/MgDev/Oem/php/main/config.w32.h
===================================================================
--- trunk/MgDev/Oem/php/main/config.w32.h	2011-09-29 19:49:41 UTC (rev 6154)
+++ trunk/MgDev/Oem/php/main/config.w32.h	2011-09-29 23:25:55 UTC (rev 6155)
@@ -180,11 +180,18 @@
 #define CONFIGURE_COMMAND "cscript /nologo configure.js  \"--enable-snapshot-build\" \"--disable-isapi\"" " \"--without-enchant\""
 
 /* Detected compiler version */
+#if !defined(_WIN64)
 #define COMPILER "MSVC9 (Visual C++ 2008)"
+#else
+#define COMPILER "MSVC10 (Visual C++ 2010)"
+#endif
 
 /* Compiler compatibility ID */
+#if !defined(_WIN64)
 #define PHP_COMPILER_ID "VC9"
-
+#else
+#define PHP_COMPILER_ID "VC10"
+#endif
 /* Detected compiler architecture */
 #define ARCHITECTURE "x86"
 

Modified: trunk/MgDev/Web/src/PhpApi/PhpApi.vcxproj
===================================================================
--- trunk/MgDev/Web/src/PhpApi/PhpApi.vcxproj	2011-09-29 19:49:41 UTC (rev 6154)
+++ trunk/MgDev/Web/src/PhpApi/PhpApi.vcxproj	2011-09-29 23:25:55 UTC (rev 6155)
@@ -205,7 +205,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <AdditionalIncludeDirectories>..\HttpHandler;..\WebApp;..\WebSupport;..\..\..\Common\MdfModel;..\..\..\Common\Foundation;..\..\..\Common\Geometry;..\..\..\Common\PlatformBase;..\..\..\Common\MapGuideCommon;..\..\..\Oem\ACE\ACE_wrappers;..\..\..\Oem\dbxml\xerces-c-src\src;..\..\..\Oem\php;..\..\..\Oem\php\main;..\..\..\Oem\php\TSRM;..\..\..\Oem\php\Zend;..\..\..\Oem\php\ext\w32api;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;PHPPROXYAPI_EXPORTS;ZEND_WIN32;PHP_WIN32;ZEND_DEBUG=0;ZTS=1;PHP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;PHPPROXYAPI_EXPORTS;ZEND_WIN32;PHP_WIN32;ZEND_DEBUG=0;ZTS=1;PHP;_WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ExceptionHandling>Async</ExceptionHandling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <WarningLevel>Level3</WarningLevel>