[mapguide-commits] r4775 - in trunk/MgDev/Web/src: PhpApi PhpMapGuideApiEnvConfig

[svn_mapguide at osgeo.org]

Author: waltweltonlair
Date: 2010-04-08 23:51:37 -0400 (Thu, 08 Apr 2010)
New Revision: 4775

Modified:
   trunk/MgDev/Web/src/PhpApi/PhpApi.vcproj
   trunk/MgDev/Web/src/PhpMapGuideApiEnvConfig/PhpMapGuideApiEnvConfig.cpp
   trunk/MgDev/Web/src/PhpMapGuideApiEnvConfig/PhpMapGuideApiEnvConfig.vcproj
Log:
Fix Windows build...

Modified: trunk/MgDev/Web/src/PhpApi/PhpApi.vcproj
===================================================================
--- trunk/MgDev/Web/src/PhpApi/PhpApi.vcproj	2010-04-09 03:28:45 UTC (rev 4774)
+++ trunk/MgDev/Web/src/PhpApi/PhpApi.vcproj	2010-04-09 03:51:37 UTC (rev 4775)
@@ -68,7 +68,7 @@
 				AdditionalDependencies="ACEd.lib xerces-c_2D.lib php5ts.lib"
 				OutputFile="$(OutDir)\php_MapGuideApid.dll"
 				LinkIncremental="2"
-				AdditionalLibraryDirectories="..\..\..\Oem\ACE\ACE_wrappers\lib;..\..\..\Oem\dbxml-2.3.10\lib;..\..\..\Oem\php\dev"
+				AdditionalLibraryDirectories="..\..\..\Oem\ACE\ACE_wrappers\lib;"..\..\..\Oem\dbxml-2.3.10\lib";..\..\..\Oem\php\Release_TS"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)\php_MapGuideApid.pdb"
 				SubSystem="2"
@@ -148,7 +148,7 @@
 				AdditionalDependencies="ACEd.lib xerces-c_2D.lib php5ts.lib"
 				OutputFile="$(OutDir)\php_MapGuideApid.dll"
 				LinkIncremental="2"
-				AdditionalLibraryDirectories="..\..\..\Oem\ACE\ACE_wrappers\lib64;"..\..\..\Oem\dbxml-2.3.10\lib64";"..\..\..\Oem\php-5.2.5 (x64)\dev""
+				AdditionalLibraryDirectories="..\..\..\Oem\ACE\ACE_wrappers\lib64;"..\..\..\Oem\dbxml-2.3.10\lib64";..\..\..\Oem\php\x64\Release_TS"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)\php_MapGuideApid.pdb"
 				SubSystem="2"
@@ -226,7 +226,7 @@
 				AdditionalDependencies="ACE.lib xerces-c_2.lib php5ts.lib"
 				OutputFile="$(OutDir)\php_MapGuideApi.dll"
 				LinkIncremental="1"
-				AdditionalLibraryDirectories="..\..\..\Oem\ACE\ACE_wrappers\lib;..\..\..\Oem\dbxml-2.3.10\lib;..\..\..\Oem\php\dev"
+				AdditionalLibraryDirectories="..\..\..\Oem\ACE\ACE_wrappers\lib;"..\..\..\Oem\dbxml-2.3.10\lib";..\..\..\Oem\php\Release_TS"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)\php_MapGuideApi.pdb"
 				SubSystem="2"
@@ -306,7 +306,7 @@
 				AdditionalDependencies="ACE.lib xerces-c_2.lib php5ts.lib"
 				OutputFile="$(OutDir)\php_MapGuideApi.dll"
 				LinkIncremental="1"
-				AdditionalLibraryDirectories="..\..\..\Oem\ACE\ACE_wrappers\lib64;"..\..\..\Oem\dbxml-2.3.10\lib64";"..\..\..\Oem\php-5.2.5 (x64)\dev""
+				AdditionalLibraryDirectories="..\..\..\Oem\ACE\ACE_wrappers\lib64;"..\..\..\Oem\dbxml-2.3.10\lib64";..\..\..\Oem\php\x64\Release_TS"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)\php_MapGuideApi.pdb"
 				SubSystem="2"

Modified: trunk/MgDev/Web/src/PhpMapGuideApiEnvConfig/PhpMapGuideApiEnvConfig.cpp
===================================================================
--- trunk/MgDev/Web/src/PhpMapGuideApiEnvConfig/PhpMapGuideApiEnvConfig.cpp	2010-04-09 03:28:45 UTC (rev 4774)
+++ trunk/MgDev/Web/src/PhpMapGuideApiEnvConfig/PhpMapGuideApiEnvConfig.cpp	2010-04-09 03:51:37 UTC (rev 4775)
@@ -36,10 +36,10 @@
     hModule = GetModuleHandle(L"php5ts.dll");
     GetModuleFileName(hModule, phpPath, MAX_PATH);
     wcsrchr(phpPath, '\\')[0] = '\0';
-    //    FreeLibrary(hModule);  -- DO NOT CALL FreeLibrary() when using GetModuleHandle() as the reference count is not increased
+//    FreeLibrary(hModule);  -- DO NOT CALL FreeLibrary() when using GetModuleHandle() as the reference count is not increased
 
     // Prepend to process PATH environment string
-    wchar_t ePath[1024*4] = L"";  
+    wchar_t ePath[1024*4] = L"";
     wcscpy(ePath, phpPath);
     wcscat(ePath, L";");
     DWORD dw = (DWORD)wcslen(ePath);
@@ -71,30 +71,30 @@
     return SUCCESS;
 }
 
-PHP_MSHUTDOWN_FUNCTION(MapGuideApiEnvConfig)  
-{  
-    return SUCCESS;  
-}  
+PHP_MSHUTDOWN_FUNCTION(MapGuideApiEnvConfig)
+{
+    return SUCCESS;
+}
 
-PHP_MINFO_FUNCTION(MapGuideApiEnvConfig)  
-{  
-    php_info_print_table_start();  
-    php_info_print_table_row(2, "MapGuideApiEnvConfig", "enabled");  
-    php_info_print_table_end();  
-}  
+PHP_MINFO_FUNCTION(MapGuideApiEnvConfig)
+{
+    php_info_print_table_start();
+    php_info_print_table_row(2, "MapGuideApiEnvConfig", "enabled");
+    php_info_print_table_end();
+}
 
 /* compiled module information */
 zend_module_entry MapGuideApiEnvConfig_module_entry = {
     STANDARD_MODULE_HEADER,
-    "MapGuideApiEnvConfig",  
-    MapGuideApiEnvConfig_functions,  
-    PHP_MINIT(MapGuideApiEnvConfig),  
-    PHP_MSHUTDOWN(MapGuideApiEnvConfig),  
-    NULL,  
-    NULL,  
-    PHP_MINFO(MapGuideApiEnvConfig),  
-    NO_VERSION_YET,  
-    STANDARD_MODULE_PROPERTIES  
+    "MapGuideApiEnvConfig",
+    MapGuideApiEnvConfig_functions,
+    PHP_MINIT(MapGuideApiEnvConfig),
+    PHP_MSHUTDOWN(MapGuideApiEnvConfig),
+    NULL,
+    NULL,
+    PHP_MINFO(MapGuideApiEnvConfig),
+    NO_VERSION_YET,
+    STANDARD_MODULE_PROPERTIES
 };
 
 

Modified: trunk/MgDev/Web/src/PhpMapGuideApiEnvConfig/PhpMapGuideApiEnvConfig.vcproj
===================================================================
--- trunk/MgDev/Web/src/PhpMapGuideApiEnvConfig/PhpMapGuideApiEnvConfig.vcproj	2010-04-09 03:28:45 UTC (rev 4774)
+++ trunk/MgDev/Web/src/PhpMapGuideApiEnvConfig/PhpMapGuideApiEnvConfig.vcproj	2010-04-09 03:51:37 UTC (rev 4775)
@@ -66,7 +66,7 @@
 				AdditionalDependencies="php5ts.lib"
 				OutputFile="$(OutDir)\php_MapGuideApiEnvConfigd.dll"
 				LinkIncremental="2"
-				AdditionalLibraryDirectories="..\..\..\Oem\php\dev"
+				AdditionalLibraryDirectories="..\..\..\Oem\php\Release_TS"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)\php_MapGuideApiEnvConfigd.pdb"
 				SubSystem="2"
@@ -144,7 +144,7 @@
 				AdditionalDependencies="php5ts.lib"
 				OutputFile="$(OutDir)\php_MapGuideApiEnvConfigd.dll"
 				LinkIncremental="2"
-				AdditionalLibraryDirectories="..\..\..\Oem\php-5.2.5 (x64)\dev"
+				AdditionalLibraryDirectories="..\..\..\Oem\php\x64\Release_TS"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)\php_MapGuideApiEnvConfigd.pdb"
 				SubSystem="2"
@@ -222,7 +222,7 @@
 				AdditionalDependencies="php5ts.lib"
 				OutputFile="$(OutDir)\php_MapGuideApiEnvConfig.dll"
 				LinkIncremental="1"
-				AdditionalLibraryDirectories="..\..\..\Oem\php\dev"
+				AdditionalLibraryDirectories="..\..\..\Oem\php\Release_TS"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				OptimizeReferences="2"
@@ -301,7 +301,7 @@
 				AdditionalDependencies="php5ts.lib"
 				OutputFile="$(OutDir)\php_MapGuideApiEnvConfig.dll"
 				LinkIncremental="1"
-				AdditionalLibraryDirectories="..\..\..\Oem\php-5.2.5 (x64)\dev"
+				AdditionalLibraryDirectories="..\..\..\Oem\php\x64\Release_TS"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				OptimizeReferences="2"