[mapguide-commits] r5740 - in trunk/MgDev: Common/Foundation
Common/Geometry Common/MdfModel Common/MdfParser Common/PlatformBase
Oem/dbxml/xerces-c-src/projects/Win32/VC10/xerces-all/XercesLib
Oem/geos-2.2.0/VisualStudio
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Thu May 5 02:46:37 EDT 2011
Author: christinebao
Date: 2011-05-04 23:46:37 -0700 (Wed, 04 May 2011)
New Revision: 5740
Modified:
trunk/MgDev/Common/Foundation/Foundation.vcxproj
trunk/MgDev/Common/Geometry/Geometry.vcxproj
trunk/MgDev/Common/MdfModel/MdfModel.h
trunk/MgDev/Common/MdfModel/MdfOwnerCollection.h
trunk/MgDev/Common/MdfModel/MdfRootObject.h
trunk/MgDev/Common/MdfModel/NameStringPair.h
trunk/MgDev/Common/MdfModel/RelateProperty.h
trunk/MgDev/Common/MdfParser/MdfParser.vcxproj
trunk/MgDev/Common/PlatformBase/PlatformBase.vcxproj
trunk/MgDev/Oem/dbxml/xerces-c-src/projects/Win32/VC10/xerces-all/XercesLib/XercesLib.vcxproj
trunk/MgDev/Oem/geos-2.2.0/VisualStudio/GEOS.vcxproj
Log:
This submission cleaned some unnecessary input path for vcxproj.
VS2010 uses reference instead of lib input, and the path in library setting is not needed any more.
Modified: trunk/MgDev/Common/Foundation/Foundation.vcxproj
===================================================================
--- trunk/MgDev/Common/Foundation/Foundation.vcxproj 2011-05-04 13:36:44 UTC (rev 5739)
+++ trunk/MgDev/Common/Foundation/Foundation.vcxproj 2011-05-05 06:46:37 UTC (rev 5740)
@@ -102,7 +102,7 @@
<Link>
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MgFoundationd.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\Oem\ACE\ACE_wrappers\lib;..\..\Oem\dbxml\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)MgFoundationd.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
@@ -128,7 +128,7 @@
<Link>
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MgFoundationd.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\Oem\ACE\ACE_wrappers\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)MgFoundationd.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
@@ -175,7 +175,7 @@
<Link>
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MgFoundation.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\Oem\ACE\ACE_wrappers\lib64;..\..\Oem\dbxml\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)MgFoundation.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
Modified: trunk/MgDev/Common/Geometry/Geometry.vcxproj
===================================================================
--- trunk/MgDev/Common/Geometry/Geometry.vcxproj 2011-05-04 13:36:44 UTC (rev 5739)
+++ trunk/MgDev/Common/Geometry/Geometry.vcxproj 2011-05-05 06:46:37 UTC (rev 5740)
@@ -99,9 +99,9 @@
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
<Link>
- <AdditionalDependencies>ACEd.lib;GEOSd.lib;csmapd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>csmapd.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MgGeometryd.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\Oem\ACE\ACE_wrappers\lib;..\..\Oem\geos-2.2.0\VisualStudio\Debug;..\..\Oem\CsMap\lib100\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>..\..\Oem\CsMap\lib100\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -124,9 +124,9 @@
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
<Link>
- <AdditionalDependencies>ACEd.lib;GEOSd.lib;csmapd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>csmapd.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MgGeometryd.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\Oem\ACE\ACE_Wrappers\lib64;..\..\Oem\geos-2.2.0\VisualStudio\Debug64;..\..\Oem\CsMap\lib100\Debug64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>..\..\Oem\CsMap\lib100\Debug64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<ImportLibrary>..\lib\debug64\MgGeometryd.lib</ImportLibrary>
@@ -144,9 +144,9 @@
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
<Link>
- <AdditionalDependencies>ACE.lib;GEOS.lib;csmap.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>csmap.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MgGeometry.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\Oem\ACE\ACE_wrappers\lib;..\..\Oem\geos-2.2.0\VisualStudio\Release;..\..\Oem\CsMap\lib100\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>..\..\Oem\CsMap\lib100\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<OptimizeReferences>true</OptimizeReferences>
@@ -169,9 +169,9 @@
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
<Link>
- <AdditionalDependencies>ACE.lib;GEOS.lib;csmap.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>csmap.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MgGeometry.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\Oem\ACE\ACE_Wrappers\lib64;..\..\Oem\geos-2.2.0\VisualStudio\Release64;..\..\Oem\CsMap\lib100\Release64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>..\..\Oem\CsMap\lib100\Release64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<OptimizeReferences>true</OptimizeReferences>
@@ -1075,6 +1075,9 @@
<ResourceCompile Include="Geometry.rc" />
</ItemGroup>
<ItemGroup>
+ <ProjectReference Include="..\..\Oem\ACE\ACE_wrappers\ace\ACE.vcxproj">
+ <Project>{bd537c9a-feca-1bad-6757-8a6363336a1c}</Project>
+ </ProjectReference>
<ProjectReference Include="..\..\Oem\geos-2.2.0\VisualStudio\GEOS.vcxproj">
<Project>{1b9196bf-c194-47bc-846a-d9bbb134f2b3}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
Modified: trunk/MgDev/Common/MdfModel/MdfModel.h
===================================================================
--- trunk/MgDev/Common/MdfModel/MdfModel.h 2011-05-04 13:36:44 UTC (rev 5739)
+++ trunk/MgDev/Common/MdfModel/MdfModel.h 2011-05-05 06:46:37 UTC (rev 5740)
@@ -15,6 +15,8 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
+#pragma once
+
#ifndef MDFMODEL_H_
#define MDFMODEL_H_
@@ -48,40 +50,21 @@
// ignore warnings about using deprecated methods
#pragma warning(disable: 4996)
+// ignore warning about needing to have dll-interface to be used by clients export
+#pragma warning(disable: 4251)
+
#define MDFMODEL_NAMESPACE MdfModel
#define BEGIN_NAMESPACE_MDFMODEL namespace MdfModel {
#define END_NAMESPACE_MDFMODEL }
#include <string>
-//http://msdn.microsoft.com/en-us/library/b0084kay%28VS.80%29.aspx
-//Define for VS2010
-#if _MSC_VER >= 1600
-//http://connect.microsoft.com/VisualStudio/feedback/details/562448/std-string-npos-lnk2001-when-inheriting-a-dll-class-from-std-string
-//Fix wstring::npos link error
-const std::wstring::size_type std::wstring::npos = size_t(-1);
-#endif
-
BEGIN_NAMESPACE_MDFMODEL
// the MdfString is a std::wstring.
// It might be swapped out at a later date for a const wchar_t* .
typedef std::wstring MdfString; // wide string for unicode support
-
-//http://msdn.microsoft.com/en-us/library/b0084kay%28VS.80%29.aspx
-//Define for VS2010
-#if _MSC_VER >= 1600
-
- #ifdef _WIN32
- EXPIMP_TEMPLATE template class MDFMODEL_API std::allocator<wchar_t>;
- EXPIMP_TEMPLATE template class MDFMODEL_API std::basic_string<wchar_t, std::char_traits<wchar_t>, std::allocator<wchar_t> >;
- #else
- extern template class std::allocator<wchar_t>;
- extern template class std::basic_string<wchar_t, std::char_traits<wchar_t>, std::allocator<wchar_t> >;
- #endif
-
-#endif
-
+
END_NAMESPACE_MDFMODEL
using namespace MDFMODEL_NAMESPACE;
Modified: trunk/MgDev/Common/MdfModel/MdfOwnerCollection.h
===================================================================
--- trunk/MgDev/Common/MdfModel/MdfOwnerCollection.h 2011-05-04 13:36:44 UTC (rev 5739)
+++ trunk/MgDev/Common/MdfModel/MdfOwnerCollection.h 2011-05-05 06:46:37 UTC (rev 5740)
@@ -18,6 +18,9 @@
#ifndef _MDFOWNERCOLLECTION_H_
#define _MDFOWNERCOLLECTION_H_
+// ignore warning about needing to have dll-interface to be used by clients export
+#pragma warning(disable: 4251)
+
BEGIN_NAMESPACE_MDFMODEL
//---------------------------------------------------------------------
Modified: trunk/MgDev/Common/MdfModel/MdfRootObject.h
===================================================================
--- trunk/MgDev/Common/MdfModel/MdfRootObject.h 2011-05-04 13:36:44 UTC (rev 5739)
+++ trunk/MgDev/Common/MdfModel/MdfRootObject.h 2011-05-05 06:46:37 UTC (rev 5740)
@@ -20,6 +20,9 @@
#include "MdfModel.h"
+// ignore warning about needing to have dll-interface to be used by clients export
+#pragma warning(disable: 4251)
+
BEGIN_NAMESPACE_MDFMODEL
//-------------------------------------------------------------------------
Modified: trunk/MgDev/Common/MdfModel/NameStringPair.h
===================================================================
--- trunk/MgDev/Common/MdfModel/NameStringPair.h 2011-05-04 13:36:44 UTC (rev 5739)
+++ trunk/MgDev/Common/MdfModel/NameStringPair.h 2011-05-05 06:46:37 UTC (rev 5740)
@@ -22,6 +22,10 @@
#include "MdfOwnerCollection.h"
#include "MdfRootObject.h"
+// exporting of template classes for collections
+// suppresses MS specific (non-ANSI) code warning
+#pragma warning(disable: 4231)
+
BEGIN_NAMESPACE_MDFMODEL
//-------------------------------------------------------------------------
Modified: trunk/MgDev/Common/MdfModel/RelateProperty.h
===================================================================
--- trunk/MgDev/Common/MdfModel/RelateProperty.h 2011-05-04 13:36:44 UTC (rev 5739)
+++ trunk/MgDev/Common/MdfModel/RelateProperty.h 2011-05-05 06:46:37 UTC (rev 5740)
@@ -22,6 +22,14 @@
#include "MdfOwnerCollection.h"
#include "MdfRootObject.h"
+
+// exporting of template classes for collections
+// suppresses MS specific (non-ANSI) code warning
+#pragma warning(disable: 4231)
+
+// ignore warning about needing to have dll-interface to be used by clients export
+#pragma warning(disable: 4251)
+
BEGIN_NAMESPACE_MDFMODEL
//-------------------------------------------------------------------------
Modified: trunk/MgDev/Common/MdfParser/MdfParser.vcxproj
===================================================================
--- trunk/MgDev/Common/MdfParser/MdfParser.vcxproj 2011-05-04 13:36:44 UTC (rev 5739)
+++ trunk/MgDev/Common/MdfParser/MdfParser.vcxproj 2011-05-05 06:46:37 UTC (rev 5740)
@@ -104,7 +104,7 @@
<Link>
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MgMdfParserd.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\Oem\dbxml\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)MgMdfParserd.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
@@ -152,7 +152,7 @@
<Link>
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MgMdfParser.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\Oem\dbxml\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)MgMdfParser.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
@@ -178,7 +178,7 @@
<Link>
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MgMdfParser.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\Oem\dbxml\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)MgMdfParser.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
Modified: trunk/MgDev/Common/PlatformBase/PlatformBase.vcxproj
===================================================================
--- trunk/MgDev/Common/PlatformBase/PlatformBase.vcxproj 2011-05-04 13:36:44 UTC (rev 5739)
+++ trunk/MgDev/Common/PlatformBase/PlatformBase.vcxproj 2011-05-05 06:46:37 UTC (rev 5740)
@@ -99,9 +99,9 @@
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
<Link>
- <AdditionalDependencies>ACEd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MgPlatformBased.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\Oem\ACE\ACE_wrappers\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -123,9 +123,9 @@
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
<Link>
- <AdditionalDependencies>ACEd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MgPlatformBased.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\Oem\ACE\ACE_wrappers\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<ImportLibrary>..\lib\debug64\MgPlatformBased.lib</ImportLibrary>
@@ -142,9 +142,9 @@
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
<Link>
- <AdditionalDependencies>ACE.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MgPlatformBase.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\Oem\ACE\ACE_wrappers\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<OptimizeReferences>true</OptimizeReferences>
@@ -166,9 +166,9 @@
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
<Link>
- <AdditionalDependencies>ACE.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MgPlatformBase.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\Oem\ACE\ACE_wrappers\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<OptimizeReferences>true</OptimizeReferences>
@@ -980,9 +980,11 @@
<ResourceCompile Include="PlatformBase.rc" />
</ItemGroup>
<ItemGroup>
+ <ProjectReference Include="..\..\Oem\ACE\ACE_wrappers\ace\ACE.vcxproj">
+ <Project>{bd537c9a-feca-1bad-6757-8a6363336a1c}</Project>
+ </ProjectReference>
<ProjectReference Include="..\Foundation\Foundation.vcxproj">
<Project>{a82adc7d-4da4-42f2-9bf6-df5dcfb44425}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
<ProjectReference Include="..\Geometry\Geometry.vcxproj">
<Project>{d954daac-e305-40ce-b3f3-c229a0bef4f0}</Project>
@@ -994,7 +996,6 @@
</ProjectReference>
<ProjectReference Include="..\MdfParser\MdfParser.vcxproj">
<Project>{85882748-dd71-4d2b-9e5a-03af8c8d91b7}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
Modified: trunk/MgDev/Oem/dbxml/xerces-c-src/projects/Win32/VC10/xerces-all/XercesLib/XercesLib.vcxproj
===================================================================
--- trunk/MgDev/Oem/dbxml/xerces-c-src/projects/Win32/VC10/xerces-all/XercesLib/XercesLib.vcxproj 2011-05-04 13:36:44 UTC (rev 5739)
+++ trunk/MgDev/Oem/dbxml/xerces-c-src/projects/Win32/VC10/xerces-all/XercesLib/XercesLib.vcxproj 2011-05-05 06:46:37 UTC (rev 5740)
@@ -181,16 +181,16 @@
<OutDir Condition="'$(Configuration)|$(Platform)'=='ICU Release|x64'">.\..\..\..\..\..\Build\Win64\VC10\$(Configuration)\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='ICU Release|x64'">$(OutDir)obj\$(ProjectName)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='ICU Release|x64'">false</LinkIncremental>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">xerces-c_3_1D</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">xerces-c_3_1mgD</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='ICU Debug|Win32'">xerces-c_3_1D</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='ICU Release|Win32'">xerces-c_3_1</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">xerces-c_3_1</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">xerces-c_3_1mg</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Static Debug|Win32'">xerces-c_static_3D</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Static Release|Win32'">xerces-c_static_3</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">xerces-c_3_1D</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">xerces-c_3_1mgD</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='ICU Debug|x64'">xerces-c_3_1D</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='ICU Release|x64'">xerces-c_3_1</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">xerces-c_3_1</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">xerces-c_3_1mg</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Static Debug|x64'">xerces-c_static_3D</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Static Release|x64'">xerces-c_static_3</TargetName>
</PropertyGroup>
@@ -225,7 +225,7 @@
<Link>
<AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
<AdditionalDependencies>ws2_32.lib;advapi32.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(TargetPath)</OutputFile>
+ <OutputFile>$(OutDir)\xerces-c_3_1mg.dll</OutputFile>
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)xerces-c_3_1.fullpdb</ProgramDatabaseFile>
@@ -239,7 +239,7 @@
<RandomizedBaseAddress>false</RandomizedBaseAddress>
<DataExecutionPrevention>
</DataExecutionPrevention>
- <ImportLibrary>$(OutDir)xerces-c_3.lib</ImportLibrary>
+ <ImportLibrary>$(OutDir)\xerces-c_3mg.lib</ImportLibrary>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -271,7 +271,7 @@
</ResourceCompile>
<Link>
<AdditionalDependencies>ws2_32.lib;advapi32.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(TargetPath)</OutputFile>
+ <OutputFile>$(OutDir)\xerces-c_3_1mg.dll</OutputFile>
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)xerces-c_3_1.fullpdb</ProgramDatabaseFile>
@@ -285,7 +285,7 @@
<RandomizedBaseAddress>false</RandomizedBaseAddress>
<DataExecutionPrevention>
</DataExecutionPrevention>
- <ImportLibrary>$(OutDir)xerces-c_3.lib</ImportLibrary>
+ <ImportLibrary>$(OutDir)\xerces-c_3mg.lib</ImportLibrary>
<TargetMachine>MachineX64</TargetMachine>
</Link>
</ItemDefinitionGroup>
@@ -318,7 +318,7 @@
<Link>
<AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
<AdditionalDependencies>ws2_32.lib;advapi32.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(TargetPath)</OutputFile>
+ <OutputFile>$(OutDir)\xerces-c_3_1mgD.dll</OutputFile>
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)xerces-c_3_1D.pdb</ProgramDatabaseFile>
@@ -328,7 +328,7 @@
<RandomizedBaseAddress>false</RandomizedBaseAddress>
<DataExecutionPrevention>
</DataExecutionPrevention>
- <ImportLibrary>$(OutDir)xerces-c_3D.lib</ImportLibrary>
+ <ImportLibrary>$(OutDir)\xerces-c_3mgD.lib</ImportLibrary>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -358,7 +358,7 @@
</ResourceCompile>
<Link>
<AdditionalDependencies>ws2_32.lib;advapi32.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(TargetPath)</OutputFile>
+ <OutputFile>$(OutDir)\xerces-c_3_1mgD.dll</OutputFile>
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)xerces-c_3_1D.pdb</ProgramDatabaseFile>
@@ -368,7 +368,7 @@
<RandomizedBaseAddress>false</RandomizedBaseAddress>
<DataExecutionPrevention>
</DataExecutionPrevention>
- <ImportLibrary>$(OutDir)xerces-c_3D.lib</ImportLibrary>
+ <ImportLibrary>$(OutDir)\xerces-c_3mgD.lib</ImportLibrary>
<TargetMachine>MachineX64</TargetMachine>
</Link>
</ItemDefinitionGroup>
Modified: trunk/MgDev/Oem/geos-2.2.0/VisualStudio/GEOS.vcxproj
===================================================================
--- trunk/MgDev/Oem/geos-2.2.0/VisualStudio/GEOS.vcxproj 2011-05-04 13:36:44 UTC (rev 5739)
+++ trunk/MgDev/Oem/geos-2.2.0/VisualStudio/GEOS.vcxproj 2011-05-05 06:46:37 UTC (rev 5740)
@@ -129,7 +129,7 @@
</PrecompiledHeaderFile>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- <DisableSpecificWarnings>4290;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+ <DisableSpecificWarnings>4290;4251;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<ResourceCompile>
<AdditionalIncludeDirectories>H:\Tools & Projects\Projects\Geos\source\headers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
More information about the mapguide-commits
mailing list