[mapguide-commits] r5108 - in trunk/MgDev/Oem/ACE/ACE_wrappers: ace include/makeinclude

[svn_mapguide at osgeo.org]

Author: hubu
Date: 2010-09-03 10:38:14 +0000 (Fri, 03 Sep 2010)
New Revision: 5108

Modified:
   trunk/MgDev/Oem/ACE/ACE_wrappers/ace/ACE.vcproj
   trunk/MgDev/Oem/ACE/ACE_wrappers/include/makeinclude/platform_macosx.GNU
Log:
update the project file for x64

Modified: trunk/MgDev/Oem/ACE/ACE_wrappers/ace/ACE.vcproj
===================================================================
--- trunk/MgDev/Oem/ACE/ACE_wrappers/ace/ACE.vcproj	2010-09-03 09:34:04 UTC (rev 5107)
+++ trunk/MgDev/Oem/ACE/ACE_wrappers/ace/ACE.vcproj	2010-09-03 10:38:14 UTC (rev 5108)
@@ -109,7 +109,7 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="..\lib"
+			OutputDirectory="..\lib64"
 			IntermediateDirectory="Debug\ACE_vc9\AMD64"
 			ConfigurationType="2"
 			CharacterSet="0"
@@ -171,7 +171,7 @@
 				AdditionalLibraryDirectories=".;..\lib"
 				GenerateDebugInformation="true"
 				SubSystem="2"
-				ImportLibrary="..\lib\ACEd.lib"
+				ImportLibrary="..\lib64\ACEd.lib"
 				TargetMachine="17"
 			/>
 			<Tool
@@ -285,7 +285,7 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="..\lib"
+			OutputDirectory="..\lib64"
 			IntermediateDirectory="Release\ACE_vc9\AMD64"
 			ConfigurationType="2"
 			CharacterSet="0"
@@ -346,7 +346,7 @@
 				SubSystem="2"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
-				ImportLibrary="..\lib\ACE.lib"
+				ImportLibrary="..\lib64\ACE.lib"
 				TargetMachine="17"
 			/>
 			<Tool

Modified: trunk/MgDev/Oem/ACE/ACE_wrappers/include/makeinclude/platform_macosx.GNU
===================================================================
--- trunk/MgDev/Oem/ACE/ACE_wrappers/include/makeinclude/platform_macosx.GNU	2010-09-03 09:34:04 UTC (rev 5107)
+++ trunk/MgDev/Oem/ACE/ACE_wrappers/include/makeinclude/platform_macosx.GNU	2010-09-03 10:38:14 UTC (rev 5108)
@@ -41,7 +41,6 @@
 # Test for template instantiation, add to SOFLAGS if versioned_so set,
 # add -E to LDFLAGS if using GNU ld
 #
-include $(ACE_ROOT)/include/makeinclude/platform_g++_common.GNU
-include $(ACE_ROOT)/include/makeinclude/platform_linux.GNU
+include $(ACE_ROOT)/include/makeinclude/platform_g++_common.GNU
 
 CCFLAGS         += $(CFLAGS) $(TEMPLATES_FLAG)