[mapguide-commits] r10243 - in branches/4.0/MgDev: . Common/Stylization Portable/MgPortable Portable/UnitTest Server/src/Common/Manager Server/src/Core Server/src/Gws/GwsCommon Server/src/Gws/GwsQueryEngine Server/src/Services/Feature Server/src/Services/Mapping Server/src/UnitTesting
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Mon Nov 2 16:09:14 PST 2026
Author: jng
Date: 2026-11-02 16:09:12 -0800 (Mon, 02 Nov 2026)
New Revision: 10243
Modified:
branches/4.0/MgDev/Common/Stylization/Stylization.vcxproj
branches/4.0/MgDev/Portable/MgPortable/MgPortable.vcxproj
branches/4.0/MgDev/Portable/UnitTest/UnitTest.vcxproj
branches/4.0/MgDev/Server/src/Common/Manager/ServerManager.vcxproj
branches/4.0/MgDev/Server/src/Core/ServerCore.vcxproj
branches/4.0/MgDev/Server/src/Gws/GwsCommon/GwsCommon.vcxproj
branches/4.0/MgDev/Server/src/Gws/GwsQueryEngine/GwsQueryEngine.vcxproj
branches/4.0/MgDev/Server/src/Services/Feature/ServerFeatureService.vcxproj
branches/4.0/MgDev/Server/src/Services/Mapping/ServerMappingService.vcxproj
branches/4.0/MgDev/Server/src/UnitTesting/UnitTesting.vcxproj
branches/4.0/MgDev/build.bat
branches/4.0/MgDev/setenvironment64.bat
Log:
#2895: Allow for a single MapGuide source tree to build in both debug and release. This primarily requires downstream consumers of FDO use separate debug/release linker paths for .lib files.
Modified: branches/4.0/MgDev/Common/Stylization/Stylization.vcxproj
===================================================================
--- branches/4.0/MgDev/Common/Stylization/Stylization.vcxproj 2026-11-02 23:43:21 UTC (rev 10242)
+++ branches/4.0/MgDev/Common/Stylization/Stylization.vcxproj 2026-11-03 00:09:12 UTC (rev 10243)
@@ -138,7 +138,7 @@
<Link>
<AdditionalDependencies>FDO.lib;FDOCommon.lib;ExpressionEngine.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MgStylizationd.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\Oem\FDO\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>..\..\Oem\FDO\lib64\$(Configuration)64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<DelayLoadDLLs>FDO.dll;FDOCommon.dll;ExpressionEngine.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)MgStylizationd.pdb</ProgramDatabaseFile>
@@ -203,7 +203,7 @@
<Link>
<AdditionalDependencies>FDO.lib;FDOCommon.lib;ExpressionEngine.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MgStylization.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\Oem\FDO\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>..\..\Oem\FDO\lib64\$(Configuration)64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<DelayLoadDLLs>FDO.dll;FDOCommon.dll;ExpressionEngine.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)MgStylization.pdb</ProgramDatabaseFile>
Modified: branches/4.0/MgDev/Portable/MgPortable/MgPortable.vcxproj
===================================================================
--- branches/4.0/MgDev/Portable/MgPortable/MgPortable.vcxproj 2026-11-02 23:43:21 UTC (rev 10242)
+++ branches/4.0/MgDev/Portable/MgPortable/MgPortable.vcxproj 2026-11-03 00:09:12 UTC (rev 10243)
@@ -170,7 +170,7 @@
<AdditionalDependencies>FDO.lib;FDOCommon.lib;FDOGeometry.lib;FDOSpatial.lib;ExpressionEngine.lib;ACEd.lib;MgFoundationd.lib;MgGeometryd.lib;MgMdfModeld.lib;MgMdfParserd.lib;MgPlatformBased.lib;MgRenderersd.lib;MgStylizationd.lib;MgGwsCommond.lib;MgGwsQueryEngined.lib;xerces-c_3mgD.lib;dwfcore_wt.1.7.0.lib;dwftk_wt.7.7.0.lib;w3dtk_wt.1.7.1555.lib;whiptk_wt.7.13.601.lib;MgSecurityd.lib;%(AdditionalDependencies)</AdditionalDependencies>
<ShowProgress>NotSet</ShowProgress>
<OutputFile>$(OutDir)MgPortabled.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\Oem\ACE\ACE_wrappers\lib64\$(Configuration);..\..\Oem\FDO\Lib64;..\..\Oem\DWFTK\develop\global\lib\x64\static\$(Configuration)\vc10.0;..\..\Oem\dbxml\xerces-c-src\Build\$(Configuration)64;..\..\Common\lib\$(Configuration)64;..\..\Server\lib\$(Configuration)64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>..\..\Oem\ACE\ACE_wrappers\lib64\$(Configuration);..\..\Oem\FDO\Lib64\$(Configuration)64;..\..\Oem\DWFTK\develop\global\lib\x64\static\$(Configuration)\vc10.0;..\..\Oem\dbxml\xerces-c-src\Build\$(Configuration)64;..\..\Common\lib\$(Configuration)64;..\..\Server\lib\$(Configuration)64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<DelayLoadDLLs>FDOd.dll;FDOCommond.dll;FDOGeometryd.dll;FDOSpatiald.dll;ExpressionEngined.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
@@ -209,7 +209,7 @@
<Link>
<AdditionalDependencies>FDO.lib;FDOCommon.lib;FDOGeometry.lib;FDOSpatial.lib;ExpressionEngine.lib;ACE.lib;MgFoundation.lib;MgGeometry.lib;MgMdfModel.lib;MgMdfParser.lib;MgPlatformBase.lib;MgRenderers.lib;MgStylization.lib;MgGwsCommon.lib;MgGwsQueryEngine.lib;xerces-c_3mg.lib;dwfcore_wt.1.7.0.lib;dwftk_wt.7.7.0.lib;w3dtk_wt.1.7.1555.lib;whiptk_wt.7.13.601.lib;MgSecurity.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)$(ProjectName).dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\Oem\ACE\ACE_wrappers\lib64\$(Configuration);..\..\Oem\FDO\Lib64;..\..\Oem\DWFTK\develop\global\lib\x64\static\$(Configuration)\vc10.0;..\..\Oem\dbxml\xerces-c-src\Build\$(Configuration)64;..\..\Common\lib\$(Configuration)64;..\..\Server\lib\$(Configuration)64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>..\..\Oem\ACE\ACE_wrappers\lib64\$(Configuration);..\..\Oem\FDO\Lib64\$(Configuration)64;..\..\Oem\DWFTK\develop\global\lib\x64\static\$(Configuration)\vc10.0;..\..\Oem\dbxml\xerces-c-src\Build\$(Configuration)64;..\..\Common\lib\$(Configuration)64;..\..\Server\lib\$(Configuration)64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<DelayLoadDLLs>MgMdfParser.dll;MgGeometry.dll;MgGwsCommon.dll;MgGwsResource.dll;FDO.dll;FDOCommon.dll;FDOSpatial.dll;MgStylization.dll;FDOGeometry.dll;ExpressionEngine.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
Modified: branches/4.0/MgDev/Portable/UnitTest/UnitTest.vcxproj
===================================================================
--- branches/4.0/MgDev/Portable/UnitTest/UnitTest.vcxproj 2026-11-02 23:43:21 UTC (rev 10242)
+++ branches/4.0/MgDev/Portable/UnitTest/UnitTest.vcxproj 2026-11-03 00:09:12 UTC (rev 10243)
@@ -134,7 +134,7 @@
</ClCompile>
<Link>
<AdditionalDependencies>MgPortabled.lib;FDO.lib;FDOCommon.lib;ACEd.lib;MgFoundationd.lib;MgGeometryd.lib;MgMdfModeld.lib;MgMdfParserd.lib;MgPlatformBased.lib;MgRenderersd.lib;MgStylizationd.lib;xerces-c_3mgD.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <AdditionalLibraryDirectories>..\..\Oem\ACE\ACE_wrappers\lib64\$(Configuration);..\..\Oem\FDO\Lib64;..\..\Oem\DWFTK\develop\global\lib\static\$(Configuration)64;..\..\Oem\dbxml\xerces-c-src\Build\$(Configuration)64;..\..\Common\lib\$(Configuration)64;..\Lib\debug64</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>..\..\Oem\ACE\ACE_wrappers\lib64\$(Configuration);..\..\Oem\FDO\Lib64\$(Configuration)64;..\..\Oem\DWFTK\develop\global\lib\static\$(Configuration)64;..\..\Oem\dbxml\xerces-c-src\Build\$(Configuration)64;..\..\Common\lib\$(Configuration)64;..\Lib\debug64</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<TargetMachine>MachineX64</TargetMachine>
</Link>
@@ -231,7 +231,7 @@
</ClCompile>
<Link>
<AdditionalDependencies>MgPortable.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\$(Configuration);..\..\Oem\FDO\Lib64;..\..\Oem\DWFTK\develop\global\lib\static\$(Configuration)64;..\..\Oem\dbxml\xerces-c-src\Build\$(Configuration)64;..\..\Common\lib\$(Configuration)64;..\Lib\release64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>..\..\Oem\ACE\ACE_wrappers\lib64\$(Configuration);..\..\Oem\FDO\Lib64\$(Configuration)64;..\..\Oem\DWFTK\develop\global\lib\static\$(Configuration)64;..\..\Oem\dbxml\xerces-c-src\Build\$(Configuration)64;..\..\Common\lib\$(Configuration)64;..\Lib\release64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<DelayLoadDLLs>FDO.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
<GenerateDebugInformation>true</GenerateDebugInformation>
<OptimizeReferences>true</OptimizeReferences>
Modified: branches/4.0/MgDev/Server/src/Common/Manager/ServerManager.vcxproj
===================================================================
--- branches/4.0/MgDev/Server/src/Common/Manager/ServerManager.vcxproj 2026-11-02 23:43:21 UTC (rev 10242)
+++ branches/4.0/MgDev/Server/src/Common/Manager/ServerManager.vcxproj 2026-11-03 00:09:12 UTC (rev 10243)
@@ -135,7 +135,7 @@
<Link>
<AdditionalDependencies>ACEd.lib;FDO.lib;FDOCommon.lib;pdh.lib;psapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MgServerManagerd.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\..\..\Oem\ACE\ACE_wrappers\lib64\$(Configuration);..\..\..\..\Oem\FDO\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>..\..\..\..\Oem\ACE\ACE_wrappers\lib64\$(Configuration);..\..\..\..\Oem\FDO\lib64\$(Configuration)64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<DelayLoadDLLs>FDO.dll;FDOCommon.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)MgServerManagerd.pdb</ProgramDatabaseFile>
@@ -189,7 +189,7 @@
<Link>
<AdditionalDependencies>ACE.lib;FDO.lib;FDOCommon.lib;pdh.lib;psapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MgServerManager.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\..\..\Oem\ACE\ACE_wrappers\lib64\$(Configuration);..\..\..\..\Oem\FDO\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>..\..\..\..\Oem\ACE\ACE_wrappers\lib64\$(Configuration);..\..\..\..\Oem\FDO\lib64\$(Configuration)64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<DelayLoadDLLs>FDO.dll;FDOCommon.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)MgServerManager.pdb</ProgramDatabaseFile>
Modified: branches/4.0/MgDev/Server/src/Core/ServerCore.vcxproj
===================================================================
--- branches/4.0/MgDev/Server/src/Core/ServerCore.vcxproj 2026-11-02 23:43:21 UTC (rev 10242)
+++ branches/4.0/MgDev/Server/src/Core/ServerCore.vcxproj 2026-11-03 00:09:12 UTC (rev 10243)
@@ -135,7 +135,7 @@
<Link>
<AdditionalDependencies>ACEd.lib;xerces-c_3mgD.lib;FDOCommon.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)mgserver.exe</OutputFile>
- <AdditionalLibraryDirectories>..\..\..\Oem\ACE\ACE_wrappers\lib64\$(Configuration);..\..\..\Oem\dbxml\lib64\$(Configuration);..\..\..\Oem\FDO\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>..\..\..\Oem\ACE\ACE_wrappers\lib64\$(Configuration);..\..\..\Oem\dbxml\lib64\$(Configuration);..\..\..\Oem\FDO\lib64\$(Configuration)64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<DelayLoadDLLs>FDOCommon.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)mgserver.pdb</ProgramDatabaseFile>
@@ -198,7 +198,7 @@
<Link>
<AdditionalDependencies>ACE.lib;xerces-c_3mg.lib;FDOCommon.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)mgserver.exe</OutputFile>
- <AdditionalLibraryDirectories>..\..\..\Oem\ACE\ACE_wrappers\lib64\$(Configuration);..\..\..\Oem\dbxml\lib64\$(Configuration);..\..\..\Oem\FDO\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>..\..\..\Oem\ACE\ACE_wrappers\lib64\$(Configuration);..\..\..\Oem\dbxml\lib64\$(Configuration);..\..\..\Oem\FDO\lib64\$(Configuration)64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<DelayLoadDLLs>FDOCommon.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)mgserver.pdb</ProgramDatabaseFile>
Modified: branches/4.0/MgDev/Server/src/Gws/GwsCommon/GwsCommon.vcxproj
===================================================================
--- branches/4.0/MgDev/Server/src/Gws/GwsCommon/GwsCommon.vcxproj 2026-11-02 23:43:21 UTC (rev 10242)
+++ branches/4.0/MgDev/Server/src/Gws/GwsCommon/GwsCommon.vcxproj 2026-11-03 00:09:12 UTC (rev 10243)
@@ -131,7 +131,7 @@
<Link>
<AdditionalDependencies>FDO.lib;FDOCommon.lib;FDOGeometry.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MgGwsCommond.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\..\..\Oem\FDO\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>..\..\..\..\Oem\FDO\lib64\$(Configuration)64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<DelayLoadDLLs>FDO.dll;FDOCommon.dll;FDOGeometry.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)MgGwsCommond.pdb</ProgramDatabaseFile>
@@ -185,7 +185,7 @@
<Link>
<AdditionalDependencies>FDO.lib;FDOCommon.lib;FDOGeometry.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MgGwsCommon.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\..\..\Oem\FDO\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>..\..\..\..\Oem\FDO\lib64\$(Configuration)64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<DelayLoadDLLs>FDO.dll;FDOCommon.dll;FDOGeometry.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)MgGwsCommon.pdb</ProgramDatabaseFile>
Modified: branches/4.0/MgDev/Server/src/Gws/GwsQueryEngine/GwsQueryEngine.vcxproj
===================================================================
--- branches/4.0/MgDev/Server/src/Gws/GwsQueryEngine/GwsQueryEngine.vcxproj 2026-11-02 23:43:21 UTC (rev 10242)
+++ branches/4.0/MgDev/Server/src/Gws/GwsQueryEngine/GwsQueryEngine.vcxproj 2026-11-03 00:09:12 UTC (rev 10243)
@@ -138,7 +138,7 @@
<Link>
<AdditionalDependencies>FDO.lib;FDOCommon.lib;FDOGeometry.lib;ExpressionEngine.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MgGwsQueryEngined.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\..\..\Oem\FDO\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>..\..\..\..\Oem\FDO\lib64\$(Configuration)64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<ModuleDefinitionFile>GwsQueryEngine.def</ModuleDefinitionFile>
<DelayLoadDLLs>FDO.dll;FDOCommon.dll;FDOGeometry.dll;ExpressionEngine.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
<GenerateDebugInformation>true</GenerateDebugInformation>
@@ -202,7 +202,7 @@
<Link>
<AdditionalDependencies>FDO.lib;FDOCommon.lib;FDOGeometry.lib;ExpressionEngine.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MgGwsQueryEngine.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\..\..\Oem\FDO\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>..\..\..\..\Oem\FDO\lib64\$(Configuration)64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<ModuleDefinitionFile>GwsQueryEngine.def</ModuleDefinitionFile>
<DelayLoadDLLs>FDO.dll;FDOCommon.dll;FDOGeometry.dll;ExpressionEngine.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
<GenerateDebugInformation>true</GenerateDebugInformation>
Modified: branches/4.0/MgDev/Server/src/Services/Feature/ServerFeatureService.vcxproj
===================================================================
--- branches/4.0/MgDev/Server/src/Services/Feature/ServerFeatureService.vcxproj 2026-11-02 23:43:21 UTC (rev 10242)
+++ branches/4.0/MgDev/Server/src/Services/Feature/ServerFeatureService.vcxproj 2026-11-03 00:09:12 UTC (rev 10243)
@@ -135,7 +135,7 @@
<Link>
<AdditionalDependencies>ACEd.lib;xerces-c_3mgD.lib;FDO.lib;FDOCommon.lib;FDOGeometry.lib;ExpressionEngine.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MgServerFeatureServiced.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\..\..\Oem\ACE\ACE_wrappers\lib64\$(Configuration);..\..\..\..\Oem\dbxml\lib64\$(Configuration);..\..\..\..\Oem\FDO\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>..\..\..\..\Oem\ACE\ACE_wrappers\lib64\$(Configuration);..\..\..\..\Oem\dbxml\lib64\$(Configuration);..\..\..\..\Oem\FDO\lib64\$(Configuration)64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<DelayLoadDLLs>FDO.dll;FDOCommon.dll;FDOGeometry.dll;ExpressionEngine.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)MgServerFeatureServiced.pdb</ProgramDatabaseFile>
@@ -194,7 +194,7 @@
<Link>
<AdditionalDependencies>ACE.lib;xerces-c_3mg.lib;FDO.lib;FDOCommon.lib;FDOGeometry.lib;ExpressionEngine.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MgServerFeatureService.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\..\..\Oem\ACE\ACE_wrappers\lib64\$(Configuration);..\..\..\..\Oem\dbxml\lib64\$(Configuration);..\..\..\..\Oem\FDO\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>..\..\..\..\Oem\ACE\ACE_wrappers\lib64\$(Configuration);..\..\..\..\Oem\dbxml\lib64\$(Configuration);..\..\..\..\Oem\FDO\lib64\$(Configuration)64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<DelayLoadDLLs>FDO.dll;FDOCommon.dll;FDOGeometry.dll;ExpressionEngine.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)MgServerFeatureService.pdb</ProgramDatabaseFile>
Modified: branches/4.0/MgDev/Server/src/Services/Mapping/ServerMappingService.vcxproj
===================================================================
--- branches/4.0/MgDev/Server/src/Services/Mapping/ServerMappingService.vcxproj 2026-11-02 23:43:21 UTC (rev 10242)
+++ branches/4.0/MgDev/Server/src/Services/Mapping/ServerMappingService.vcxproj 2026-11-03 00:09:12 UTC (rev 10243)
@@ -133,7 +133,7 @@
<Link>
<AdditionalDependencies>ACEd.lib;xerces-c_3mgD.lib;FDO.lib;FDOCommon.lib;FDOGeometry.lib;FDOSpatial.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MgServerMappingServiced.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\..\..\Oem\ACE\ACE_wrappers\lib64\$(Configuration);..\..\..\..\Oem\dbxml\lib64\$(Configuration);..\..\..\..\Oem\FDO\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>..\..\..\..\Oem\ACE\ACE_wrappers\lib64\$(Configuration);..\..\..\..\Oem\dbxml\lib64\$(Configuration);..\..\..\..\Oem\FDO\lib64\$(Configuration)64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<DelayLoadDLLs>FDO.dll;FDOCommon.dll;FDOGeometry.dll;FDOSpatial.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)MgServerMappingServiced.pdb</ProgramDatabaseFile>
@@ -187,7 +187,7 @@
<Link>
<AdditionalDependencies>ACE.lib;xerces-c_3mg.lib;FDO.lib;FDOCommon.lib;FDOGeometry.lib;FDOSpatial.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MgServerMappingService.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\..\..\Oem\ACE\ACE_wrappers\lib64\$(Configuration);..\..\..\..\Oem\dbxml\lib64\$(Configuration);..\..\..\..\Oem\FDO\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>..\..\..\..\Oem\ACE\ACE_wrappers\lib64\$(Configuration);..\..\..\..\Oem\dbxml\lib64\$(Configuration);..\..\..\..\Oem\FDO\lib64\$(Configuration)64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<DelayLoadDLLs>FDO.dll;FDOCommon.dll;FDOGeometry.dll;FDOSpatial.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)MgServerMappingService.pdb</ProgramDatabaseFile>
Modified: branches/4.0/MgDev/Server/src/UnitTesting/UnitTesting.vcxproj
===================================================================
--- branches/4.0/MgDev/Server/src/UnitTesting/UnitTesting.vcxproj 2026-11-02 23:43:21 UTC (rev 10242)
+++ branches/4.0/MgDev/Server/src/UnitTesting/UnitTesting.vcxproj 2026-11-03 00:09:12 UTC (rev 10243)
@@ -104,7 +104,7 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
- <AdditionalDependencies>ACEd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>ACEd.lib;FDO.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MgUnitTestingd.dll</OutputFile>
<AdditionalLibraryDirectories>..\..\..\Oem\ACE\ACE_wrappers\lib\$(Configuration);..\..\..\Oem\FDO\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
@@ -130,9 +130,9 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
- <AdditionalDependencies>ACEd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>ACEd.lib;FDO.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MgUnitTestingd.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\..\Oem\ACE\ACE_wrappers\lib64\$(Configuration);..\..\..\Oem\FDO\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>..\..\..\Oem\ACE\ACE_wrappers\lib64\$(Configuration);..\..\..\Oem\FDO\lib64\$(Configuration)64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)MgUnitTestingd.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
@@ -155,7 +155,7 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
- <AdditionalDependencies>ACE.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>ACE.lib;FDO.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MgUnitTesting.dll</OutputFile>
<AdditionalLibraryDirectories>..\..\..\Oem\ACE\ACE_wrappers\lib\$(Configuration);..\..\..\Oem\FDO\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
@@ -182,9 +182,9 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
- <AdditionalDependencies>ACE.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>ACE.lib;FDO.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MgUnitTesting.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\..\Oem\ACE\ACE_wrappers\lib64\$(Configuration);..\..\..\Oem\FDO\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>..\..\..\Oem\ACE\ACE_wrappers\lib64\$(Configuration);..\..\..\Oem\FDO\lib64\$(Configuration)64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)MgUnitTesting.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
Modified: branches/4.0/MgDev/build.bat
===================================================================
--- branches/4.0/MgDev/build.bat 2026-11-02 23:43:21 UTC (rev 10242)
+++ branches/4.0/MgDev/build.bat 2026-11-03 00:09:12 UTC (rev 10243)
@@ -14,7 +14,8 @@
rem - Bin\%CONFIG% (where %CONFIG% is debug or release, debug64 or release64 for 64-bit FDO)
rem - Inc
rem - Lib
-rem - Lib64 (for 64-bit FDO)
+rem - Lib64\%CONFIG% (for 64-bit FDO, where %CONFIG% is debug64 or release64: one
+rem subdirectory per configuration, so both can be staged in the same tree)
rem
rem 2) Download and install the following:
rem - Java SDK (http://java.sun.com)
Modified: branches/4.0/MgDev/setenvironment64.bat
===================================================================
--- branches/4.0/MgDev/setenvironment64.bat 2026-11-02 23:43:21 UTC (rev 10242)
+++ branches/4.0/MgDev/setenvironment64.bat 2026-11-03 00:09:12 UTC (rev 10243)
@@ -50,7 +50,7 @@
SET MG_OEM_DB=db-4.8.26
SET MG_FDO_BIN=%MG_OEM%\FDO\Bin\%TYPEBUILD%
SET MG_FDO_INC=%MG_OEM%\FDO\Inc
-SET MG_FDO_LIB=%MG_OEM%\FDO\Lib64
+SET MG_FDO_LIB=%MG_OEM%\FDO\Lib64\%TYPEBUILD%
SET MG_COMMON=%MG_DEV%\Common
SET MG_SERVER=%MG_DEV%\Server
SET MG_WEB=%MG_DEV%\Web
More information about the mapguide-commits
mailing list