[mapguide-commits] r5406 - trunk/MgDev/Web/src/HttpHandler
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Thu Nov 25 00:37:22 EST 2010
Author: hubu
Date: 2010-11-24 21:37:22 -0800 (Wed, 24 Nov 2010)
New Revision: 5406
Modified:
trunk/MgDev/Web/src/HttpHandler/HttpHandler.vcproj
trunk/MgDev/Web/src/HttpHandler/Makefile.am
Log:
Fix Break build of Web on Linux and Windows.
Modified: trunk/MgDev/Web/src/HttpHandler/HttpHandler.vcproj
===================================================================
--- trunk/MgDev/Web/src/HttpHandler/HttpHandler.vcproj 2010-11-25 02:37:00 UTC (rev 5405)
+++ trunk/MgDev/Web/src/HttpHandler/HttpHandler.vcproj 2010-11-25 05:37:22 UTC (rev 5406)
@@ -64,10 +64,10 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="ACEd.lib lib_jsond.lib"
+ AdditionalDependencies="ACEd.lib lib_jsond.lib MgMdfParserd.lib MgMdfModeld.lib"
OutputFile="$(OutDir)\MgHttpHandlerd.dll"
LinkIncremental="2"
- AdditionalLibraryDirectories="..\..\..\Oem\ACE\ACE_wrappers\lib;"..\..\..\Oem\dbxml\lib";..\..\..\Oem\jsoncpp\lib"
+ AdditionalLibraryDirectories="..\..\..\Oem\ACE\ACE_wrappers\lib;..\..\..\Oem\dbxml\lib;..\..\..\Oem\jsoncpp\lib;..\..\..\common\lib\debug"
GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)\MgHttpHandlerd.pdb"
SubSystem="2"
@@ -143,10 +143,10 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="ACEd.lib lib_jsond.lib"
+ AdditionalDependencies="ACEd.lib lib_jsond.lib MgMdfParserd.lib MgMdfModeld.lib"
OutputFile="$(OutDir)\MgHttpHandlerd.dll"
LinkIncremental="2"
- AdditionalLibraryDirectories="..\..\..\Oem\ACE\ACE_wrappers\lib64;"..\..\..\Oem\dbxml\lib64";..\..\..\Oem\jsoncpp\lib64"
+ AdditionalLibraryDirectories="..\..\..\Oem\ACE\ACE_wrappers\lib64;..\..\..\Oem\dbxml\lib64;..\..\..\Oem\jsoncpp\lib64;..\..\..\Common\lib\debug64"
GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)\MgHttpHandlerd.pdb"
SubSystem="2"
@@ -220,10 +220,10 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="ACE.lib lib_json.lib"
+ AdditionalDependencies="ACE.lib lib_json.lib MgMdfParser.lib MgMdfModel.lib"
OutputFile="$(OutDir)\MgHttpHandler.dll"
LinkIncremental="1"
- AdditionalLibraryDirectories="..\..\..\Oem\ACE\ACE_wrappers\lib;"..\..\..\Oem\dbxml\lib";..\..\..\Oem\jsoncpp\lib"
+ AdditionalLibraryDirectories="..\..\..\Oem\ACE\ACE_wrappers\lib;..\..\..\Oem\dbxml\lib;..\..\..\Oem\jsoncpp\lib;..\..\..\common\lib\release"
GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)\MgHttpHandler.pdb"
SubSystem="2"
@@ -299,10 +299,10 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="ACE.lib lib_json.lib"
+ AdditionalDependencies="ACE.lib lib_json.lib MgMdfParser.lib MgMdfModel.lib"
OutputFile="$(OutDir)\MgHttpHandler.dll"
LinkIncremental="1"
- AdditionalLibraryDirectories="..\..\..\Oem\ACE\ACE_wrappers\lib64;"..\..\..\Oem\dbxml\lib64";..\..\..\Oem\jsoncpp\lib64"
+ AdditionalLibraryDirectories="..\..\..\Oem\ACE\ACE_wrappers\lib64;..\..\..\Oem\dbxml\lib64;..\..\..\Oem\jsoncpp\lib64;..\..\..\common\lib\release64"
GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)\MgHttpHandler.pdb"
SubSystem="2"
Modified: trunk/MgDev/Web/src/HttpHandler/Makefile.am
===================================================================
--- trunk/MgDev/Web/src/HttpHandler/Makefile.am 2010-11-25 02:37:00 UTC (rev 5405)
+++ trunk/MgDev/Web/src/HttpHandler/Makefile.am 2010-11-25 05:37:22 UTC (rev 5406)
@@ -283,8 +283,8 @@
-lMgPlatformBase \
-lMgMapGuideCommon \
-llib_json \
- -lMdfModel \
- -lMdfParser
+ -lMgMdfModel \
+ -lMgMdfParser
libMgHttpHandler_la_LDFLAGS = -release $(PACKAGE_VERSION) \
-L../../../Common/Foundation \
More information about the mapguide-commits
mailing list