[mapguide-commits] r6303 - in sandbox/adsk/vik/Common: Foundation Geometry

[svn_mapguide at osgeo.org]

Author: traianstanev
Date: 2011-12-07 19:03:32 -0800 (Wed, 07 Dec 2011)
New Revision: 6303

Modified:
   sandbox/adsk/vik/Common/Foundation/Foundation.vcxproj
   sandbox/adsk/vik/Common/Geometry/Geometry.vcxproj
Log:
Remove link to Geos.lib.
Remove reference to PreBuild_Mentor, as Mentor now builds as part of the solution.

Modified: sandbox/adsk/vik/Common/Foundation/Foundation.vcxproj
===================================================================
--- sandbox/adsk/vik/Common/Foundation/Foundation.vcxproj	2011-12-07 05:06:29 UTC (rev 6302)
+++ sandbox/adsk/vik/Common/Foundation/Foundation.vcxproj	2011-12-08 03:03:32 UTC (rev 6303)
@@ -365,12 +365,6 @@
   <ItemGroup>
     <ResourceCompile Include="Foundation.rc" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\Server\src\PreBuild\PreBuild_Mentor.vcxproj">
-      <Project>{a621c011-61bf-43a8-9d80-bc35858ddcfa}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>

Modified: sandbox/adsk/vik/Common/Geometry/Geometry.vcxproj
===================================================================
--- sandbox/adsk/vik/Common/Geometry/Geometry.vcxproj	2011-12-07 05:06:29 UTC (rev 6302)
+++ sandbox/adsk/vik/Common/Geometry/Geometry.vcxproj	2011-12-08 03:03:32 UTC (rev 6303)
@@ -101,7 +101,7 @@
       <PrecompiledHeader>Use</PrecompiledHeader>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>csmapd.lib;GEOSd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>csmapd.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)MgGeometryd.dll</OutputFile>
       <AdditionalLibraryDirectories>..\..\Oem\CsMap\lib100\Debug;..\..\Oem\geos-2.2.0\VisualStudio\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -129,7 +129,7 @@
       <PrecompiledHeader>Use</PrecompiledHeader>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>csmapd.lib;GEOSd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>csmapd.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)MgGeometryd.dll</OutputFile>
       <AdditionalLibraryDirectories>..\..\Oem\CsMap\lib100\Debug64;..\..\Oem\geos-2.2.0\VisualStudio\Debug64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -152,7 +152,7 @@
       <PrecompiledHeader>Use</PrecompiledHeader>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>csmap.lib;GEOS.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>csmap.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)MgGeometry.dll</OutputFile>
       <AdditionalLibraryDirectories>..\..\Oem\CsMap\lib100\Release;..\..\Oem\geos-2.2.0\VisualStudio\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -180,7 +180,7 @@
       <PrecompiledHeader>Use</PrecompiledHeader>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>csmap.lib;GEOS.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>csmap.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)MgGeometry.dll</OutputFile>
       <AdditionalLibraryDirectories>..\..\Oem\CsMap\lib100\Release64;..\..\Oem\geos-2.2.0\VisualStudio\Release64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>