[mapguide-commits] r4975 - in branches/2.2/MgDev/Web/src/DotNetApi:
. Foundation Geometry MapGuideCommon PlatformBase Web
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Sat Jun 26 09:55:58 EDT 2010
Author: trevorwekel
Date: 2010-06-26 13:55:58 +0000 (Sat, 26 Jun 2010)
New Revision: 4975
Modified:
branches/2.2/MgDev/Web/src/DotNetApi/DotNetApi.vcproj
branches/2.2/MgDev/Web/src/DotNetApi/Foundation/FoundationDotNetApi.vcproj
branches/2.2/MgDev/Web/src/DotNetApi/Foundation/FoundationMakefile
branches/2.2/MgDev/Web/src/DotNetApi/Geometry/GeometryDotNetApi.vcproj
branches/2.2/MgDev/Web/src/DotNetApi/Geometry/GeometryMakefile
branches/2.2/MgDev/Web/src/DotNetApi/Makefile
branches/2.2/MgDev/Web/src/DotNetApi/MapGuideCommon/MapGuideCommonDotNetApi.vcproj
branches/2.2/MgDev/Web/src/DotNetApi/MapGuideCommon/MapGuideCommonMakefile
branches/2.2/MgDev/Web/src/DotNetApi/PlatformBase/PlatformBaseDotNetApi.vcproj
branches/2.2/MgDev/Web/src/DotNetApi/PlatformBase/PlatformBaseMakefile
branches/2.2/MgDev/Web/src/DotNetApi/Web/WebDotNetApi.vcproj
branches/2.2/MgDev/Web/src/DotNetApi/Web/WebMakefile
Log:
Ticket #1387 Support 64 bit Web Extensions on Windows
Modify .Net assembly build to flag assemblies as x86 or x64.
See http://msdn.microsoft.com/en-us/library/zekwfyz4%28v=VS.90%29.aspx
Submit to 2.2 branch
Modified: branches/2.2/MgDev/Web/src/DotNetApi/DotNetApi.vcproj
===================================================================
--- branches/2.2/MgDev/Web/src/DotNetApi/DotNetApi.vcproj 2010-06-26 13:52:40 UTC (rev 4974)
+++ branches/2.2/MgDev/Web/src/DotNetApi/DotNetApi.vcproj 2010-06-26 13:55:58 UTC (rev 4975)
@@ -27,8 +27,8 @@
>
<Tool
Name="VCNMakeTool"
- BuildCommandLine="nmake -f Makefile OUTDIR="$(OutDir)" debug"
- ReBuildCommandLine="nmake -a -f Makefile OUTDIR="$(OutDir)" debug"
+ BuildCommandLine="nmake -f Makefile PLATFORM=x86 OUTDIR="$(OutDir)" debug"
+ ReBuildCommandLine="nmake -a -f Makefile PLATFORM=x86 OUTDIR="$(OutDir)" debug"
CleanCommandLine="nmake -f Makefile OUTDIR="$(OutDir)" cleandebug"
Output="$(OutDir)\MapGuideDotNetApid.dll"
PreprocessorDefinitions=""
@@ -47,8 +47,8 @@
>
<Tool
Name="VCNMakeTool"
- BuildCommandLine="nmake -f Makefile OUTDIR="$(OutDir)" debug"
- ReBuildCommandLine="nmake -a -f Makefile OUTDIR="$(OutDir)" debug"
+ BuildCommandLine="nmake -f Makefile PLATFORM=x64 OUTDIR="$(OutDir)" debug"
+ ReBuildCommandLine="nmake -a -f Makefile PLATFORM=x64 OUTDIR="$(OutDir)" debug"
CleanCommandLine="nmake -f Makefile OUTDIR="$(OutDir)" cleandebug"
Output="$(OutDir)\MapGuideDotNetApid.dll"
PreprocessorDefinitions=""
@@ -67,8 +67,8 @@
>
<Tool
Name="VCNMakeTool"
- BuildCommandLine="nmake -f Makefile OUTDIR="$(OutDir)" release"
- ReBuildCommandLine="nmake -a -f Makefile OUTDIR="$(OutDir)" release"
+ BuildCommandLine="nmake -f Makefile PLATFORM=x86 OUTDIR="$(OutDir)" release"
+ ReBuildCommandLine="nmake -a -f Makefile PLATFORM=x86 OUTDIR="$(OutDir)" release"
CleanCommandLine="nmake -f Makefile OUTDIR="$(OutDir)" cleanrelease"
Output="$(OutDir)\MapGuideDotNetApi.dll"
PreprocessorDefinitions=""
@@ -87,8 +87,8 @@
>
<Tool
Name="VCNMakeTool"
- BuildCommandLine="nmake -f Makefile OUTDIR="$(OutDir)" release"
- ReBuildCommandLine="nmake -a -f Makefile OUTDIR="$(OutDir)" release"
+ BuildCommandLine="nmake -f Makefile PLATFORM=x64 OUTDIR="$(OutDir)" release"
+ ReBuildCommandLine="nmake -a -f Makefile PLATFORM=x64 OUTDIR="$(OutDir)" release"
CleanCommandLine="nmake -f Makefile OUTDIR="$(OutDir)" cleanrelease"
Output="$(OutDir)\MapGuideDotNetApi.dll"
PreprocessorDefinitions=""
Modified: branches/2.2/MgDev/Web/src/DotNetApi/Foundation/FoundationDotNetApi.vcproj
===================================================================
--- branches/2.2/MgDev/Web/src/DotNetApi/Foundation/FoundationDotNetApi.vcproj 2010-06-26 13:52:40 UTC (rev 4974)
+++ branches/2.2/MgDev/Web/src/DotNetApi/Foundation/FoundationDotNetApi.vcproj 2010-06-26 13:55:58 UTC (rev 4975)
@@ -27,8 +27,8 @@
>
<Tool
Name="VCNMakeTool"
- BuildCommandLine="nmake -f FoundationMakefile OUTDIR="$(OutDir)" debug"
- ReBuildCommandLine="nmake -a -f FoundationMakefile OUTDIR="$(OutDir)" debug"
+ BuildCommandLine="nmake -f FoundationMakefile PLATFORM=x86 OUTDIR="$(OutDir)" debug"
+ ReBuildCommandLine="nmake -a -f FoundationMakefile PLATFORM=x86 OUTDIR="$(OutDir)" debug"
CleanCommandLine="nmake -f FoundationMakefile OUTDIR="$(OutDir)" cleandebug"
Output="$(OutDir)\FoundationDotNetApid.dll"
PreprocessorDefinitions=""
@@ -47,8 +47,8 @@
>
<Tool
Name="VCNMakeTool"
- BuildCommandLine="nmake -f FoundationMakefile OUTDIR="$(OutDir)" debug"
- ReBuildCommandLine="nmake -a -f FoundationMakefile OUTDIR="$(OutDir)" debug"
+ BuildCommandLine="nmake -f FoundationMakefile PLATFORM=x64 OUTDIR="$(OutDir)" debug"
+ ReBuildCommandLine="nmake -a -f FoundationMakefile PLATFORM=x64 OUTDIR="$(OutDir)" debug"
CleanCommandLine="nmake -f FoundationMakefile OUTDIR="$(OutDir)" cleandebug"
Output="$(OutDir)\FoundationDotNetApid.dll"
PreprocessorDefinitions=""
@@ -67,8 +67,8 @@
>
<Tool
Name="VCNMakeTool"
- BuildCommandLine="nmake -f FoundationMakefile OUTDIR="$(OutDir)" release"
- ReBuildCommandLine="nmake -a -f FoundationMakefile OUTDIR="$(OutDir)" release"
+ BuildCommandLine="nmake -f FoundationMakefile PLATFORM=x86 OUTDIR="$(OutDir)" release"
+ ReBuildCommandLine="nmake -a -f FoundationMakefile PLATFORM=x86 OUTDIR="$(OutDir)" release"
CleanCommandLine="nmake -f FoundationMakefile OUTDIR="$(OutDir)" cleanrelease"
Output="$(OutDir)\FoundationDotNetApi.dll"
PreprocessorDefinitions=""
@@ -87,8 +87,8 @@
>
<Tool
Name="VCNMakeTool"
- BuildCommandLine="nmake -f FoundationMakefile OUTDIR="$(OutDir)" release"
- ReBuildCommandLine="nmake -a -f FoundationMakefile OUTDIR="$(OutDir)" release"
+ BuildCommandLine="nmake -f FoundationMakefile PLATFORM=x64 OUTDIR="$(OutDir)" release"
+ ReBuildCommandLine="nmake -a -f FoundationMakefile PLATFORM=x64 OUTDIR="$(OutDir)" release"
CleanCommandLine="nmake -f FoundationMakefile OUTDIR="$(OutDir)" cleanrelease"
Output="$(OutDir)\FoundationDotNetApi.dll"
PreprocessorDefinitions=""
Modified: branches/2.2/MgDev/Web/src/DotNetApi/Foundation/FoundationMakefile
===================================================================
--- branches/2.2/MgDev/Web/src/DotNetApi/Foundation/FoundationMakefile 2010-06-26 13:52:40 UTC (rev 4974)
+++ branches/2.2/MgDev/Web/src/DotNetApi/Foundation/FoundationMakefile 2010-06-26 13:55:58 UTC (rev 4975)
@@ -20,8 +20,8 @@
release: $(OUTDIR)\OSGeo.MapGuide.Foundation.dll
$(OUTDIR)\OSGeo.MapGuide.Foundation.Temp.dll:
- csc.exe /debug+ /debug:full /optimize- /out:$(OUTDIR)\OSGeo.MapGuide.Foundation.dll /target:library .\*.cs
+ csc.exe /debug+ /debug:full /optimize- /out:$(OUTDIR)\OSGeo.MapGuide.Foundation.dll /platform:$(PLATFORM) /target:library .\*.cs
copy /y $(OUTDIR)\OSGeo.MapGuide.Foundation.dll $(OUTDIR)\OSGeo.MapGuide.Foundation.Temp.dll
$(OUTDIR)\OSGeo.MapGuide.Foundation.dll:
- csc.exe /debug+ /debug:pdbonly /optimize+ /out:$(OUTDIR)\OSGeo.MapGuide.Foundation.dll /target:library .\*.cs
+ csc.exe /debug+ /debug:pdbonly /optimize+ /out:$(OUTDIR)\OSGeo.MapGuide.Foundation.dll /platform:$(PLATFORM) /target:library .\*.cs
Modified: branches/2.2/MgDev/Web/src/DotNetApi/Geometry/GeometryDotNetApi.vcproj
===================================================================
--- branches/2.2/MgDev/Web/src/DotNetApi/Geometry/GeometryDotNetApi.vcproj 2010-06-26 13:52:40 UTC (rev 4974)
+++ branches/2.2/MgDev/Web/src/DotNetApi/Geometry/GeometryDotNetApi.vcproj 2010-06-26 13:55:58 UTC (rev 4975)
@@ -27,8 +27,8 @@
>
<Tool
Name="VCNMakeTool"
- BuildCommandLine="nmake -f GeometryMakefile OUTDIR="$(OutDir)" debug"
- ReBuildCommandLine="nmake -a -f GeometryMakefile OUTDIR="$(OutDir)" debug"
+ BuildCommandLine="nmake -f GeometryMakefile PLATFORM=x86 OUTDIR="$(OutDir)" debug"
+ ReBuildCommandLine="nmake -a -f GeometryMakefile PLATFORM=x86 OUTDIR="$(OutDir)" debug"
CleanCommandLine="nmake -f GeometryMakefile OUTDIR="$(OutDir)" cleandebug"
Output="$(OutDir)\GeometryDotNetApid.dll"
PreprocessorDefinitions=""
@@ -47,8 +47,8 @@
>
<Tool
Name="VCNMakeTool"
- BuildCommandLine="nmake -f GeometryMakefile OUTDIR="$(OutDir)" debug"
- ReBuildCommandLine="nmake -a -f GeometryMakefile OUTDIR="$(OutDir)" debug"
+ BuildCommandLine="nmake -f GeometryMakefile PLATFORM=x64 OUTDIR="$(OutDir)" debug"
+ ReBuildCommandLine="nmake -a -f GeometryMakefile PLATFORM=x64 OUTDIR="$(OutDir)" debug"
CleanCommandLine="nmake -f GeometryMakefile OUTDIR="$(OutDir)" cleandebug"
Output="$(OutDir)\GeometryDotNetApid.dll"
PreprocessorDefinitions=""
@@ -67,8 +67,8 @@
>
<Tool
Name="VCNMakeTool"
- BuildCommandLine="nmake -f GeometryMakefile OUTDIR="$(OutDir)" release"
- ReBuildCommandLine="nmake -a -f GeometryMakefile OUTDIR="$(OutDir)" release"
+ BuildCommandLine="nmake -f GeometryMakefile PLATFORM=x86 OUTDIR="$(OutDir)" release"
+ ReBuildCommandLine="nmake -a -f GeometryMakefile PLATFORM=x86 OUTDIR="$(OutDir)" release"
CleanCommandLine="nmake -f GeometryMakefile OUTDIR="$(OutDir)" cleanrelease"
Output="$(OutDir)\GeometryDotNetApi.dll"
PreprocessorDefinitions=""
@@ -87,8 +87,8 @@
>
<Tool
Name="VCNMakeTool"
- BuildCommandLine="nmake -f GeometryMakefile OUTDIR="$(OutDir)" release"
- ReBuildCommandLine="nmake -a -f GeometryMakefile OUTDIR="$(OutDir)" release"
+ BuildCommandLine="nmake -f GeometryMakefile PLATFORM=x64 OUTDIR="$(OutDir)" release"
+ ReBuildCommandLine="nmake -a -f GeometryMakefile PLATFORM=x64 OUTDIR="$(OutDir)" release"
CleanCommandLine="nmake -f GeometryMakefile OUTDIR="$(OutDir)" cleanrelease"
Output="$(OutDir)\GeometryDotNetApi.dll"
PreprocessorDefinitions=""
Modified: branches/2.2/MgDev/Web/src/DotNetApi/Geometry/GeometryMakefile
===================================================================
--- branches/2.2/MgDev/Web/src/DotNetApi/Geometry/GeometryMakefile 2010-06-26 13:52:40 UTC (rev 4974)
+++ branches/2.2/MgDev/Web/src/DotNetApi/Geometry/GeometryMakefile 2010-06-26 13:55:58 UTC (rev 4975)
@@ -20,8 +20,8 @@
release: $(OUTDIR)\OSGeo.MapGuide.Geometry.dll
$(OUTDIR)\OSGeo.MapGuide.Geometry.Temp.dll:
- csc.exe /debug+ /debug:full /optimize- /out:$(OUTDIR)\OSGeo.MapGuide.Geometry.dll /reference:$(OUTDIR)\OSGeo.MapGuide.Foundation.dll /target:library .\*.cs
+ csc.exe /debug+ /debug:full /optimize- /out:$(OUTDIR)\OSGeo.MapGuide.Geometry.dll /platform:$(PLATFORM) /reference:$(OUTDIR)\OSGeo.MapGuide.Foundation.dll /target:library .\*.cs
copy /y $(OUTDIR)\OSGeo.MapGuide.Geometry.dll $(OUTDIR)\OSGeo.MapGuide.Geometry.Temp.dll
$(OUTDIR)\OSGeo.MapGuide.Geometry.dll:
- csc.exe /debug+ /debug:pdbonly /optimize+ /out:$(OUTDIR)\OSGeo.MapGuide.Geometry.dll /reference:$(OUTDIR)\OSGeo.MapGuide.Foundation.dll /target:library .\*.cs
+ csc.exe /debug+ /debug:pdbonly /optimize+ /out:$(OUTDIR)\OSGeo.MapGuide.Geometry.dll /platform:$(PLATFORM) /reference:$(OUTDIR)\OSGeo.MapGuide.Foundation.dll /target:library .\*.cs
Modified: branches/2.2/MgDev/Web/src/DotNetApi/Makefile
===================================================================
--- branches/2.2/MgDev/Web/src/DotNetApi/Makefile 2010-06-26 13:52:40 UTC (rev 4974)
+++ branches/2.2/MgDev/Web/src/DotNetApi/Makefile 2010-06-26 13:55:58 UTC (rev 4975)
@@ -11,7 +11,7 @@
release: $(OUTDIR)\MapGuideDotNetApi.dll
$(OUTDIR)\MapGuideDotNetApid.dll:
- csc.exe /debug+ /debug:full /optimize- /out:$(OUTDIR)\MapGuideDotNetApid.dll /target:library /reference:$(OUTDIR)\OSGeo.MapGuide.Foundation.dll;$(OUTDIR)\OSGeo.MapGuide.Geometry.dll;$(OUTDIR)\OSGeo.MapGuide.PlatformBase.dll;$(OUTDIR)\OSGeo.MapGuide.MapGuideCommon.dll;$(OUTDIR)\OSGeo.MapGuide.Web.dll .\AssemblyInfo.cs
+ csc.exe /debug+ /debug:full /optimize- /out:$(OUTDIR)\MapGuideDotNetApid.dll /platform:$(PLATFORM) /target:library /lib:$(OUTDIR) /reference:OSGeo.MapGuide.Foundation.dll;OSGeo.MapGuide.Geometry.dll;OSGeo.MapGuide.PlatformBase.dll;OSGeo.MapGuide.MapGuideCommon.dll;OSGeo.MapGuide.Web.dll .\AssemblyInfo.cs
$(OUTDIR)\MapGuideDotNetApi.dll:
- csc.exe /debug+ /debug:pdbonly /optimize+ /out:$(OUTDIR)\MapGuideDotNetApi.dll /target:library /reference:$(OUTDIR)\OSGeo.MapGuide.Foundation.dll;$(OUTDIR)\OSGeo.MapGuide.Geometry.dll;$(OUTDIR)\OSGeo.MapGuide.PlatformBase.dll;$(OUTDIR)\OSGeo.MapGuide.MapGuideCommon.dll;$(OUTDIR)\OSGeo.MapGuide.Web.dll .\AssemblyInfo.cs
+ csc.exe /debug+ /debug:pdbonly /optimize+ /out:$(OUTDIR)\MapGuideDotNetApi.dll /platform:$(PLATFORM) /target:library /lib:$(OUTDIR) /reference:OSGeo.MapGuide.Foundation.dll;OSGeo.MapGuide.Geometry.dll;OSGeo.MapGuide.PlatformBase.dll;OSGeo.MapGuide.MapGuideCommon.dll;OSGeo.MapGuide.Web.dll .\AssemblyInfo.cs
Modified: branches/2.2/MgDev/Web/src/DotNetApi/MapGuideCommon/MapGuideCommonDotNetApi.vcproj
===================================================================
--- branches/2.2/MgDev/Web/src/DotNetApi/MapGuideCommon/MapGuideCommonDotNetApi.vcproj 2010-06-26 13:52:40 UTC (rev 4974)
+++ branches/2.2/MgDev/Web/src/DotNetApi/MapGuideCommon/MapGuideCommonDotNetApi.vcproj 2010-06-26 13:55:58 UTC (rev 4975)
@@ -27,8 +27,8 @@
>
<Tool
Name="VCNMakeTool"
- BuildCommandLine="nmake -f MapGuideCommonMakefile OUTDIR="$(OutDir)" debug"
- ReBuildCommandLine="nmake -a -f MapGuideCommonMakefile OUTDIR="$(OutDir)" debug"
+ BuildCommandLine="nmake -f MapGuideCommonMakefile PLATFORM=x86 OUTDIR="$(OutDir)" debug"
+ ReBuildCommandLine="nmake -a -f MapGuideCommonMakefile PLATFORM=x86 OUTDIR="$(OutDir)" debug"
CleanCommandLine="nmake -f MapGuideCommonMakefile OUTDIR="$(OutDir)" cleandebug"
Output="$(OutDir)\MapGuideCommonDotNetApid.dll"
PreprocessorDefinitions=""
@@ -47,8 +47,8 @@
>
<Tool
Name="VCNMakeTool"
- BuildCommandLine="nmake -f MapGuideCommonMakefile OUTDIR="$(OutDir)" debug"
- ReBuildCommandLine="nmake -a -f MapGuideCommonMakefile OUTDIR="$(OutDir)" debug"
+ BuildCommandLine="nmake -f MapGuideCommonMakefile PLATFORM=x64 OUTDIR="$(OutDir)" debug"
+ ReBuildCommandLine="nmake -a -f MapGuideCommonMakefile PLATFORM=x64 OUTDIR="$(OutDir)" debug"
CleanCommandLine="nmake -f MapGuideCommonMakefile OUTDIR="$(OutDir)" cleandebug"
Output="$(OutDir)\MapGuideCommonDotNetApid.dll"
PreprocessorDefinitions=""
@@ -67,8 +67,8 @@
>
<Tool
Name="VCNMakeTool"
- BuildCommandLine="nmake -f MapGuideCommonMakefile OUTDIR="$(OutDir)" release"
- ReBuildCommandLine="nmake -a -f MapGuideCommonMakefile OUTDIR="$(OutDir)" release"
+ BuildCommandLine="nmake -f MapGuideCommonMakefile PLATFORM=x86 OUTDIR="$(OutDir)" release"
+ ReBuildCommandLine="nmake -a -f MapGuideCommonMakefile PLATFORM=x86 OUTDIR="$(OutDir)" release"
CleanCommandLine="nmake -f MapGuideCommonMakefile OUTDIR="$(OutDir)" cleanrelease"
Output="$(OutDir)\MapGuideCommonDotNetApi.dll"
PreprocessorDefinitions=""
@@ -87,8 +87,8 @@
>
<Tool
Name="VCNMakeTool"
- BuildCommandLine="nmake -f MapGuideCommonMakefile OUTDIR="$(OutDir)" release"
- ReBuildCommandLine="nmake -a -f MapGuideCommonMakefile OUTDIR="$(OutDir)" release"
+ BuildCommandLine="nmake -f MapGuideCommonMakefile PLATFORM=x64 OUTDIR="$(OutDir)" release"
+ ReBuildCommandLine="nmake -a -f MapGuideCommonMakefile PLATFORM=x64 OUTDIR="$(OutDir)" release"
CleanCommandLine="nmake -f MapGuideCommonMakefile OUTDIR="$(OutDir)" cleanrelease"
Output="$(OutDir)\MapGuideCommonDotNetApi.dll"
PreprocessorDefinitions=""
Modified: branches/2.2/MgDev/Web/src/DotNetApi/MapGuideCommon/MapGuideCommonMakefile
===================================================================
--- branches/2.2/MgDev/Web/src/DotNetApi/MapGuideCommon/MapGuideCommonMakefile 2010-06-26 13:52:40 UTC (rev 4974)
+++ branches/2.2/MgDev/Web/src/DotNetApi/MapGuideCommon/MapGuideCommonMakefile 2010-06-26 13:55:58 UTC (rev 4975)
@@ -20,8 +20,8 @@
release: $(OUTDIR)\OSGeo.MapGuide.MapGuideCommon.dll
$(OUTDIR)\OSGeo.MapGuide.MapGuideCommon.Temp.dll:
- csc.exe /debug+ /debug:full /optimize- /out:$(OUTDIR)\OSGeo.MapGuide.MapGuideCommon.dll /target:library /reference:$(OUTDIR)\OSGeo.MapGuide.Foundation.dll;$(OUTDIR)\OSGeo.MapGuide.Geometry.dll;$(OUTDIR)\OSGeo.MapGuide.PlatformBase.dll .\*.cs
+ csc.exe /debug+ /debug:full /optimize- /out:$(OUTDIR)\OSGeo.MapGuide.MapGuideCommon.dll /platform:$(PLATFORM) /target:library /reference:$(OUTDIR)\OSGeo.MapGuide.Foundation.dll;$(OUTDIR)\OSGeo.MapGuide.Geometry.dll;$(OUTDIR)\OSGeo.MapGuide.PlatformBase.dll .\*.cs
copy /y $(OUTDIR)\OSGeo.MapGuide.MapGuideCommon.dll $(OUTDIR)\OSGeo.MapGuide.MapGuideCommon.Temp.dll
$(OUTDIR)\OSGeo.MapGuide.MapGuideCommon.dll:
- csc.exe /debug+ /debug:pdbonly /optimize+ /out:$(OUTDIR)\OSGeo.MapGuide.MapGuideCommon.dll /target:library /reference:$(OUTDIR)\OSGeo.MapGuide.Foundation.dll;$(OUTDIR)\OSGeo.MapGuide.Geometry.dll;$(OUTDIR)\OSGeo.MapGuide.PlatformBase.dll .\*.cs
+ csc.exe /debug+ /debug:pdbonly /optimize+ /out:$(OUTDIR)\OSGeo.MapGuide.MapGuideCommon.dll /target:library /platform:$(PLATFORM) /reference:$(OUTDIR)\OSGeo.MapGuide.Foundation.dll;$(OUTDIR)\OSGeo.MapGuide.Geometry.dll;$(OUTDIR)\OSGeo.MapGuide.PlatformBase.dll .\*.cs
Modified: branches/2.2/MgDev/Web/src/DotNetApi/PlatformBase/PlatformBaseDotNetApi.vcproj
===================================================================
--- branches/2.2/MgDev/Web/src/DotNetApi/PlatformBase/PlatformBaseDotNetApi.vcproj 2010-06-26 13:52:40 UTC (rev 4974)
+++ branches/2.2/MgDev/Web/src/DotNetApi/PlatformBase/PlatformBaseDotNetApi.vcproj 2010-06-26 13:55:58 UTC (rev 4975)
@@ -27,8 +27,8 @@
>
<Tool
Name="VCNMakeTool"
- BuildCommandLine="nmake -f PlatformBaseMakefile OUTDIR="$(OutDir)" debug"
- ReBuildCommandLine="nmake -a -f PlatformBaseMakefile OUTDIR="$(OutDir)" debug"
+ BuildCommandLine="nmake -f PlatformBaseMakefile PLATFORM=x86 OUTDIR="$(OutDir)" debug"
+ ReBuildCommandLine="nmake -a -f PlatformBaseMakefile PLATFORM=x86 OUTDIR="$(OutDir)" debug"
CleanCommandLine="nmake -f PlatformBaseMakefile OUTDIR="$(OutDir)" cleandebug"
Output="$(OutDir)\PlatformBaseDotNetApid.dll"
PreprocessorDefinitions=""
@@ -47,8 +47,8 @@
>
<Tool
Name="VCNMakeTool"
- BuildCommandLine="nmake -f PlatformBaseMakefile OUTDIR="$(OutDir)" debug"
- ReBuildCommandLine="nmake -a -f PlatformBaseMakefile OUTDIR="$(OutDir)" debug"
+ BuildCommandLine="nmake -f PlatformBaseMakefile PLATFORM=x64 OUTDIR="$(OutDir)" debug"
+ ReBuildCommandLine="nmake -a -f PlatformBaseMakefile PLATFORM=x64 OUTDIR="$(OutDir)" debug"
CleanCommandLine="nmake -f PlatformBaseMakefile OUTDIR="$(OutDir)" cleandebug"
Output="$(OutDir)\PlatformBaseDotNetApid.dll"
PreprocessorDefinitions=""
@@ -67,8 +67,8 @@
>
<Tool
Name="VCNMakeTool"
- BuildCommandLine="nmake -f PlatformBaseMakefile OUTDIR="$(OutDir)" release"
- ReBuildCommandLine="nmake -a -f PlatformBaseMakefile OUTDIR="$(OutDir)" release"
+ BuildCommandLine="nmake -f PlatformBaseMakefile PLATFORM=x86 OUTDIR="$(OutDir)" release"
+ ReBuildCommandLine="nmake -a -f PlatformBaseMakefile PLATFORM=x86 OUTDIR="$(OutDir)" release"
CleanCommandLine="nmake -f PlatformBaseMakefile OUTDIR="$(OutDir)" cleanrelease"
Output="$(OutDir)\PlatformBaseDotNetApi.dll"
PreprocessorDefinitions=""
@@ -87,8 +87,8 @@
>
<Tool
Name="VCNMakeTool"
- BuildCommandLine="nmake -f PlatformBaseMakefile OUTDIR="$(OutDir)" release"
- ReBuildCommandLine="nmake -a -f PlatformBaseMakefile OUTDIR="$(OutDir)" release"
+ BuildCommandLine="nmake -f PlatformBaseMakefile PLATFORM=x64 OUTDIR="$(OutDir)" release"
+ ReBuildCommandLine="nmake -a -f PlatformBaseMakefile PLATFORM=x64 OUTDIR="$(OutDir)" release"
CleanCommandLine="nmake -f PlatformBaseMakefile OUTDIR="$(OutDir)" cleanrelease"
Output="$(OutDir)\PlatformBaseDotNetApi.dll"
PreprocessorDefinitions=""
Modified: branches/2.2/MgDev/Web/src/DotNetApi/PlatformBase/PlatformBaseMakefile
===================================================================
--- branches/2.2/MgDev/Web/src/DotNetApi/PlatformBase/PlatformBaseMakefile 2010-06-26 13:52:40 UTC (rev 4974)
+++ branches/2.2/MgDev/Web/src/DotNetApi/PlatformBase/PlatformBaseMakefile 2010-06-26 13:55:58 UTC (rev 4975)
@@ -20,8 +20,8 @@
release: $(OUTDIR)\OSGeo.MapGuide.PlatformBase.dll
$(OUTDIR)\OSGeo.MapGuide.PlatformBase.Temp.dll:
- csc.exe /debug+ /debug:full /optimize- /out:$(OUTDIR)\OSGeo.MapGuide.PlatformBase.dll /target:library /reference:$(OUTDIR)\OSGeo.MapGuide.Foundation.dll;$(OUTDIR)\OSGeo.MapGuide.Geometry.dll .\*.cs
+ csc.exe /debug+ /debug:full /optimize- /out:$(OUTDIR)\OSGeo.MapGuide.PlatformBase.dll /platform:$(PLATFORM) /target:library /reference:$(OUTDIR)\OSGeo.MapGuide.Foundation.dll;$(OUTDIR)\OSGeo.MapGuide.Geometry.dll .\*.cs
copy /y $(OUTDIR)\OSGeo.MapGuide.PlatformBase.dll $(OUTDIR)\OSGeo.MapGuide.PlatformBase.Temp.dll
$(OUTDIR)\OSGeo.MapGuide.PlatformBase.dll:
- csc.exe /debug+ /debug:pdbonly /optimize+ /out:$(OUTDIR)\OSGeo.MapGuide.PlatformBase.dll /target:library /reference:$(OUTDIR)\OSGeo.MapGuide.Foundation.dll;$(OUTDIR)\OSGeo.MapGuide.Geometry.dll .\*.cs
+ csc.exe /debug+ /debug:pdbonly /optimize+ /out:$(OUTDIR)\OSGeo.MapGuide.PlatformBase.dll /platform:$(PLATFORM) /target:library /reference:$(OUTDIR)\OSGeo.MapGuide.Foundation.dll;$(OUTDIR)\OSGeo.MapGuide.Geometry.dll .\*.cs
Modified: branches/2.2/MgDev/Web/src/DotNetApi/Web/WebDotNetApi.vcproj
===================================================================
--- branches/2.2/MgDev/Web/src/DotNetApi/Web/WebDotNetApi.vcproj 2010-06-26 13:52:40 UTC (rev 4974)
+++ branches/2.2/MgDev/Web/src/DotNetApi/Web/WebDotNetApi.vcproj 2010-06-26 13:55:58 UTC (rev 4975)
@@ -27,8 +27,8 @@
>
<Tool
Name="VCNMakeTool"
- BuildCommandLine="nmake -f WebMakefile OUTDIR="$(OutDir)" debug"
- ReBuildCommandLine="nmake -a -f WebMakefile OUTDIR="$(OutDir)" debug"
+ BuildCommandLine="nmake -f WebMakefile PLATFORM=x86 OUTDIR="$(OutDir)" debug"
+ ReBuildCommandLine="nmake -a -f WebMakefile PLATFORM=x86 OUTDIR="$(OutDir)" debug"
CleanCommandLine="nmake -f WebMakefile OUTDIR="$(OutDir)" cleandebug"
Output="$(OutDir)\WebDotNetApid.dll"
PreprocessorDefinitions=""
@@ -47,8 +47,8 @@
>
<Tool
Name="VCNMakeTool"
- BuildCommandLine="nmake -f WebMakefile OUTDIR="$(OutDir)" debug"
- ReBuildCommandLine="nmake -a -f WebMakefile OUTDIR="$(OutDir)" debug"
+ BuildCommandLine="nmake -f WebMakefile PLATFORM=x64 OUTDIR="$(OutDir)" debug"
+ ReBuildCommandLine="nmake -a -f WebMakefile PLATFORM=x64 OUTDIR="$(OutDir)" debug"
CleanCommandLine="nmake -f WebMakefile OUTDIR="$(OutDir)" cleandebug"
Output="$(OutDir)\WebDotNetApid.dll"
PreprocessorDefinitions=""
@@ -67,8 +67,8 @@
>
<Tool
Name="VCNMakeTool"
- BuildCommandLine="nmake -f WebMakefile OUTDIR="$(OutDir)" release"
- ReBuildCommandLine="nmake -a -f WebMakefile OUTDIR="$(OutDir)" release"
+ BuildCommandLine="nmake -f WebMakefile PLATFORM=x86 OUTDIR="$(OutDir)" release"
+ ReBuildCommandLine="nmake -a -f WebMakefile PLATFORM=x86 OUTDIR="$(OutDir)" release"
CleanCommandLine="nmake -f WebMakefile OUTDIR="$(OutDir)" cleanrelease"
Output="$(OutDir)\WebDotNetApi.dll"
PreprocessorDefinitions=""
@@ -87,8 +87,8 @@
>
<Tool
Name="VCNMakeTool"
- BuildCommandLine="nmake -f WebMakefile OUTDIR="$(OutDir)" release"
- ReBuildCommandLine="nmake -a -f WebMakefile OUTDIR="$(OutDir)" release"
+ BuildCommandLine="nmake -f WebMakefile PLATFORM=x64 OUTDIR="$(OutDir)" release"
+ ReBuildCommandLine="nmake -a -f WebMakefile PLATFORM=x64 OUTDIR="$(OutDir)" release"
CleanCommandLine="nmake -f WebMakefile OUTDIR="$(OutDir)" cleanrelease"
Output="$(OutDir)\WebDotNetApi.dll"
PreprocessorDefinitions=""
Modified: branches/2.2/MgDev/Web/src/DotNetApi/Web/WebMakefile
===================================================================
--- branches/2.2/MgDev/Web/src/DotNetApi/Web/WebMakefile 2010-06-26 13:52:40 UTC (rev 4974)
+++ branches/2.2/MgDev/Web/src/DotNetApi/Web/WebMakefile 2010-06-26 13:55:58 UTC (rev 4975)
@@ -20,8 +20,8 @@
release: $(OUTDIR)\OSGeo.MapGuide.Web.dll
$(OUTDIR)\OSGeo.MapGuide.Web.Temp.dll:
- csc.exe /debug+ /debug:full /optimize- /out:$(OUTDIR)\OSGeo.MapGuide.Web.dll /target:library /reference:$(OUTDIR)\OSGeo.MapGuide.Foundation.dll;$(OUTDIR)\OSGeo.MapGuide.Geometry.dll;$(OUTDIR)\OSGeo.MapGuide.PlatformBase.dll;$(OUTDIR)\OSGeo.MapGuide.MapGuideCommon.dll .\*.cs
+ csc.exe /debug+ /debug:full /optimize- /out:$(OUTDIR)\OSGeo.MapGuide.Web.dll /platform:$(PLATFORM) /target:library /reference:$(OUTDIR)\OSGeo.MapGuide.Foundation.dll;$(OUTDIR)\OSGeo.MapGuide.Geometry.dll;$(OUTDIR)\OSGeo.MapGuide.PlatformBase.dll;$(OUTDIR)\OSGeo.MapGuide.MapGuideCommon.dll .\*.cs
copy /y $(OUTDIR)\OSGeo.MapGuide.Web.dll $(OUTDIR)\OSGeo.MapGuide.Web.Temp.dll
$(OUTDIR)\OSGeo.MapGuide.Web.dll:
- csc.exe /debug+ /debug:pdbonly /optimize+ /out:$(OUTDIR)\OSGeo.MapGuide.Web.dll /target:library /reference:$(OUTDIR)\OSGeo.MapGuide.Foundation.dll;$(OUTDIR)\OSGeo.MapGuide.Geometry.dll;$(OUTDIR)\OSGeo.MapGuide.PlatformBase.dll;$(OUTDIR)\OSGeo.MapGuide.MapGuideCommon.dll .\*.cs
+ csc.exe /debug+ /debug:pdbonly /optimize+ /out:$(OUTDIR)\OSGeo.MapGuide.Web.dll /platform:$(PLATFORM) /target:library /reference:$(OUTDIR)\OSGeo.MapGuide.Foundation.dll;$(OUTDIR)\OSGeo.MapGuide.Geometry.dll;$(OUTDIR)\OSGeo.MapGuide.PlatformBase.dll;$(OUTDIR)\OSGeo.MapGuide.MapGuideCommon.dll .\*.cs
More information about the mapguide-commits
mailing list