[fdo-commits] r683 - in trunk/Utilities: Common SchemaMgr

[svn_fdo at osgeo.org]

Author: gavincramer
Date: 2007-01-29 14:47:28 -0500 (Mon, 29 Jan 2007)
New Revision: 683

Modified:
   trunk/Utilities/Common/FdoCommon.vcproj
   trunk/Utilities/SchemaMgr/LogicalPhysical.vcproj
   trunk/Utilities/SchemaMgr/Overrides.vcproj
   trunk/Utilities/SchemaMgr/Physical.vcproj
   trunk/Utilities/SchemaMgr/SchemaMgr.vcproj
   trunk/Utilities/SchemaMgr/SmMessage.vcproj
Log:
Port FDO200, FDO261, FDO262, FDO300, FDO319 from 3.2.x to trunk

Modified: trunk/Utilities/Common/FdoCommon.vcproj
===================================================================
--- trunk/Utilities/Common/FdoCommon.vcproj	2007-01-29 19:46:03 UTC (rev 682)
+++ trunk/Utilities/Common/FdoCommon.vcproj	2007-01-29 19:47:28 UTC (rev 683)
@@ -42,9 +42,9 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="inc;$(FDO)\Unmanaged\inc;$(FDO)\Unmanaged\Src\common"
-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;GISPATIAL_STATIC;_CRT_SECURE_NO_DEPRECATE"
+				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;GISPATIAL_STATIC;_CRT_SECURE_NO_DEPRECATE;HAVE_GEOM_INFO_TYPE"
 				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
+				BasicRuntimeChecks="0"
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				TreatWChar_tAsBuiltInType="true"
@@ -53,7 +53,7 @@
 				UsePrecompiledHeader="2"
 				WarningLevel="4"
 				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
+				DebugInformationFormat="3"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -115,7 +115,7 @@
 				InlineFunctionExpansion="1"
 				OmitFramePointers="true"
 				AdditionalIncludeDirectories="inc;$(FDO)\Unmanaged\inc;$(FDO)\Unmanaged\Src\common"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE"
+				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;HAVE_GEOM_INFO_TYPE"
 				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"

Modified: trunk/Utilities/SchemaMgr/LogicalPhysical.vcproj
===================================================================
--- trunk/Utilities/SchemaMgr/LogicalPhysical.vcproj	2007-01-29 19:46:03 UTC (rev 682)
+++ trunk/Utilities/SchemaMgr/LogicalPhysical.vcproj	2007-01-29 19:47:28 UTC (rev 683)
@@ -45,14 +45,14 @@
 				AdditionalIncludeDirectories="&quot;$(FDO)\Unmanaged\Inc&quot;;&quot;$(FDO)\Unmanaged&quot;;Inc;&quot;$(FDOUTILITIES)\Common\Inc&quot;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_AFXDLL"
 				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
+				BasicRuntimeChecks="0"
 				RuntimeLibrary="3"
 				TreatWChar_tAsBuiltInType="true"
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
+				DebugInformationFormat="3"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"

Modified: trunk/Utilities/SchemaMgr/Overrides.vcproj
===================================================================
--- trunk/Utilities/SchemaMgr/Overrides.vcproj	2007-01-29 19:46:03 UTC (rev 682)
+++ trunk/Utilities/SchemaMgr/Overrides.vcproj	2007-01-29 19:47:28 UTC (rev 683)
@@ -45,14 +45,14 @@
 				AdditionalIncludeDirectories="&quot;$(FDO)\Unmanaged\Inc&quot;;&quot;$(FDO)\Unmanaged&quot;;Inc;&quot;$(FDOUTILITIES)\Common\Inc&quot;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_AFXDLL"
 				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
+				BasicRuntimeChecks="0"
 				RuntimeLibrary="3"
 				TreatWChar_tAsBuiltInType="true"
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
+				DebugInformationFormat="3"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"

Modified: trunk/Utilities/SchemaMgr/Physical.vcproj
===================================================================
--- trunk/Utilities/SchemaMgr/Physical.vcproj	2007-01-29 19:46:03 UTC (rev 682)
+++ trunk/Utilities/SchemaMgr/Physical.vcproj	2007-01-29 19:47:28 UTC (rev 683)
@@ -52,7 +52,7 @@
 				UsePrecompiledHeader="2"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
+				DebugInformationFormat="3"
 				CompileAs="0"
 				ShowIncludes="false"
 			/>

Modified: trunk/Utilities/SchemaMgr/SchemaMgr.vcproj
===================================================================
--- trunk/Utilities/SchemaMgr/SchemaMgr.vcproj	2007-01-29 19:46:03 UTC (rev 682)
+++ trunk/Utilities/SchemaMgr/SchemaMgr.vcproj	2007-01-29 19:47:28 UTC (rev 683)
@@ -44,14 +44,14 @@
 				AdditionalIncludeDirectories="&quot;$(FDO)\Unmanaged\Inc&quot;;&quot;$(FDO)\Unmanaged&quot;;Inc;&quot;$(FDOUTILITIES)\Common\Inc&quot;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_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/Utilities/SchemaMgr/SmMessage.vcproj
===================================================================
--- trunk/Utilities/SchemaMgr/SmMessage.vcproj	2007-01-29 19:46:03 UTC (rev 682)
+++ trunk/Utilities/SchemaMgr/SmMessage.vcproj	2007-01-29 19:47:28 UTC (rev 683)
@@ -148,7 +148,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				IgnoreImportLibrary="true"
-				AdditionalOptions="/MACHINE:I386"
+				AdditionalOptions="/MACHINE:I386 /fixed:no"
 				AdditionalDependencies="odbc32.lib odbccp32.lib"
 				OutputFile="$(OutDir)/$(ProjectName).dll"
 				LinkIncremental="1"