[fdo-commits] r703 - trunk/Providers/GenericRdbms/Src/SchemaMgr

[svn_fdo at osgeo.org]

Author: gavincramer
Date: 2007-01-29 14:54:29 -0500 (Mon, 29 Jan 2007)
New Revision: 703

Modified:
   trunk/Providers/GenericRdbms/Src/SchemaMgr/GrdSchemaMgr.vcproj
   trunk/Providers/GenericRdbms/Src/SchemaMgr/RdbmsOverrides.vcproj
Log:
Port FDO200, FDO261, FDO262, FDO300, FDO319 from 3.2.x to trunk

Modified: trunk/Providers/GenericRdbms/Src/SchemaMgr/GrdSchemaMgr.vcproj
===================================================================
--- trunk/Providers/GenericRdbms/Src/SchemaMgr/GrdSchemaMgr.vcproj	2007-01-29 19:53:47 UTC (rev 702)
+++ trunk/Providers/GenericRdbms/Src/SchemaMgr/GrdSchemaMgr.vcproj	2007-01-29 19:54:29 UTC (rev 703)
@@ -183,14 +183,14 @@
 				AdditionalIncludeDirectories="..\..\..\Oracle;$(FDO)\Unmanaged\inc;$(FDO)\Unmanaged;$(FDOUTILITIES)\SchemaMgr\inc;..\..;..\..\inc;..\..\inc\fdo;$(FDOUTILITIES)\Common\inc"
 				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;FDORDBMS_EXPORTS;_CRT_SECURE_NO_DEPRECATE"
 				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
+				BasicRuntimeChecks="0"
 				RuntimeLibrary="3"
 				TreatWChar_tAsBuiltInType="true"
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
+				DebugInformationFormat="3"
 				ShowIncludes="false"
 			/>
 			<Tool

Modified: trunk/Providers/GenericRdbms/Src/SchemaMgr/RdbmsOverrides.vcproj
===================================================================
--- trunk/Providers/GenericRdbms/Src/SchemaMgr/RdbmsOverrides.vcproj	2007-01-29 19:53:47 UTC (rev 702)
+++ trunk/Providers/GenericRdbms/Src/SchemaMgr/RdbmsOverrides.vcproj	2007-01-29 19:54:29 UTC (rev 703)
@@ -44,7 +44,7 @@
 				AdditionalIncludeDirectories="$(FDO)\Unmanaged\inc;$(FDO)\Unmanaged;..\..\inc;..\..\inc\fdo;$(FDOUTILITIES)\SchemaMgr\Inc"
 				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;FDORDBMS_OV_EXPORTS;_CRT_SECURE_NO_DEPRECATE"
 				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
+				BasicRuntimeChecks="0"
 				RuntimeLibrary="3"
 				TreatWChar_tAsBuiltInType="true"
 				RuntimeTypeInfo="true"
@@ -52,7 +52,7 @@
 				ProgramDataBaseFileName="$(IntDir)/vc70.pdb"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
+				DebugInformationFormat="3"
 				ShowIncludes="false"
 			/>
 			<Tool
@@ -67,8 +67,9 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalOptions="/fixed:no"
 				AdditionalDependencies="FDO.lib FDOGeometry.lib FDOSpatial.lib FDOCommon.lib SchemaMgr_OVNew.lib"
-				LinkIncremental="2"
+				LinkIncremental="1"
 				AdditionalLibraryDirectories="&quot;$(FDO)\Unmanaged\Lib\Win32\Debug&quot;;&quot;$(FDOUTILITIES)\SchemaMgr\Lib\Win32\Debug&quot;"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)/$(ProjectName).pdb"