[mapguide-commits] r6458 - in trunk/MgDev/Desktop: .
DesktopUnmanagedApi/DotNet UnitTest
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Fri Jan 27 07:49:55 EST 2012
Author: jng
Date: 2012-01-27 04:49:55 -0800 (Fri, 27 Jan 2012)
New Revision: 6458
Modified:
trunk/MgDev/Desktop/DesktopUnmanagedApi/DotNet/DesktopDotNetApi.vcxproj
trunk/MgDev/Desktop/MgDesktopDotNet_VS2010.sln
trunk/MgDev/Desktop/UnitTest/UnitTest.vcxproj
Log:
#1927: Fix VS2010 projects for x64
Modified: trunk/MgDev/Desktop/DesktopUnmanagedApi/DotNet/DesktopDotNetApi.vcxproj
===================================================================
--- trunk/MgDev/Desktop/DesktopUnmanagedApi/DotNet/DesktopDotNetApi.vcxproj 2012-01-27 12:06:46 UTC (rev 6457)
+++ trunk/MgDev/Desktop/DesktopUnmanagedApi/DotNet/DesktopDotNetApi.vcxproj 2012-01-27 12:49:55 UTC (rev 6458)
@@ -67,31 +67,31 @@
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <NMakeBuildCommandLine>nmake -f MapGuideDesktopMakefile SIGNER=SignApi40.bat PLATFORM=x86 OUTDIR="$(OutDir)" debug</NMakeBuildCommandLine>
+ <NMakeBuildCommandLine>nmake -f MapGuideDesktopMakefile SIGNER=SignApi40.bat PLATFORM=x86 OUTDIR="$(OutDir)" WEB_BIN_DIR="$(SolutionDir)..\Web\bin\debug" debug</NMakeBuildCommandLine>
<NMakeOutput>OSGeo.MapGuide.Desktop.Temp.dll</NMakeOutput>
- <NMakeCleanCommandLine>nmake -a -f MapGuideDesktopMakefile SIGNER=SignApi40.bat PLATFORM=x86 OUTDIR="$(OutDir)" debug</NMakeCleanCommandLine>
- <NMakeReBuildCommandLine>nmake -f MapGuideDesktopMakefile SIGNER=SignApi40.bat OUTDIR="$(OutDir)" cleandebug</NMakeReBuildCommandLine>
+ <NMakeCleanCommandLine>nmake -f MapGuideDesktopMakefile SIGNER=SignApi40.bat OUTDIR="$(OutDir)" cleandebug</NMakeCleanCommandLine>
+ <NMakeReBuildCommandLine>nmake -a -f MapGuideDesktopMakefile SIGNER=SignApi40.bat PLATFORM=x86 OUTDIR="$(OutDir)" WEB_BIN_DIR="$(SolutionDir)..\Web\bin\debug" debug</NMakeReBuildCommandLine>
<NMakePreprocessorDefinitions>WIN32;_DEBUG;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
- <NMakeBuildCommandLine>nmake -f MapGuideDesktopMakefile SIGNER=SignApi40.bat PLATFORM=x64 OUTDIR="$(OutDir)" debug</NMakeBuildCommandLine>
+ <NMakeBuildCommandLine>nmake -f MapGuideDesktopMakefile SIGNER=SignApi40.bat PLATFORM=x64 OUTDIR="$(OutDir)" WEB_BIN_DIR="$(SolutionDir)..\Web\bin\debug64" debug</NMakeBuildCommandLine>
<NMakeOutput>OSGeo.MapGuide.Desktop.Temp.dll</NMakeOutput>
- <NMakeCleanCommandLine>nmake -a -f MapGuideDesktopMakefile SIGNER=SignApi40.bat PLATFORM=x64 OUTDIR="$(OutDir)" debug</NMakeCleanCommandLine>
- <NMakeReBuildCommandLine>nmake -f MapGuideDesktopMakefile SIGNER=SignApi40.bat OUTDIR="$(OutDir)" cleandebug</NMakeReBuildCommandLine>
+ <NMakeCleanCommandLine>nmake -f MapGuideDesktopMakefile SIGNER=SignApi40.bat OUTDIR="$(OutDir)" cleandebug</NMakeCleanCommandLine>
+ <NMakeReBuildCommandLine>nmake -a -f MapGuideDesktopMakefile SIGNER=SignApi40.bat PLATFORM=x64 OUTDIR="$(OutDir)" WEB_BIN_DIR="$(SolutionDir)..\Web\bin\debug64" debug</NMakeReBuildCommandLine>
<NMakePreprocessorDefinitions>WIN32;_DEBUG;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<NMakeBuildCommandLine>nmake -f MapGuideDesktopMakefile SIGNER=SignApi40.bat PLATFORM=x86 ASSEMBLY_DIR="$(OutDir)\..\Assemblies" OUTDIR="$(OutDir)" WEB_BIN_DIR="$(SolutionDir)..\Web\bin\release" release</NMakeBuildCommandLine>
<NMakeOutput>OSGeo.MapGuide.Desktop.dll</NMakeOutput>
- <NMakeCleanCommandLine>nmake -a -f MapGuideDesktopMakefile SIGNER=SignApi40.bat PLATFORM=x86 ASSEMBLY_DIR="$(OutDir)\..\Assemblies" OUTDIR="$(OutDir)" WEB_BIN_DIR="$(SolutionDir)..\Web\bin\release" release</NMakeCleanCommandLine>
- <NMakeReBuildCommandLine>nmake -f MapGuideDesktopMakefile SIGNER=SignApi40.bat OUTDIR="$(OutDir)" ASSEMBLY_DIR="$(OutDir)\..\Assemblies" cleanrelease</NMakeReBuildCommandLine>
+ <NMakeCleanCommandLine>nmake -f MapGuideDesktopMakefile SIGNER=SignApi40.bat OUTDIR="$(OutDir)" ASSEMBLY_DIR="$(OutDir)\..\Assemblies" cleanrelease</NMakeCleanCommandLine>
+ <NMakeReBuildCommandLine>nmake -a -f MapGuideDesktopMakefile SIGNER=SignApi40.bat PLATFORM=x86 ASSEMBLY_DIR="$(OutDir)\..\Assemblies" OUTDIR="$(OutDir)" WEB_BIN_DIR="$(SolutionDir)..\Web\bin\release" release</NMakeReBuildCommandLine>
<NMakePreprocessorDefinitions>WIN32;NDEBUG;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
- <NMakeBuildCommandLine>nmake -f MapGuideDesktopMakefile SIGNER=SignApi40.bat PLATFORM=x64 ASSEMBLY_DIR="$(OutDir)\..\Assemblies" OUTDIR="$(OutDir)" WEB_BIN_DIR="$(SolutionDir)..\Web\bin\release" release</NMakeBuildCommandLine>
+ <NMakeBuildCommandLine>nmake -f MapGuideDesktopMakefile SIGNER=SignApi40.bat PLATFORM=x64 ASSEMBLY_DIR="$(OutDir)\..\Assemblies" OUTDIR="$(OutDir)" WEB_BIN_DIR="$(SolutionDir)..\Web\bin\release64" release</NMakeBuildCommandLine>
<NMakeOutput>OSGeo.MapGuide.Desktop.dll</NMakeOutput>
- <NMakeCleanCommandLine>nmake -a -f MapGuideDesktopMakefile SIGNER=SignApi40.bat PLATFORM=x64 ASSEMBLY_DIR="$(OutDir)\..\Assemblies" OUTDIR="$(OutDir)" WEB_BIN_DIR="$(SolutionDir)..\Web\bin\release" release</NMakeCleanCommandLine>
- <NMakeReBuildCommandLine>nmake -f MapGuideDesktopMakefile SIGNER=SignApi40.bat OUTDIR="$(OutDir)" ASSEMBLY_DIR="$(OutDir)\..\Assemblies" cleanrelease</NMakeReBuildCommandLine>
+ <NMakeCleanCommandLine>nmake -f MapGuideDesktopMakefile SIGNER=SignApi40.bat PLATFORM=x64 ASSEMBLY_DIR="$(OutDir)\..\Assemblies" OUTDIR="$(OutDir)" cleanrelease</NMakeCleanCommandLine>
+ <NMakeReBuildCommandLine>nmake -a -f MapGuideDesktopMakefile SIGNER=SignApi40.bat PLATFORM=x64 ASSEMBLY_DIR="$(OutDir)\..\Assemblies" OUTDIR="$(OutDir)" WEB_BIN_DIR="$(SolutionDir)..\Web\bin\release64" release</NMakeReBuildCommandLine>
<NMakePreprocessorDefinitions>WIN32;NDEBUG;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>
</PropertyGroup>
<ItemDefinitionGroup>
Modified: trunk/MgDev/Desktop/MgDesktopDotNet_VS2010.sln
===================================================================
--- trunk/MgDev/Desktop/MgDesktopDotNet_VS2010.sln 2012-01-27 12:06:46 UTC (rev 6457)
+++ trunk/MgDev/Desktop/MgDesktopDotNet_VS2010.sln 2012-01-27 12:49:55 UTC (rev 6458)
@@ -13,64 +13,48 @@
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Debug|Any CPU = Debug|Any CPU
Debug|x64 = Debug|x64
Debug|x86 = Debug|x86
- Release|Any CPU = Release|Any CPU
Release|x64 = Release|x64
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {A5881D59-BD24-4A3A-A707-F18A25724D29}.Debug|Any CPU.ActiveCfg = Debug|x64
{A5881D59-BD24-4A3A-A707-F18A25724D29}.Debug|x64.ActiveCfg = Debug|x64
{A5881D59-BD24-4A3A-A707-F18A25724D29}.Debug|x64.Build.0 = Debug|x64
{A5881D59-BD24-4A3A-A707-F18A25724D29}.Debug|x86.ActiveCfg = Debug|x86
{A5881D59-BD24-4A3A-A707-F18A25724D29}.Debug|x86.Build.0 = Debug|x86
- {A5881D59-BD24-4A3A-A707-F18A25724D29}.Release|Any CPU.ActiveCfg = Release|x64
{A5881D59-BD24-4A3A-A707-F18A25724D29}.Release|x64.ActiveCfg = Release|x64
{A5881D59-BD24-4A3A-A707-F18A25724D29}.Release|x64.Build.0 = Release|x64
{A5881D59-BD24-4A3A-A707-F18A25724D29}.Release|x86.ActiveCfg = Release|x86
{A5881D59-BD24-4A3A-A707-F18A25724D29}.Release|x86.Build.0 = Release|x86
- {FDA196F0-3C55-4360-B207-BA5EF6D746F8}.Debug|Any CPU.ActiveCfg = Debug|x64
{FDA196F0-3C55-4360-B207-BA5EF6D746F8}.Debug|x64.ActiveCfg = Debug|x64
{FDA196F0-3C55-4360-B207-BA5EF6D746F8}.Debug|x64.Build.0 = Debug|x64
{FDA196F0-3C55-4360-B207-BA5EF6D746F8}.Debug|x86.ActiveCfg = Debug|x86
{FDA196F0-3C55-4360-B207-BA5EF6D746F8}.Debug|x86.Build.0 = Debug|x86
- {FDA196F0-3C55-4360-B207-BA5EF6D746F8}.Release|Any CPU.ActiveCfg = Release|x64
{FDA196F0-3C55-4360-B207-BA5EF6D746F8}.Release|x64.ActiveCfg = Release|x64
{FDA196F0-3C55-4360-B207-BA5EF6D746F8}.Release|x64.Build.0 = Release|x64
{FDA196F0-3C55-4360-B207-BA5EF6D746F8}.Release|x86.ActiveCfg = Release|x86
{FDA196F0-3C55-4360-B207-BA5EF6D746F8}.Release|x86.Build.0 = Release|x86
- {D46ED17B-329B-4D80-9181-FEF8307EFCBB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {D46ED17B-329B-4D80-9181-FEF8307EFCBB}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D46ED17B-329B-4D80-9181-FEF8307EFCBB}.Debug|x64.ActiveCfg = Debug|Any CPU
{D46ED17B-329B-4D80-9181-FEF8307EFCBB}.Debug|x64.Build.0 = Debug|Any CPU
{D46ED17B-329B-4D80-9181-FEF8307EFCBB}.Debug|x86.ActiveCfg = Debug|Any CPU
{D46ED17B-329B-4D80-9181-FEF8307EFCBB}.Debug|x86.Build.0 = Debug|Any CPU
- {D46ED17B-329B-4D80-9181-FEF8307EFCBB}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {D46ED17B-329B-4D80-9181-FEF8307EFCBB}.Release|Any CPU.Build.0 = Release|Any CPU
{D46ED17B-329B-4D80-9181-FEF8307EFCBB}.Release|x64.ActiveCfg = Release|Any CPU
{D46ED17B-329B-4D80-9181-FEF8307EFCBB}.Release|x64.Build.0 = Release|Any CPU
{D46ED17B-329B-4D80-9181-FEF8307EFCBB}.Release|x86.ActiveCfg = Release|Any CPU
{D46ED17B-329B-4D80-9181-FEF8307EFCBB}.Release|x86.Build.0 = Release|Any CPU
- {E2001B46-F226-4F7B-911E-252B9644236E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {E2001B46-F226-4F7B-911E-252B9644236E}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E2001B46-F226-4F7B-911E-252B9644236E}.Debug|x64.ActiveCfg = Debug|Any CPU
{E2001B46-F226-4F7B-911E-252B9644236E}.Debug|x64.Build.0 = Debug|Any CPU
{E2001B46-F226-4F7B-911E-252B9644236E}.Debug|x86.ActiveCfg = Debug|Any CPU
{E2001B46-F226-4F7B-911E-252B9644236E}.Debug|x86.Build.0 = Debug|Any CPU
- {E2001B46-F226-4F7B-911E-252B9644236E}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {E2001B46-F226-4F7B-911E-252B9644236E}.Release|Any CPU.Build.0 = Release|Any CPU
{E2001B46-F226-4F7B-911E-252B9644236E}.Release|x64.ActiveCfg = Release|Any CPU
{E2001B46-F226-4F7B-911E-252B9644236E}.Release|x64.Build.0 = Release|Any CPU
{E2001B46-F226-4F7B-911E-252B9644236E}.Release|x86.ActiveCfg = Release|Any CPU
{E2001B46-F226-4F7B-911E-252B9644236E}.Release|x86.Build.0 = Release|Any CPU
- {E2FC8B99-0638-4C01-86C4-1B625D966981}.Debug|Any CPU.ActiveCfg = Debug|x64
{E2FC8B99-0638-4C01-86C4-1B625D966981}.Debug|x64.ActiveCfg = Debug|x64
{E2FC8B99-0638-4C01-86C4-1B625D966981}.Debug|x64.Build.0 = Debug|x64
{E2FC8B99-0638-4C01-86C4-1B625D966981}.Debug|x86.ActiveCfg = Debug|x86
{E2FC8B99-0638-4C01-86C4-1B625D966981}.Debug|x86.Build.0 = Debug|x86
- {E2FC8B99-0638-4C01-86C4-1B625D966981}.Release|Any CPU.ActiveCfg = Release|x64
{E2FC8B99-0638-4C01-86C4-1B625D966981}.Release|x64.ActiveCfg = Release|x64
{E2FC8B99-0638-4C01-86C4-1B625D966981}.Release|x64.Build.0 = Release|x64
{E2FC8B99-0638-4C01-86C4-1B625D966981}.Release|x86.ActiveCfg = Release|x86
Modified: trunk/MgDev/Desktop/UnitTest/UnitTest.vcxproj
===================================================================
--- trunk/MgDev/Desktop/UnitTest/UnitTest.vcxproj 2012-01-27 12:06:46 UTC (rev 6457)
+++ trunk/MgDev/Desktop/UnitTest/UnitTest.vcxproj 2012-01-27 12:49:55 UTC (rev 6458)
@@ -226,7 +226,7 @@
</ClCompile>
<Link>
<AdditionalDependencies>cppunit.lib;MgDesktop.lib;FDO.lib;FDOCommon.lib;ACE.lib;MgFoundation.lib;MgGeometry.lib;MgMdfModel.lib;MgMdfParser.lib;MgPlatformBase.lib;MgRenderers.lib;MgStylization.lib;xerces-c_3mg.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <AdditionalLibraryDirectories>..\..\Oem\ACE\ACE_wrappers\lib64;..\..\Oem\FDO\Lib64;..\..\Oem\DWFTK7.1\develop\global\lib\static\release64\vc8.0;..\..\Oem\dbxml\xerces-c-src\Build\x64\VC9\Release;..\..\Common\lib\release64;..\Lib\release64;..\..\Oem\CppUnit-1.9.14\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>..\..\Oem\ACE\ACE_wrappers\lib64;..\..\Oem\FDO\Lib64;..\..\Oem\DWFTK7.1\develop\global\lib\static\release64\vc8.0;..\..\Oem\dbxml\xerces-c-src\Build\x64\VC10\Release;..\..\Common\lib\release64;..\Lib\release64;..\..\Oem\CppUnit-1.9.14\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<DelayLoadDLLs>FDO.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
<GenerateDebugInformation>true</GenerateDebugInformation>
<OptimizeReferences>true</OptimizeReferences>
More information about the mapguide-commits
mailing list