[mapguide-commits] r4559 - sandbox/adsk/2.2gp/Server/src/Core
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Sat Jan 30 13:07:34 EST 2010
Author: waltweltonlair
Date: 2010-01-30 13:07:34 -0500 (Sat, 30 Jan 2010)
New Revision: 4559
Modified:
sandbox/adsk/2.2gp/Server/src/Core/ServerCore.vcproj
Log:
Additional fix for #1256 (Update MapGuide to turn on global thread locking of FdoIDisposable objects)
The ServerCore project was updated to link against FDOCommon, but now the server won't start because
it can't find FDOCommon.dll. That's because the DLL is located in the FDO subfolder, and not in
the same folder as mgserver.exe. The fix is to delay load FDOCommon.dll.
Also fixed the output path for the library for the ServerCore project.
Modified: sandbox/adsk/2.2gp/Server/src/Core/ServerCore.vcproj
===================================================================
--- sandbox/adsk/2.2gp/Server/src/Core/ServerCore.vcproj 2010-01-30 18:05:26 UTC (rev 4558)
+++ sandbox/adsk/2.2gp/Server/src/Core/ServerCore.vcproj 2010-01-30 18:07:34 UTC (rev 4559)
@@ -64,15 +64,17 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="ACEd.lib xerces-c_2D.lib FdoCommon.lib"
+ AdditionalDependencies="ACEd.lib xerces-c_2D.lib FDOCommon.lib"
OutputFile="$(OutDir)\mgserver.exe"
LinkIncremental="1"
- AdditionalLibraryDirectories="..\..\..\Oem\ACE\ACE_wrappers\lib;"..\..\..\Oem\dbxml-2.3.10\lib";..\..\..\Oem\FDO\lib"
+ AdditionalLibraryDirectories="..\..\..\Oem\ACE\ACE_wrappers\lib;..\..\..\Oem\dbxml-2.3.10\lib;..\..\..\Oem\FDO\lib"
+ DelayLoadDLLs="FDOCommon.dll"
GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)\mgserver.pdb"
SubSystem="1"
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
+ ImportLibrary="..\..\lib\debug\MgServer.lib"
TargetMachine="1"
/>
<Tool
@@ -144,15 +146,17 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="ACEd.lib xerces-c_2D.lib FdoCommon.lib"
+ AdditionalDependencies="ACEd.lib xerces-c_2D.lib FDOCommon.lib"
OutputFile="$(OutDir)\mgserver.exe"
LinkIncremental="1"
- AdditionalLibraryDirectories="..\..\..\Oem\ACE\ACE_wrappers\lib64;"..\..\..\Oem\dbxml-2.3.10\lib64";..\..\..\Oem\FDO\lib64"
+ AdditionalLibraryDirectories="..\..\..\Oem\ACE\ACE_wrappers\lib64;..\..\..\Oem\dbxml-2.3.10\lib64;..\..\..\Oem\FDO\lib64"
+ DelayLoadDLLs="FDOCommon.dll"
GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)\mgserver.pdb"
SubSystem="1"
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
+ ImportLibrary="..\..\lib\debug64\MgServer.lib"
TargetMachine="17"
/>
<Tool
@@ -224,16 +228,18 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="ACE.lib xerces-c_2.lib FdoCommon.lib"
+ AdditionalDependencies="ACE.lib xerces-c_2.lib FDOCommon.lib"
OutputFile="$(OutDir)\mgserver.exe"
LinkIncremental="1"
- AdditionalLibraryDirectories="..\..\..\Oem\ACE\ACE_wrappers\lib;"..\..\..\Oem\dbxml-2.3.10\lib";..\..\..\Oem\FDO\lib"
+ AdditionalLibraryDirectories="..\..\..\Oem\ACE\ACE_wrappers\lib;..\..\..\Oem\dbxml-2.3.10\lib;..\..\..\Oem\FDO\lib"
+ DelayLoadDLLs="FDOCommon.dll"
GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)\mgserver.pdb"
SubSystem="1"
RandomizedBaseAddress="1"
FixedBaseAddress="1"
DataExecutionPrevention="0"
+ ImportLibrary="..\..\lib\release\MgServer.lib"
TargetMachine="1"
/>
<Tool
@@ -306,16 +312,18 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="ACE.lib xerces-c_2.lib FdoCommon.lib"
+ AdditionalDependencies="ACE.lib xerces-c_2.lib FDOCommon.lib"
OutputFile="$(OutDir)\mgserver.exe"
LinkIncremental="1"
- AdditionalLibraryDirectories="..\..\..\Oem\ACE\ACE_wrappers\lib64;"..\..\..\Oem\dbxml-2.3.10\lib64";..\..\..\Oem\FDO\lib64"
+ AdditionalLibraryDirectories="..\..\..\Oem\ACE\ACE_wrappers\lib64;..\..\..\Oem\dbxml-2.3.10\lib64;..\..\..\Oem\FDO\lib64"
+ DelayLoadDLLs="FDOCommon.dll"
GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)\mgserver.pdb"
SubSystem="1"
RandomizedBaseAddress="1"
FixedBaseAddress="1"
DataExecutionPrevention="0"
+ ImportLibrary="..\..\lib\release64\MgServer.lib"
TargetMachine="17"
/>
<Tool
More information about the mapguide-commits
mailing list