Build Version : T2.1.0.14270 Firebird 2.1 Unstable (writeBuildNum.sh,v 1.14425 2006/10/31 12:03:44 dimitr Exp ) Update of /cvsroot/firebird/firebird2/builds/win32/msvc8 In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv26954 Modified Files: alice.vcproj alice_classic.vcproj burp.vcproj burp_classic.vcproj common.vcproj common_classic.vcproj config.vcproj dsql_server.vcproj dsql_server_classic.vcproj engine.vcproj engine_classic.vcproj engine_embed.vcproj fb_inet_server.vcproj fb_lock_print.vcproj fbclient.vcproj fbembed.vcproj fbguard.vcproj fbserver.vcproj fbudf.vcproj gbak.vcproj gdef.vcproj gds32.vcproj gfix.vcproj gpre.vcproj gpre_boot.vcproj gsec.vcproj gsplit.vcproj gstat.vcproj ib_udf.vcproj ib_util.vcproj instclient.vcproj instreg.vcproj instsvc.vcproj intl.vcproj isql.vcproj lock.vcproj lock_classic.vcproj nbackup.vcproj qli.vcproj remote.vcproj remote_classic.vcproj utilities.vcproj utilities_classic.vcproj utilities_embed.vcproj Log Message: Changed the optimization mode. This is required because MS has deprecated /Og. Index: alice.vcproj =================================================================== RCS file: /cvsroot/firebird/firebird2/builds/win32/msvc8/alice.vcproj,v retrieving revision 1.2 retrieving revision 1.3 diff -b -U3 -r1.2 -r1.3 --- alice.vcproj 31 Oct 2006 10:09:41 -0000 1.2 +++ alice.vcproj 31 Oct 2006 12:03:38 -0000 1.3 @@ -44,7 +44,7 @@ <Tool Name="VCCLCompilerTool" AdditionalOptions="/EHsc-" - Optimization="4" + Optimization="2" InlineFunctionExpansion="1" EnableIntrinsicFunctions="true" FavorSizeOrSpeed="1" @@ -124,7 +124,7 @@ <Tool Name="VCCLCompilerTool" AdditionalOptions="/EHsc-" - Optimization="4" + Optimization="2" InlineFunctionExpansion="1" EnableIntrinsicFunctions="true" FavorSizeOrSpeed="1" @@ -426,4 +426,6 @@ </File> </Filter> </Files> + <Globals> + </Globals> </VisualStudioProject> Index: alice_classic.vcproj =================================================================== RCS file: /cvsroot/firebird/firebird2/builds/win32/msvc8/alice_classic.vcproj,v retrieving revision 1.2 retrieving revision 1.3 diff -b -U3 -r1.2 -r1.3 --- alice_classic.vcproj 31 Oct 2006 10:09:41 -0000 1.2 +++ alice_classic.vcproj 31 Oct 2006 12:03:38 -0000 1.3 @@ -44,7 +44,7 @@ <Tool Name="VCCLCompilerTool" AdditionalOptions="/EHsc-" - Optimization="4" + Optimization="2" InlineFunctionExpansion="1" EnableIntrinsicFunctions="true" FavorSizeOrSpeed="1" @@ -96,9 +96,9 @@ /> </Configuration> <Configuration - Name="Debug|Win32" - OutputDirectory="..\..\..\temp\debug\alice_cs" - IntermediateDirectory="..\..\..\temp\debug\alice_cs" + Name="Release|x64" + OutputDirectory="$(PlatformName)\$(ConfigurationName)" + IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="4" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" UseOfMFC="0" @@ -119,21 +119,25 @@ /> <Tool Name="VCMIDLTool" + TargetEnvironment="3" /> <Tool Name="VCCLCompilerTool" AdditionalOptions="/EHsc-" - Optimization="0" + Optimization="2" + InlineFunctionExpansion="1" + EnableIntrinsicFunctions="true" + FavorSizeOrSpeed="1" + OmitFramePointers="true" AdditionalIncludeDirectories="../../../src/include,../../../src/include/gen" - PreprocessorDefinitions="_DEBUG,_LIB,WIN32,DEV_BUILD" + PreprocessorDefinitions="NDEBUG,_LIB,WIN32" ExceptionHandling="0" - BasicRuntimeChecks="3" - RuntimeLibrary="3" + RuntimeLibrary="2" RuntimeTypeInfo="false" - PrecompiledHeaderFile="..\..\..\temp\debug\alice_cs/alice_classic.pch" - AssemblerListingLocation="..\..\..\temp\debug\alice_cs/" - ObjectFile="..\..\..\temp\debug\alice_cs/" - ProgramDataBaseFileName="..\..\..\temp\debug\alice_cs/" + PrecompiledHeaderFile="..\..\..\temp\release\alice_cs/alice_classic.pch" + AssemblerListingLocation="..\..\..\temp\release\alice_cs/" + ObjectFile="..\..\..\temp\release\alice_cs/" + ProgramDataBaseFileName="..\..\..\temp\release\alice_cs/" WarningLevel="3" SuppressStartupBanner="true" DebugInformationFormat="3" @@ -152,7 +156,7 @@ /> <Tool Name="VCLibrarianTool" - OutputFile="..\..\..\temp\debug\alice_cs\alice.lib" + OutputFile="..\..\..\temp\release\alice_cs\alice.lib" SuppressStartupBanner="true" /> <Tool @@ -172,9 +176,9 @@ /> </Configuration> <Configuration - Name="Release|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" + Name="Debug|Win32" + OutputDirectory="..\..\..\temp\debug\alice_cs" + IntermediateDirectory="..\..\..\temp\debug\alice_cs" ConfigurationType="4" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" UseOfMFC="0" @@ -195,25 +199,21 @@ /> <Tool Name="VCMIDLTool" - TargetEnvironment="3" /> <Tool Name="VCCLCompilerTool" AdditionalOptions="/EHsc-" - Optimization="4" - InlineFunctionExpansion="1" - EnableIntrinsicFunctions="true" - FavorSizeOrSpeed="1" - OmitFramePointers="true" + Optimization="0" AdditionalIncludeDirectories="../../../src/include,../../../src/include/gen" - PreprocessorDefinitions="NDEBUG,_LIB,WIN32" + PreprocessorDefinitions="_DEBUG,_LIB,WIN32,DEV_BUILD" ExceptionHandling="0" - RuntimeLibrary="2" + BasicRuntimeChecks="3" + RuntimeLibrary="3" RuntimeTypeInfo="false" - PrecompiledHeaderFile="..\..\..\temp\release\alice_cs/alice_classic.pch" - AssemblerListingLocation="..\..\..\temp\release\alice_cs/" - ObjectFile="..\..\..\temp\release\alice_cs/" - ProgramDataBaseFileName="..\..\..\temp\release\alice_cs/" + PrecompiledHeaderFile="..\..\..\temp\debug\alice_cs/alice_classic.pch" + AssemblerListingLocation="..\..\..\temp\debug\alice_cs/" + ObjectFile="..\..\..\temp\debug\alice_cs/" + ProgramDataBaseFileName="..\..\..\temp\debug\alice_cs/" WarningLevel="3" SuppressStartupBanner="true" DebugInformationFormat="3" @@ -232,7 +232,7 @@ /> <Tool Name="VCLibrarianTool" - OutputFile="..\..\..\temp\release\alice_cs\alice.lib" + OutputFile="..\..\..\temp\debug\alice_cs\alice.lib" SuppressStartupBanner="true" /> <Tool Index: burp.vcproj =================================================================== RCS file: /cvsroot/firebird/firebird2/builds/win32/msvc8/burp.vcproj,v retrieving revision 1.2 retrieving revision 1.3 diff -b -U3 -r1.2 -r1.3 --- burp.vcproj 31 Oct 2006 10:09:41 -0000 1.2 +++ burp.vcproj 31 Oct 2006 12:03:38 -0000 1.3 @@ -44,7 +44,7 @@ <Tool Name="VCCLCompilerTool" AdditionalOptions="/EHsc-" - Optimization="4" + Optimization="2" InlineFunctionExpansion="1" EnableIntrinsicFunctions="true" FavorSizeOrSpeed="1" @@ -124,7 +124,7 @@ <Tool Name="VCCLCompilerTool" AdditionalOptions="/EHsc-" - Optimization="4" + Optimization="2" InlineFunctionExpansion="1" EnableIntrinsicFunctions="true" FavorSizeOrSpeed="1" @@ -417,4 +417,6 @@ </File> </Filter> </Files> + <Globals> + </Globals> </VisualStudioProject> Index: burp_classic.vcproj =================================================================== RCS file: /cvsroot/firebird/firebird2/builds/win32/msvc8/burp_classic.vcproj,v retrieving revision 1.2 retrieving revision 1.3 diff -b -U3 -r1.2 -r1.3 --- burp_classic.vcproj 31 Oct 2006 10:09:41 -0000 1.2 +++ burp_classic.vcproj 31 Oct 2006 12:03:38 -0000 1.3 @@ -44,7 +44,7 @@ <Tool Name="VCCLCompilerTool" AdditionalOptions="/EHsc-" - Optimization="4" + Optimization="2" InlineFunctionExpansion="1" EnableIntrinsicFunctions="true" FavorSizeOrSpeed="1" @@ -96,9 +96,9 @@ /> </Configuration> <Configuration - Name="Debug|Win32" - OutputDirectory="..\..\..\temp\debug\burp_cs" - IntermediateDirectory="..\..\..\temp\debug\burp_cs" + Name="Release|x64" + OutputDirectory="$(PlatformName)\$(ConfigurationName)" + IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="4" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" UseOfMFC="0" @@ -119,21 +119,25 @@ /> <Tool Name="VCMIDLTool" + TargetEnvironment="3" /> <Tool Name="VCCLCompilerTool" AdditionalOptions="/EHsc-" - Optimization="0" + Optimization="2" + InlineFunctionExpansion="1" + EnableIntrinsicFunctions="true" + FavorSizeOrSpeed="1" + OmitFramePointers="true" AdditionalIncludeDirectories="../../../src/include,../../../src/include/gen" - PreprocessorDefinitions="_DEBUG,_LIB,WIN32,DEV_BUILD" + PreprocessorDefinitions="NDEBUG,_LIB,WIN32" ExceptionHandling="0" - BasicRuntimeChecks="3" - RuntimeLibrary="3" + RuntimeLibrary="2" RuntimeTypeInfo="false" - PrecompiledHeaderFile="..\..\..\temp\debug\burp_cs/burp_classic.pch" - AssemblerListingLocation="..\..\..\temp\debug\burp_cs/" - ObjectFile="..\..\..\temp\debug\burp_cs/" - ProgramDataBaseFileName="..\..\..\temp\debug\burp_cs/" + PrecompiledHeaderFile="..\..\..\temp\release\burp_cs/burp_classic.pch" + AssemblerListingLocation="..\..\..\temp\release\burp_cs/" + ObjectFile="..\..\..\temp\release\burp_cs/" + ProgramDataBaseFileName="..\..\..\temp\release\burp_cs/" WarningLevel="3" SuppressStartupBanner="true" DebugInformationFormat="3" @@ -152,7 +156,7 @@ /> <Tool Name="VCLibrarianTool" - OutputFile="..\..\..\temp\debug\burp_cs\burp.lib" + OutputFile="..\..\..\temp\release\burp_cs\burp.lib" SuppressStartupBanner="true" /> <Tool @@ -172,9 +176,9 @@ /> </Configuration> <Configuration - Name="Release|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" + Name="Debug|Win32" + OutputDirectory="..\..\..\temp\debug\burp_cs" + IntermediateDirectory="..\..\..\temp\debug\burp_cs" ConfigurationType="4" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" UseOfMFC="0" @@ -195,25 +199,21 @@ /> <Tool Name="VCMIDLTool" - TargetEnvironment="3" /> <Tool Name="VCCLCompilerTool" AdditionalOptions="/EHsc-" - Optimization="4" - InlineFunctionExpansion="1" - EnableIntrinsicFunctions="true" - FavorSizeOrSpeed="1" - OmitFramePointers="true" + Optimization="0" AdditionalIncludeDirectories="../../../src/include,../../../src/include/gen" - PreprocessorDefinitions="NDEBUG,_LIB,WIN32" + PreprocessorDefinitions="_DEBUG,_LIB,WIN32,DEV_BUILD" ExceptionHandling="0" - RuntimeLibrary="2" + BasicRuntimeChecks="3" + RuntimeLibrary="3" RuntimeTypeInfo="false" - PrecompiledHeaderFile="..\..\..\temp\release\burp_cs/burp_classic.pch" - AssemblerListingLocation="..\..\..\temp\release\burp_cs/" - ObjectFile="..\..\..\temp\release\burp_cs/" - ProgramDataBaseFileName="..\..\..\temp\release\burp_cs/" + PrecompiledHeaderFile="..\..\..\temp\debug\burp_cs/burp_classic.pch" + AssemblerListingLocation="..\..\..\temp\debug\burp_cs/" + ObjectFile="..\..\..\temp\debug\burp_cs/" + ProgramDataBaseFileName="..\..\..\temp\debug\burp_cs/" WarningLevel="3" SuppressStartupBanner="true" DebugInformationFormat="3" @@ -232,7 +232,7 @@ /> <Tool Name="VCLibrarianTool" - OutputFile="..\..\..\temp\release\burp_cs\burp.lib" + OutputFile="..\..\..\temp\debug\burp_cs\burp.lib" SuppressStartupBanner="true" /> <Tool Index: common.vcproj =================================================================== RCS file: /cvsroot/firebird/firebird2/builds/win32/msvc8/common.vcproj,v retrieving revision 1.2 retrieving revision 1.3 diff -b -U3 -r1.2 -r1.3 --- common.vcproj 31 Oct 2006 10:09:41 -0000 1.2 +++ common.vcproj 31 Oct 2006 12:03:38 -0000 1.3 @@ -44,7 +44,7 @@ <Tool Name="VCCLCompilerTool" AdditionalOptions="/EHsc-" - Optimization="4" + Optimization="2" InlineFunctionExpansion="1" EnableIntrinsicFunctions="true" FavorSizeOrSpeed="1" @@ -124,7 +124,7 @@ <Tool Name="VCCLCompilerTool" AdditionalOptions="/EHsc-" - Optimization="4" + Optimization="2" InlineFunctionExpansion="1" EnableIntrinsicFunctions="true" FavorSizeOrSpeed="1" @@ -493,4 +493,6 @@ </File> </Filter> </Files> + <Globals> + </Globals> </VisualStudioProject> Index: common_classic.vcproj =================================================================== RCS file: /cvsroot/firebird/firebird2/builds/win32/msvc8/common_classic.vcproj,v retrieving revision 1.2 retrieving revision 1.3 diff -b -U3 -r1.2 -r1.3 --- common_classic.vcproj 31 Oct 2006 10:09:41 -0000 1.2 +++ common_classic.vcproj 31 Oct 2006 12:03:38 -0000 1.3 @@ -94,9 +94,9 @@ /> </Configuration> <Configuration - Name="Release|Win32" - OutputDirectory="..\..\..\temp\release\common_cs" - IntermediateDirectory="..\..\..\temp\release\common_cs" + Name="Debug|x64" + OutputDirectory="$(PlatformName)\$(ConfigurationName)" + IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="4" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" UseOfMFC="0" @@ -117,26 +117,26 @@ /> <Tool Name="VCMIDLTool" + TargetEnvironment="3" /> <Tool Name="VCCLCompilerTool" AdditionalOptions="/EHsc-" - Optimization="4" - InlineFunctionExpansion="1" - EnableIntrinsicFunctions="true" - FavorSizeOrSpeed="1" - OmitFramePointers="true" + Optimization="0" AdditionalIncludeDirectories="../../../src/include,../../../src/include/gen" - PreprocessorDefinitions="WIN32,NDEBUG,_LIB" + PreprocessorDefinitions="WIN32,_DEBUG,_LIB,DEV_BUILD" ExceptionHandling="0" - RuntimeLibrary="2" + BasicRuntimeChecks="3" + RuntimeLibrary="3" RuntimeTypeInfo="false" - PrecompiledHeaderFile="..\..\..\temp\release\common_cs/common_classic.pch" - AssemblerListingLocation="..\..\..\temp\release\common_cs/" - ObjectFile="..\..\..\temp\release\common_cs/" - ProgramDataBaseFileName="..\..\..\temp\release\common_cs/" + UsePrecompiledHeader="0" + PrecompiledHeaderFile="..\..\..\temp\debug\common_cs/common_classic.pch" + AssemblerListingLocation="..\..\..\temp\debug\common_cs/" + ObjectFile="..\..\..\temp\debug\common_cs/" + ProgramDataBaseFileName="..\..\..\temp\debug\common_cs/" WarningLevel="3" SuppressStartupBanner="true" + Detect64BitPortabilityProblems="true" DebugInformationFormat="3" CompileAs="0" /> @@ -153,7 +153,7 @@ /> <Tool Name="VCLibrarianTool" - OutputFile="..\..\..\temp\release\common_cs\common_classic.lib" + OutputFile="..\..\..\temp\debug\common_cs\common_classic.lib" SuppressStartupBanner="true" /> <Tool @@ -173,9 +173,9 @@ /> </Configuration> <Configuration - Name="Debug|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" + Name="Release|Win32" + OutputDirectory="..\..\..\temp\release\common_cs" + IntermediateDirectory="..\..\..\temp\release\common_cs" ConfigurationType="4" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" UseOfMFC="0" @@ -196,26 +196,26 @@ /> <Tool Name="VCMIDLTool" - TargetEnvironment="3" /> <Tool Name="VCCLCompilerTool" AdditionalOptions="/EHsc-" - Optimization="0" + Optimization="2" + InlineFunctionExpansion="1" + EnableIntrinsicFunctions="true" + FavorSizeOrSpeed="1" + OmitFramePointers="true" AdditionalIncludeDirectories="../../../src/include,../../../src/include/gen" - PreprocessorDefinitions="WIN32,_DEBUG,_LIB,DEV_BUILD" + PreprocessorDefinitions="WIN32,NDEBUG,_LIB" ExceptionHandling="0" - BasicRuntimeChecks="3" - RuntimeLibrary="3" + RuntimeLibrary="2" RuntimeTypeInfo="false" - UsePrecompiledHeader="0" - PrecompiledHeaderFile="..\..\..\temp\debug\common_cs/common_classic.pch" - AssemblerListingLocation="..\..\..\temp\debug\common_cs/" - ObjectFile="..\..\..\temp\debug\common_cs/" - ProgramDataBaseFileName="..\..\..\temp\debug\common_cs/" + PrecompiledHeaderFile="..\..\..\temp\release\common_cs/common_classic.pch" + AssemblerListingLocation="..\..\..\temp\release\common_cs/" + ObjectFile="..\..\..\temp\release\common_cs/" + ProgramDataBaseFileName="..\..\..\temp\release\common_cs/" WarningLevel="3" SuppressStartupBanner="true" - Detect64BitPortabilityProblems="true" DebugInformationFormat="3" CompileAs="0" /> @@ -232,7 +232,7 @@ /> <Tool Name="VCLibrarianTool" - OutputFile="..\..\..\temp\debug\common_cs\common_classic.lib" + OutputFile="..\..\..\temp\release\common_cs\common_classic.lib" SuppressStartupBanner="true" /> <Tool @@ -280,7 +280,7 @@ <Tool Name="VCCLCompilerTool" AdditionalOptions="/EHsc-" - Optimization="4" + Optimization="2" InlineFunctionExpansion="1" EnableIntrinsicFunctions="true" FavorSizeOrSpeed="1" Index: config.vcproj =================================================================== RCS file: /cvsroot/firebird/firebird2/builds/win32/msvc8/config.vcproj,v retrieving revision 1.2 retrieving revision 1.3 diff -b -U3 -r1.2 -r1.3 --- config.vcproj 31 Oct 2006 10:09:41 -0000 1.2 +++ config.vcproj 31 Oct 2006 12:03:38 -0000 1.3 @@ -44,7 +44,7 @@ <Tool Name="VCCLCompilerTool" AdditionalOptions="/EHsc-" - Optimization="4" + Optimization="2" InlineFunctionExpansion="1" EnableIntrinsicFunctions="true" FavorSizeOrSpeed="1" @@ -96,9 +96,9 @@ /> </Configuration> <Configuration - Name="Debug|Win32" - OutputDirectory="..\..\..\temp\debug\config" - IntermediateDirectory="..\..\..\temp\debug\config" + Name="Release|x64" + OutputDirectory="$(PlatformName)\$(ConfigurationName)" + IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="4" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" UseOfMFC="0" @@ -119,22 +119,25 @@ /> <Tool Name="VCMIDLTool" + TargetEnvironment="3" /> <Tool Name="VCCLCompilerTool" AdditionalOptions="/EHsc-" - Optimization="0" + Optimization="2" + InlineFunctionExpansion="1" + EnableIntrinsicFunctions="true" + FavorSizeOrSpeed="1" + OmitFramePointers="true" AdditionalIncludeDirectories="../../../src/include;../../../src/include/gen;../../../src/jrd;../../../src/vulcan" - PreprocessorDefinitions="WIN32;_DEBUG;_LIB;DEV_BUILD;NAMESPACE=Vulcan" + PreprocessorDefinitions="WIN32,NDEBUG,_LIB;NAMESPACE=Vulcan" ExceptionHandling="0" - BasicRuntimeChecks="3" - RuntimeLibrary="3" + RuntimeLibrary="2" RuntimeTypeInfo="false" - UsePrecompiledHeader="0" - PrecompiledHeaderFile="..\..\..\temp\debug\config/config.pch" - AssemblerListingLocation="..\..\..\temp\debug\config/" - ObjectFile="..\..\..\temp\debug\config/" - ProgramDataBaseFileName="..\..\..\temp\debug\config/" + PrecompiledHeaderFile="..\..\..\temp\release\config/common.pch" + AssemblerListingLocation="..\..\..\temp\release\config/" + ObjectFile="..\..\..\temp\release\config/" + ProgramDataBaseFileName="..\..\..\temp\release\config/" WarningLevel="3" SuppressStartupBanner="true" DebugInformationFormat="3" @@ -153,7 +156,7 @@ /> <Tool Name="VCLibrarianTool" - OutputFile="..\..\..\temp\debug\config\config.lib" + OutputFile="..\..\..\temp\release\config\common.lib" SuppressStartupBanner="true" /> <Tool @@ -173,9 +176,9 @@ /> </Configuration> <Configuration - Name="Release|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" + Name="Debug|Win32" + OutputDirectory="..\..\..\temp\debug\config" + IntermediateDirectory="..\..\..\temp\debug\config" ConfigurationType="4" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" UseOfMFC="0" @@ -196,25 +199,22 @@ /> <Tool Name="VCMIDLTool" - TargetEnvironment="3" /> <Tool Name="VCCLCompilerTool" AdditionalOptions="/EHsc-" - Optimization="4" - InlineFunctionExpansion="1" - EnableIntrinsicFunctions="true" - FavorSizeOrSpeed="1" - OmitFramePointers="true" + Optimization="0" AdditionalIncludeDirectories="../../../src/include;../../../src/include/gen;../../../src/jrd;../../../src/vulcan" - PreprocessorDefinitions="WIN32,NDEBUG,_LIB;NAMESPACE=Vulcan" + PreprocessorDefinitions="WIN32;_DEBUG;_LIB;DEV_BUILD;NAMESPACE=Vulcan" ExceptionHandling="0" - RuntimeLibrary="2" + BasicRuntimeChecks="3" + RuntimeLibrary="3" RuntimeTypeInfo="false" - PrecompiledHeaderFile="..\..\..\temp\release\config/common.pch" - AssemblerListingLocation="..\..\..\temp\release\config/" - ObjectFile="..\..\..\temp\release\config/" - ProgramDataBaseFileName="..\..\..\temp\release\config/" + UsePrecompiledHeader="0" + PrecompiledHeaderFile="..\..\..\temp\debug\config/config.pch" + AssemblerListingLocation="..\..\..\temp\debug\config/" + ObjectFile="..\..\..\temp\debug\config/" + ProgramDataBaseFileName="..\..\..\temp\debug\config/" WarningLevel="3" SuppressStartupBanner="true" DebugInformationFormat="3" @@ -233,7 +233,7 @@ /> <Tool Name="VCLibrarianTool" - OutputFile="..\..\..\temp\release\config\common.lib" + OutputFile="..\..\..\temp\debug\config\config.lib" SuppressStartupBanner="true" /> <Tool Index: dsql_server.vcproj =================================================================== RCS file: /cvsroot/firebird/firebird2/builds/win32/msvc8/dsql_server.vcproj,v retrieving revision 1.2 retrieving revision 1.3 diff -b -U3 -r1.2 -r1.3 --- dsql_server.vcproj 31 Oct 2006 10:09:41 -0000 1.2 +++ dsql_server.vcproj 31 Oct 2006 12:03:38 -0000 1.3 @@ -44,7 +44,7 @@ <Tool Name="VCCLCompilerTool" AdditionalOptions="/EHsc-" - Optimization="4" + Optimization="2" InlineFunctionExpansion="1" EnableIntrinsicFunctions="true" FavorSizeOrSpeed="1" @@ -124,7 +124,7 @@ <Tool Name="VCCLCompilerTool" AdditionalOptions="/EHsc-" - Optimization="4" + Optimization="2" InlineFunctionExpansion="1" EnableIntrinsicFunctions="true" FavorSizeOrSpeed="1" @@ -550,4 +550,6 @@ > </File> </Files> + <Globals> + </Globals> </VisualStudioProject> Index: dsql_server_classic.vcproj =================================================================== RCS file: /cvsroot/firebird/firebird2/builds/win32/msvc8/dsql_server_classic.vcproj,v retrieving revision 1.2 retrieving revision 1.3 diff -b -U3 -r1.2 -r1.3 --- dsql_server_classic.vcproj 31 Oct 2006 10:09:41 -0000 1.2 +++ dsql_server_classic.vcproj 31 Oct 2006 12:03:38 -0000 1.3 @@ -44,7 +44,7 @@ <Tool Name="VCCLCompilerTool" AdditionalOptions="/EHsc-" - Optimization="4" + Optimization="2" InlineFunctionExpansion="1" EnableIntrinsicFunctions="true" FavorSizeOrSpeed="1" @@ -96,9 +96,9 @@ /> </Configuration> <Configuration - Name="Debug|Win32" - OutputDirectory="..\..\..\temp\debug\dsql_server_cs" - IntermediateDirectory="..\..\..\temp\debug\dsql_server_cs" + Name="Release|x64" + OutputDirectory="$(PlatformName)\$(ConfigurationName)" + IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="4" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" UseOfMFC="0" @@ -119,21 +119,25 @@ /> <Tool Name="VCMIDLTool" + TargetEnvironment="3" /> <Tool Name="VCCLCompilerTool" AdditionalOptions="/EHsc-" - Optimization="0" + Optimization="2" + InlineFunctionExpansion="1" + EnableIntrinsicFunctions="true" + FavorSizeOrSpeed="1" + OmitFramePointers="true" AdditionalIncludeDirectories="../../../src/include,../../../src/include/gen" - PreprocessorDefinitions="DEBUG;_DEBUG;_LIB;_WINDOWS;WIN32;DEV_BUILD" + PreprocessorDefinitions="NDEBUG,_LIB,_WINDOWS,WIN32" ExceptionHandling="0" - BasicRuntimeChecks="3" - RuntimeLibrary="3" + RuntimeLibrary="2" RuntimeTypeInfo="false" - PrecompiledHeaderFile="..\..\..\temp\debug\dsql_server_cs/dsql_server_classic.pch" - AssemblerListingLocation="..\..\..\temp\debug\dsql_server_cs/" - ObjectFile="..\..\..\temp\debug\dsql_server_cs/" - ProgramDataBaseFileName="..\..\..\temp\debug\dsql_server_cs/" + PrecompiledHeaderFile="..\..\..\temp\release\dsql_server_cs/dsql_server_classic.pch" + AssemblerListingLocation="..\..\..\temp\release\dsql_server_cs/" + ObjectFile="..\..\..\temp\release\dsql_server_cs/" + ProgramDataBaseFileName="..\..\..\temp\release\dsql_server_cs/" WarningLevel="3" SuppressStartupBanner="true" DebugInformationFormat="3" @@ -152,7 +156,7 @@ /> <Tool Name="VCLibrarianTool" - OutputFile="..\..\..\temp\debug\dsql_server_cs\dsql_server.lib" + OutputFile="..\..\..\temp\release\dsql_server_cs\dsql_server.lib" SuppressStartupBanner="true" /> <Tool @@ -172,9 +176,9 @@ /> </Configuration> <Configuration - Name="Release|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" + Name="Debug|Win32" + OutputDirectory="..\..\..\temp\debug\dsql_server_cs" + IntermediateDirectory="..\..\..\temp\debug\dsql_server_cs" ConfigurationType="4" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" UseOfMFC="0" @@ -195,25 +199,21 @@ /> <Tool Name="VCMIDLTool" - TargetEnvironment="3" /> <Tool Name="VCCLCompilerTool" AdditionalOptions="/EHsc-" - Optimization="4" - InlineFunctionExpansion="1" - EnableIntrinsicFunctions="true" - FavorSizeOrSpeed="1" - OmitFramePointers="true" + Optimization="0" AdditionalIncludeDirectories="../../../src/include,../../../src/include/gen" - PreprocessorDefinitions="NDEBUG,_LIB,_WINDOWS,WIN32" + PreprocessorDefinitions="DEBUG;_DEBUG;_LIB;_WINDOWS;WIN32;DEV_BUILD" ExceptionHandling="0" - RuntimeLibrary="2" + BasicRuntimeChecks="3" + RuntimeLibrary="3" RuntimeTypeInfo="false" - PrecompiledHeaderFile="..\..\..\temp\release\dsql_server_cs/dsql_server_classic.pch" - AssemblerListingLocation="..\..\..\temp\release\dsql_server_cs/" - ObjectFile="..\..\..\temp\release\dsql_server_cs/" - ProgramDataBaseFileName="..\..\..\temp\release\dsql_server_cs/" + PrecompiledHeaderFile="..\..\..\temp\debug\dsql_server_cs/dsql_server_classic.pch" + AssemblerListingLocation="..\..\..\temp\debug\dsql_server_cs/" + ObjectFile="..\..\..\temp\debug\dsql_server_cs/" + ProgramDataBaseFileName="..\..\..\temp\debug\dsql_server_cs/" WarningLevel="3" SuppressStartupBanner="true" DebugInformationFormat="3" @@ -232,7 +232,7 @@ /> <Tool Name="VCLibrarianTool" - OutputFile="..\..\..\temp\release\dsql_server_cs\dsql_server.lib" + OutputFile="..\..\..\temp\debug\dsql_server_cs\dsql_server.lib" SuppressStartupBanner="true" /> <Tool Index: engine.vcproj =================================================================== RCS file: /cvsroot/firebird/firebird2/builds/win32/msvc8/engine.vcproj,v retrieving revision 1.6 retrieving revision 1.7 diff -b -U3 -r1.6 -r1.7 --- engine.vcproj 31 Oct 2006 10:09:41 -0000 1.6 +++ engine.vcproj 31 Oct 2006 12:03:38 -0000 1.7 @@ -198,7 +198,7 @@ <Tool Name="VCCLCompilerTool" AdditionalOptions="/EHsc-" - Optimization="4" + Optimization="2" InlineFunctionExpansion="1" EnableIntrinsicFunctions="true" FavorSizeOrSpeed="1" @@ -279,7 +279,7 @@ <Tool Name="VCCLCompilerTool" AdditionalOptions="/EHsc-" - Optimization="4" + Optimization="2" InlineFunctionExpansion="1" EnableIntrinsicFunctions="true" FavorSizeOrSpeed="1" Index: engine_classic.vcproj =================================================================== RCS file: /cvsroot/firebird/firebird2/builds/win32/msvc8/engine_classic.vcproj,v retrieving revision 1.6 retrieving revision 1.7 diff -b -U3 -r1.6 -r1.7 --- engine_classic.vcproj 31 Oct 2006 10:09:41 -0000 1.6 +++ engine_classic.vcproj 31 Oct 2006 12:03:38 -0000 1.7 @@ -44,7 +44,7 @@ <Tool Name="VCCLCompilerTool" AdditionalOptions="/EHsc-" - Optimization="4" + Optimization="2" InlineFunctionExpansion="1" EnableIntrinsicFunctions="true" FavorSizeOrSpeed="1" @@ -125,7 +125,7 @@ <Tool Name="VCCLCompilerTool" AdditionalOptions="/EHsc-" - Optimization="4" + Optimization="2" InlineFunctionExpansion="1" EnableIntrinsicFunctions="true" FavorSizeOrSpeed="1" Index: engine_embed.vcproj =================================================================== RCS file: /cvsroot/firebird/firebird2/builds/win32/msvc8/engine_embed.vcproj,v retrieving revision 1.6 retrieving revision 1.7 diff -b -U3 -r1.6 -r1.7 --- engine_embed.vcproj 31 Oct 2006 10:09:41 -0000 1.6 +++ engine_embed.vcproj 31 Oct 2006 12:03:38 -0000 1.7 @@ -44,7 +44,7 @@ <Tool Name="VCCLCompilerTool" AdditionalOptions="/EHsc-" - Optimization="4" + Optimization="2" InlineFunctionExpansion="1" EnableIntrinsicFunctions="true" FavorSizeOrSpeed="1" @@ -125,7 +125,7 @@ <Tool Name="VCCLCompilerTool" AdditionalOptions="/EHsc-" - Optimization="4" + Optimization="2" InlineFunctionExpansion="1" EnableIntrinsicFunctions="true" FavorSizeOrSpeed="1" @@ -1596,4 +1596,6 @@ </File> </Filter> </Files> + <Globals> + </Globals> </VisualStudioProject> Index: fb_inet_server.vcproj =================================================================== RCS file: /cvsroot/firebird/firebird2/builds/win32/msvc8/fb_inet_server.vcproj,v retrieving revision 1.2 retrieving revision 1.3 diff -b -U3 -r1.2 -r1.3 --- fb_inet_server.vcproj 31 Oct 2006 10:09:41 -0000 1.2 +++ fb_inet_server.vcproj 31 Oct 2006 12:03:38 -0000 1.3 @@ -49,7 +49,7 @@ <Tool Name="VCCLCompilerTool" AdditionalOptions="/EHsc-" - Optimization="4" + Optimization="2" InlineFunctionExpansion="1" EnableIntrinsicFunctions="true" FavorSizeOrSpeed="1" @@ -117,9 +117,9 @@ /> </Configuration> <Configuration - Name="Debug|Win32" - OutputDirectory="..\..\..\temp\debug\fb_inet_server" - IntermediateDirectory="..\..\..\temp\debug\fb_inet_server" + Name="Release|x64" + OutputDirectory="$(PlatformName)\$(ConfigurationName)" + IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" UseOfMFC="0" @@ -143,23 +143,26 @@ PreprocessorDefinitions="_DEBUG" MkTypLibCompatible="true" SuppressStartupBanner="true" - TargetEnvironment="1" - TypeLibraryName="..\..\..\temp\debug\fb_inet_server\fb_inet_server.tlb" + TargetEnvironment="3" + TypeLibraryName="..\..\..\temp\release\fb_inet_server\fb_inet_server.tlb" /> <Tool Name="VCCLCompilerTool" AdditionalOptions="/EHsc-" - Optimization="0" + Optimization="2" + InlineFunctionExpansion="1" + EnableIntrinsicFunctions="true" + FavorSizeOrSpeed="1" + OmitFramePointers="true" AdditionalIncludeDirectories="../../../src/include,../../../src/include/gen" - PreprocessorDefinitions="_DEBUG,_WINDOWS,WIN32,DEV_BUILD" + PreprocessorDefinitions="NDEBUG,_WINDOWS,WIN32" ExceptionHandling="0" - BasicRuntimeChecks="3" - RuntimeLibrary="3" + RuntimeLibrary="2" RuntimeTypeInfo="false" - PrecompiledHeaderFile="..\..\..\temp\debug\fb_inet_server\fb_inet_server.pch" - AssemblerListingLocation="..\..\..\temp\debug\fb_inet_server/" - ObjectFile="..\..\..\temp\debug\fb_inet_server/" - ProgramDataBaseFileName="..\..\..\temp\debug\fb_inet_server/" + PrecompiledHeaderFile="..\..\..\temp\release\fb_inet_server/fb_inet_server.pch" + AssemblerListingLocation="..\..\..\temp\release\fb_inet_server/" + ObjectFile="..\..\..\temp\release\fb_inet_server/" + ProgramDataBaseFileName="..\..\..\temp\release\fb_inet_server/" BrowseInformation="1" WarningLevel="3" SuppressStartupBanner="true" @@ -180,14 +183,14 @@ <Tool Name="VCLinkerTool" AdditionalDependencies="comctl32.lib ws2_32.lib mpr.lib version.lib icuuc.lib icuin.lib" - OutputFile="..\..\..\temp\debug\firebird\bin\fb_inet_server.exe" + OutputFile="..\..\..\temp\release\firebird\bin\fb_inet_server.exe" LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories="../../../extern/icu/lib" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\..\temp\debug\fb_inet_server\fb_inet_server.pdb" SubSystem="2" StackReserveSize="2097152" + TargetMachine="17" /> <Tool Name="VCALinkTool" @@ -215,9 +218,9 @@ /> </Configuration> <Configuration - Name="Release|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" + Name="Debug|Win32" + OutputDirectory="..\..\..\temp\debug\fb_inet_server" + IntermediateDirectory="..\..\..\temp\debug\fb_inet_server" ConfigurationType="1" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" UseOfMFC="0" @@ -241,26 +244,23 @@ PreprocessorDefinitions="_DEBUG" MkTypLibCompatible="true" SuppressStartupBanner="true" - TargetEnvironment="3" - TypeLibraryName="..\..\..\temp\release\fb_inet_server\fb_inet_server.tlb" + TargetEnvironment="1" + TypeLibraryName="..\..\..\temp\debug\fb_inet_server\fb_inet_server.tlb" /> <Tool Name="VCCLCompilerTool" AdditionalOptions="/EHsc-" - Optimization="4" - InlineFunctionExpansion="1" - EnableIntrinsicFunctions="true" - FavorSizeOrSpeed="1" - OmitFramePointers="true" + Optimization="0" AdditionalIncludeDirectories="../../../src/include,../../../src/include/gen" - PreprocessorDefinitions="NDEBUG,_WINDOWS,WIN32" + PreprocessorDefinitions="_DEBUG,_WINDOWS,WIN32,DEV_BUILD" ExceptionHandling="0" - RuntimeLibrary="2" + BasicRuntimeChecks="3" + RuntimeLibrary="3" RuntimeTypeInfo="false" - PrecompiledHeaderFile="..\..\..\temp\release\fb_inet_server/fb_inet_server.pch" - AssemblerListingLocation="..\..\..\temp\release\fb_inet_server/" - ObjectFile="..\..\..\temp\release\fb_inet_server/" - ProgramDataBaseFileName="..\..\..\temp\release\fb_inet_server/" + PrecompiledHeaderFile="..\..\..\temp\debug\fb_inet_server\fb_inet_server.pch" + AssemblerListingLocation="..\..\..\temp\debug\fb_inet_server/" + ObjectFile="..\..\..\temp\debug\fb_inet_server/" + ProgramDataBaseFileName="..\..\..\temp\debug\fb_inet_server/" BrowseInformation="1" WarningLevel="3" SuppressStartupBanner="true" @@ -281,14 +281,14 @@ <Tool Name="VCLinkerTool" AdditionalDependencies="comctl32.lib ws2_32.lib mpr.lib version.lib icuuc.lib icuin.lib" - OutputFile="..\..\..\temp\release\firebird\bin\fb_inet_server.exe" + OutputFile="..\..\..\temp\debug\firebird\bin\fb_inet_server.exe" LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories="../../../extern/icu/lib" GenerateDebugInformation="true" + ProgramDatabaseFile="..\..\..\temp\debug\fb_inet_server\fb_inet_server.pdb" SubSystem="2" StackReserveSize="2097152" - TargetMachine="17" /> <Tool Name="VCALinkTool" @@ -455,7 +455,7 @@ /> </FileConfiguration> <FileConfiguration - Name="Debug|Win32" + Name="Release|x64" > <Tool Name="VCResourceCompilerTool" @@ -463,7 +463,7 @@ /> </FileConfiguration> <FileConfiguration - Name="Release|x64" + Name="Debug|Win32" > <Tool Name="VCResourceCompilerTool" Index: fb_lock_print.vcproj =================================================================== RCS file: /cvsroot/firebird/firebird2/builds/win32/msvc8/fb_lock_print.vcproj,v retrieving revision 1.2 retrieving revision 1.3 diff -b -U3 -r1.2 -r1.3 --- fb_lock_print.vcproj 31 Oct 2006 10:09:41 -0000 1.2 +++ fb_lock_print.vcproj 31 Oct 2006 12:03:38 -0000 1.3 @@ -45,7 +45,7 @@ <Tool Name="VCCLCompilerTool" AdditionalOptions="/EHsc-" - Optimization="4" + Optimization="2" InlineFunctionExpansion="1" EnableIntrinsicFunctions="true" FavorSizeOrSpeed="1" @@ -110,9 +110,9 @@ /> </Configuration> <Configuration - Name="Debug|Win32" - OutputDirectory="..\..\..\temp\debug\fb_lock_print" - IntermediateDirectory="..\..\..\temp\debug\fb_lock_print" + Name="Release|x64" + OutputDirectory="$(PlatformName)\$(ConfigurationName)" + IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" UseOfMFC="0" @@ -133,22 +133,26 @@ /> <Tool Name="VCMIDLTool" - TypeLibraryName="..\..\..\temp\debug\fb_lock_print\fb_lock_print.tlb" + TargetEnvironment="3" + TypeLibraryName="..\..\..\temp\release\fb_lock_print\fb_lock_print.tlb" /> <Tool Name="VCCLCompilerTool" AdditionalOptions="/EHsc-" - Optimization="0" + Optimization="2" + InlineFunctionExpansion="1" + EnableIntrinsicFunctions="true" + FavorSizeOrSpeed="1" + OmitFramePointers="true" AdditionalIncludeDirectories="../../../src/include,../../../src/include/gen" - PreprocessorDefinitions="_DEBUG;DEV_BUILD;_WINDOWS;CLIENT;SUPERCLIENT;WIN32" + PreprocessorDefinitions="NDEBUG,_WINDOWS,CLIENT,SUPERCLIENT,WIN32" ExceptionHandling="0" - BasicRuntimeChecks="3" - RuntimeLibrary="3" + RuntimeLibrary="2" RuntimeTypeInfo="false" - PrecompiledHeaderFile="..\..\..\temp\debug\fb_lock_print/fb_lock_print.pch" - AssemblerListingLocation="..\..\..\temp\debug\fb_lock_print/" - ObjectFile="..\..\..\temp\debug\fb_lock_print/" - ProgramDataBaseFileName="..\..\..\temp\debug\fb_lock_print/" + PrecompiledHeaderFile="..\..\..\temp\release\fb_lock_print/fb_lock_print.pch" + AssemblerListingLocation="..\..\..\temp\release\fb_lock_print/" + ObjectFile="..\..\..\temp\release\fb_lock_print/" + ProgramDataBaseFileName="..\..\..\temp\release\fb_lock_print/" WarningLevel="3" SuppressStartupBanner="true" DebugInformationFormat="3" @@ -168,12 +172,12 @@ <Tool Name="VCLinkerTool" AdditionalDependencies="comctl32.lib ws2_32.lib mpr.lib version.lib" - OutputFile="..\..\..\temp\debug\firebird\bin\fb_lock_print.exe" + OutputFile="..\..\..\temp\release\firebird\bin\fb_lock_print.exe" LinkIncremental="1" SuppressStartupBanner="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\..\temp\debug\fb_lock_print\fb_lock_print.pdb" SubSystem="1" + TargetMachine="17" /> <Tool Name="VCALinkTool" @@ -201,9 +205,9 @@ /> </Configuration> <Configuration - Name="Release|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" + Name="Debug|Win32" + OutputDirectory="..\..\..\temp\debug\fb_lock_print" + IntermediateDirectory="..\..\..\temp\debug\fb_lock_print" ConfigurationType="1" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" UseOfMFC="0" @@ -224,26 +228,22 @@ /> <Tool Name="VCMIDLTool" - TargetEnvironment="3" - TypeLibraryName="..\..\..\temp\release\fb_lock_print\fb_lock_print.tlb" + TypeLibraryName="..\..\..\temp\debug\fb_lock_print\fb_lock_print.tlb" /> <Tool Name="VCCLCompilerTool" AdditionalOptions="/EHsc-" - Optimization="4" - InlineFunctionExpansion="1" - EnableIntrinsicFunctions="true" - FavorSizeOrSpeed="1" - OmitFramePointers="true" + Optimization="0" AdditionalIncludeDirectories="../../../src/include,../../../src/include/gen" - PreprocessorDefinitions="NDEBUG,_WINDOWS,CLIENT,SUPERCLIENT,WIN32" + PreprocessorDefinitions="_DEBUG;DEV_BUILD;_WINDOWS;CLIENT;SUPERCLIENT;WIN32" ExceptionHandling="0" - RuntimeLibrary="2" + BasicRuntimeChecks="3" + RuntimeLibrary="3" RuntimeTypeInfo="false" - PrecompiledHeaderFile="..\..\..\temp\release\fb_lock_print/fb_lock_print.pch" - AssemblerListingLocation="..\..\..\temp\release\fb_lock_print/" - ObjectFile="..\..\..\temp\release\fb_lock_print/" - ProgramDataBaseFileName="..\..\..\temp\release\fb_lock_print/" + PrecompiledHeaderFile="..\..\..\temp\debug\fb_lock_print/fb_lock_print.pch" + AssemblerListingLocation="..\..\..\temp\debug\fb_lock_print/" + ObjectFile="..\..\..\temp\debug\fb_lock_print/" + ProgramDataBaseFileName="..\..\..\temp\debug\fb_lock_print/" WarningLevel="3" SuppressStartupBanner="true" DebugInformationFormat="3" @@ -263,12 +263,12 @@ <Tool Name="VCLinkerTool" AdditionalDependencies="comctl32.lib ws2_32.lib mpr.lib version.lib" - OutputFile="..\..\..\temp\release\firebird\bin\fb_lock_print.exe" + OutputFile="..\..\..\temp\debug\firebird\bin\fb_lock_print.exe" LinkIncremental="1" SuppressStartupBanner="true" GenerateDebugInformation="true" + ProgramDatabaseFile="..\..\..\temp\debug\fb_lock_print\fb_lock_print.pdb" SubSystem="1" - TargetMachine="17" /> <Tool Name="VCALinkTool" @@ -441,7 +441,7 @@ /> </FileConfiguration> <FileConfiguration - Name="Debug|Win32" + Name="Release|x64" > <Tool Name="VCResourceCompilerTool" @@ -449,7 +449,7 @@ /> </FileConfiguration> <FileConfiguration - Name="Release|x64" + Name="Debug|Win32" > <Tool Name="VCResourceCompilerTool" Index: fbclient.vcproj =================================================================== RCS file: /cvsroot/firebird/firebird2/builds/win32/msvc8/fbclient.vcproj,v retrieving revision 1.2 retrieving revision 1.3 diff -b -U3 -r1.2 -r1.3 --- fbclient.vcproj 31 Oct 2006 10:09:41 -0000 1.2 +++ fbclient.vcproj 31 Oct 2006 12:03:38 -0000 1.3 @@ -114,9 +114,9 @@ /> </Configuration> <Configuration - Name="Release|Win32" - OutputDirectory="..\..\..\temp\release\fbclient" - IntermediateDirectory="..\..\..\temp\release\fbclient" + Name="Debug|x64" + OutputDirectory="$(PlatformName)\$(ConfigurationName)" + IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" UseOfMFC="0" @@ -140,29 +140,27 @@ PreprocessorDefinitions="_DEBUG" MkTypLibCompatible="true" SuppressStartupBanner="true" - TargetEnvironment="1" - TypeLibraryName="..\..\..\temp\release\fbclient\fbclient.tlb" + TargetEnvironment="3" + TypeLibraryName="..\..\..\temp\debug\fbclient\fbclient.tlb" /> <Tool Name="VCCLCompilerTool" AdditionalOptions="/EHsc-" - Optimization="4" - InlineFunctionExpansion="1" - EnableIntrinsicFunctions="true" - FavorSizeOrSpeed="1" - OmitFramePointers="true" + Optimization="0" AdditionalIncludeDirectories="../../../src/include,../../../src/include/gen" - PreprocessorDefinitions="NDEBUG;_WINDOWS;_USRDLL;CLIENT;SUPERCLIENT;GOVERNOR;I386=1;WIN32" + PreprocessorDefinitions="_DEBUG;DEV_BUILD;_WINDOWS;_USRDLL;CLIENT;SUPERCLIENT;GOVERNOR;WIN32" ExceptionHandling="0" - RuntimeLibrary="2" + BasicRuntimeChecks="3" + RuntimeLibrary="3" RuntimeTypeInfo="false" - PrecompiledHeaderFile="..\..\..\temp\release\fbclient\fbclient.pch" - AssemblerListingLocation="..\..\..\temp\release\fbclient/" - ObjectFile="..\..\..\temp\release\fbclient/" - ProgramDataBaseFileName="..\..\..\temp\release\fbclient/" + PrecompiledHeaderFile="..\..\..\temp\debug\fbclient/fbclient.pch" + AssemblerListingLocation="..\..\..\temp\debug\fbclient/" + ObjectFile="..\..\..\temp\debug\fbclient/" + ProgramDataBaseFileName="..\..\..\temp\debug\fbclient/" BrowseInformation="1" WarningLevel="3" SuppressStartupBanner="true" + Detect64BitPortabilityProblems="true" DebugInformationFormat="3" CompileAs="0" /> @@ -180,12 +178,14 @@ <Tool Name="VCLinkerTool" AdditionalDependencies="comctl32.lib ws2_32.lib mpr.lib version.lib" - OutputFile="..\..\..\temp\release\firebird\bin\fbclient.dll" + OutputFile="..\..\..\temp\debug\firebird\bin\fbclient.dll" LinkIncremental="1" SuppressStartupBanner="true" ModuleDefinitionFile="..\defs\fbclient.def" GenerateDebugInformation="true" - ImportLibrary="..\..\..\temp\release\fbclient\fbclient.lib" + ProgramDatabaseFile="..\..\..\temp\debug\fbclient\fbclient.pdb" + ImportLibrary="..\..\..\temp\debug\fbclient\fbclient.lib" + TargetMachine="17" /> <Tool Name="VCALinkTool" @@ -213,9 +213,9 @@ /> </Configuration> <Configuration - Name="Debug|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" + Name="Release|Win32" + OutputDirectory="..\..\..\temp\release\fbclient" + IntermediateDirectory="..\..\..\temp\release\fbclient" ConfigurationType="2" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" UseOfMFC="0" @@ -239,27 +239,29 @@ PreprocessorDefinitions="_DEBUG" MkTypLibCompatible="true" SuppressStartupBanner="true" - TargetEnvironment="3" - TypeLibraryName="..\..\..\temp\debug\fbclient\fbclient.tlb" + TargetEnvironment="1" + TypeLibraryName="..\..\..\temp\release\fbclient\fbclient.tlb" /> <Tool Name="VCCLCompilerTool" AdditionalOptions="/EHsc-" - Optimization="0" + Optimization="2" + InlineFunctionExpansion="1" + EnableIntrinsicFunctions="true" + FavorSizeOrSpeed="1" + OmitFramePointers="true" AdditionalIncludeDirectories="../../../src/include,../../../src/include/gen" - PreprocessorDefinitions="_DEBUG;DEV_BUILD;_WINDOWS;_USRDLL;CLIENT;SUPERCLIENT;GOVERNOR;WIN32" + PreprocessorDefinitions="NDEBUG;_WINDOWS;_USRDLL;CLIENT;SUPERCLIENT;GOVERNOR;I386=1;WIN32" ExceptionHandling="0" - BasicRuntimeChecks="3" - RuntimeLibrary="3" + RuntimeLibrary="2" RuntimeTypeInfo="false" - PrecompiledHeaderFile="..\..\..\temp\debug\fbclient/fbclient.pch" - AssemblerListingLocation="..\..\..\temp\debug\fbclient/" - ObjectFile="..\..\..\temp\debug\fbclient/" - ProgramDataBaseFileName="..\..\..\temp\debug\fbclient/" + PrecompiledHeaderFile="..\..\..\temp\release\fbclient\fbclient.pch" + AssemblerListingLocation="..\..\..\temp\release\fbclient/" + ObjectFile="..\..\..\temp\release\fbclient/" + ProgramDataBaseFileName="..\..\..\temp\release\fbclient/" BrowseInformation="1" WarningLevel="3" SuppressStartupBanner="true" - Detect64BitPortabilityProblems="true" DebugInformationFormat="3" CompileAs="0" /> @@ -277,14 +279,12 @@ <Tool Name="VCLinkerTool" AdditionalDependencies="comctl32.lib ws2_32.lib mpr.lib version.lib" - OutputFile="..\..\..\temp\debug\firebird\bin\fbclient.dll" + OutputFile="..\..\..\temp\release\firebird\bin\fbclient.dll" LinkIncremental="1" SuppressStartupBanner="true" ModuleDefinitionFile="..\defs\fbclient.def" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\..\temp\debug\fbclient\fbclient.pdb" - ImportLibrary="..\..\..\temp\debug\fbclient\fbclient.lib" - TargetMachine="17" + ImportLibrary="..\..\..\temp\release\fbclient\fbclient.lib" /> <Tool Name="VCALinkTool" @@ -344,7 +344,7 @@ <Tool Name="VCCLCompilerTool" AdditionalOptions="/EHsc-" - Optimization="4" + Optimization="2" InlineFunctionExpansion="1" EnableIntrinsicFunctions="true" FavorSizeOrSpeed="1" @@ -688,7 +688,7 @@ /> </FileConfiguration> <FileConfiguration - Name="Release|Win32" + Name="Debug|x64" > <Tool Name="VCResourceCompilerTool" @@ -696,7 +696,7 @@ /> </FileConfiguration> <FileConfiguration - Name="Debug|x64" + Name="Release|Win32" > <Tool Name="VCResourceCompilerTool" Index: fbembed.vcproj =================================================================== RCS file: /cvsroot/firebird/firebird2/builds/win32/msvc8/fbembed.vcproj,v retrieving revision 1.2 retrieving revision 1.3 diff -b -U3 -r1.2 -r1.3 --- fbembed.vcproj 31 Oct 2006 10:09:41 -0000 1.2 +++ fbembed.vcproj 31 Oct 2006 12:03:38 -0000 1.3 @@ -245,7 +245,7 @@ <Tool Name="VCCLCompilerTool" AdditionalOptions="/EHsc-" - Optimization="4" + Optimization="2" InlineFunctionExpansion="1" EnableIntrinsicFunctions="true" FavorSizeOrSpeed="1" @@ -345,7 +345,7 @@ <Tool Name="VCCLCompilerTool" AdditionalOptions="/EHsc-" - Optimization="4" + Optimization="2" InlineFunctionExpansion="1" EnableIntrinsicFunctions="true" FavorSizeOrSpeed="1" @@ -866,4 +866,6 @@ > </File> </Files> + <Globals> + </Globals> </VisualStudioProject> Index: fbguard.vcproj =================================================================== RCS file: /cvsroot/firebird/firebird2/builds/win32/msvc8/fbguard.vcproj,v retrieving revision 1.2 retrieving revision 1.3 diff -b -U3 -r1.2 -r1.3 --- fbguard.vcproj 31 Oct 2006 10:09:41 -0000 1.2 +++ fbguard.vcproj 31 Oct 2006 12:03:38 -0000 1.3 @@ -49,7 +49,7 @@ <Tool Name="VCCLCompilerTool" AdditionalOptions="/EHsc-" - Optimization="4" + Optimization="2" InlineFunctionExpansion="1" EnableIntrinsicFunctions="true" FavorSizeOrSpeed="1" @@ -115,9 +115,9 @@ /> </Configuration> <Configuration - Name="Debug|Win32" - OutputDirectory="..\..\..\temp\debug\fbguard" - IntermediateDirectory="..\..\..\temp\debug\fbguard" + Name="Release|x64" + OutputDirectory="$(PlatformName)\$(ConfigurationName)" + IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" UseOfMFC="0" @@ -141,23 +141,26 @@ PreprocessorDefinitions="_DEBUG" MkTypLibCompatible="true" SuppressStartupBanner="true" - TargetEnvironment="1" - TypeLibraryName="..\..\..\temp\debug\fbguard\fbguard.tlb" + TargetEnvironment="3" + TypeLibraryName="..\..\..\temp\release\fbguard\fbguard.tlb" /> <Tool Name="VCCLCompilerTool" AdditionalOptions="/EHsc-" - Optimization="0" + Optimization="2" + InlineFunctionExpansion="1" + EnableIntrinsicFunctions="true" + FavorSizeOrSpeed="1" + OmitFramePointers="true" AdditionalIncludeDirectories="../../../src/include,../../../src/include/gen" - PreprocessorDefinitions="_DEBUG,WIN32,_WINDOWS,SUPERCLIENT,DEV_BUILD" + PreprocessorDefinitions="NDEBUG,WIN32,_WINDOWS,SUPERCLIENT" ExceptionHandling="0" - BasicRuntimeChecks="3" - RuntimeLibrary="3" + RuntimeLibrary="2" RuntimeTypeInfo="false" - PrecompiledHeaderFile="..\..\..\temp\debug\fbguard/fbguard.pch" - AssemblerListingLocation="..\..\..\temp\debug\fbguard/" - ObjectFile="..\..\..\temp\debug\fbguard/" - ProgramDataBaseFileName="..\..\..\temp\debug\fbguard/" + PrecompiledHeaderFile="..\..\..\temp\release\fbguard/fbguard.pch" + AssemblerListingLocation="..\..\..\temp\release\fbguard/" + ObjectFile="..\..\..\temp\release\fbguard/" + ProgramDataBaseFileName="..\..\..\temp\release\fbguard/" WarningLevel="3" SuppressStartupBanner="true" DebugInformationFormat="3" @@ -177,13 +180,13 @@ <Tool Name="VCLinkerTool" AdditionalDependencies="comctl32.lib ws2_32.lib mpr.lib version.lib" - OutputFile="..\..\..\temp\debug\firebird\bin\fbguard.exe" + OutputFile="..\..\..\temp\release\firebird\bin\fbguard.exe" LinkIncremental="1" SuppressStartupBanner="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\..\temp\debug\fbguard\fbguard.pdb" SubSystem="2" OptimizeForWindows98="2" + TargetMachine="17" /> <Tool Name="VCALinkTool" @@ -211,9 +214,9 @@ /> </Configuration> <Configuration - Name="Release|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" + Name="Debug|Win32" + OutputDirectory="..\..\..\temp\debug\fbguard" + IntermediateDirectory="..\..\..\temp\debug\fbguard" ConfigurationType="1" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" UseOfMFC="0" @@ -237,26 +240,23 @@ PreprocessorDefinitions="_DEBUG" MkTypLibCompatible="true" SuppressStartupBanner="true" - TargetEnvironment="3" - TypeLibraryName="..\..\..\temp\release\fbguard\fbguard.tlb" + TargetEnvironment="1" + TypeLibraryName="..\..\..\temp\debug\fbguard\fbguard.tlb" /> <Tool Name="VCCLCompilerTool" AdditionalOptions="/EHsc-" - Optimization="4" - InlineFunctionExpansion="1" - EnableIntrinsicFunctions="true" - FavorSizeOrSpeed="1" - OmitFramePointers="true" + Optimization="0" AdditionalIncludeDirectories="../../../src/include,../../../src/include/gen" - PreprocessorDefinitions="NDEBUG,WIN32,_WINDOWS,SUPERCLIENT" + PreprocessorDefinitions="_DEBUG,WIN32,_WINDOWS,SUPERCLIENT,DEV_BUILD" ExceptionHandling="0" - RuntimeLibrary="2" + BasicRuntimeChecks="3" + RuntimeLibrary="3" RuntimeTypeInfo="false" - PrecompiledHeaderFile="..\..\..\temp\release\fbguard/fbguard.pch" - AssemblerListingLocation="..\..\..\temp\release\fbguard/" - ObjectFile="..\..\..\temp\release\fbguard/" - ProgramDataBaseFileName="..\..\..\temp\release\fbguard/" + PrecompiledHeaderFile="..\..\..\temp\debug\fbguard/fbguard.pch" + AssemblerListingLocation="..\..\..\temp\debug\fbguard/" + ObjectFile="..\..\..\temp\debug\fbguard/" + ProgramDataBaseFileName="..\..\..\temp\debug\fbguard/" WarningLevel="3" SuppressStartupBanner="true" DebugInformationFormat="3" @@ -276,13 +276,13 @@ <Tool Name="VCLinkerTool" AdditionalDependencies="comctl32.lib ws2_32.lib mpr.lib version.lib" - OutputFile="..\..\..\temp\release\firebird\bin\fbguard.exe" + OutputFile="..\..\..\temp\debug\firebird\bin\fbguard.exe" LinkIncremental="1" SuppressStartupBanner="true" GenerateDebugInformation="true" + ProgramDatabaseFile="..\..\..\temp\debug\fbguard\fbguard.pdb" SubSystem="2" OptimizeForWindows98="2" - TargetMachine="17" /> <Tool Name="VCALinkTool" @@ -464,7 +464,7 @@ /> </FileConfiguration> <FileConfiguration - Name="Debug|Win32" + Name="Release|x64" > <Tool Name="VCResourceCompilerTool" @@ -472,7 +472,7 @@ /> </FileConfiguration> <FileConfiguration - Name="Release|x64" + Name="Debug|Win32" > <Tool Name="VCResourceCompilerTool" Index: fbserver.vcproj =================================================================== RCS file: /cvsroot/firebird/firebird2/builds/win32/msvc8/fbserver.vcproj,v retrieving revision 1.2 retrieving revision 1.3 diff -b -U3 -r1.2 -r1.3 --- fbserver.vcproj 31 Oct 2006 10:09:42 -0000 1.2 +++ fbserver.vcproj 31 Oct 2006 12:03:38 -0000 1.3 @@ -49,7 +49,7 @@ <Tool Name="VCCLCompilerTool" AdditionalOptions="/EHsc-" - Optimization="4" + Optimization="2" InlineFunctionExpansion="1" EnableIntrinsicFunctions="true" FavorSizeOrSpeed="1" @@ -117,9 +117,9 @@ /> </Configuration> <Configuration - Name="Debug|Win32" - OutputDirectory="..\..\..\temp\debug\fbserver" - IntermediateDirectory="..\..\..\temp\debug\fbserver" + Name="Release|x64" + OutputDirectory="$(PlatformName)\$(ConfigurationName)" + IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" UseOfMFC="0" @@ -143,23 +143,26 @@ PreprocessorDefinitions="_DEBUG" MkTypLibCompatible="true" SuppressStartupBanner="true" - TargetEnvironment="1" - TypeLibraryName="..\..\..\temp\debug\fbserver\fbserver.tlb" + TargetEnvironment="3" + TypeLibraryName="..\..\..\temp\release\fbserver\fbserver.tlb" /> <Tool Name="VCCLCompilerTool" AdditionalOptions="/EHsc-" - Optimization="0" + Optimization="2" + InlineFunctionExpansion="1" + EnableIntrinsicFunctions="true" + FavorSizeOrSpeed="1" + OmitFramePointers="true" AdditionalIncludeDirectories="../../../src/include,../../../src/include/gen" - PreprocessorDefinitions="_DEBUG,_WINDOWS,SUPERSERVER,WIN32,DEV_BUILD" + PreprocessorDefinitions="NDEBUG,_WINDOWS,SUPERSERVER,WIN32" ExceptionHandling="0" - BasicRuntimeChecks="3" - RuntimeLibrary="3" + RuntimeLibrary="2" RuntimeTypeInfo="false" - PrecompiledHeaderFile="..\..\..\temp\debug\fbserver/fbserver.pch" - AssemblerListingLocation="..\..\..\temp\debug\fbserver/" - ObjectFile="..\..\..\temp\debug\fbserver/" - ProgramDataBaseFileName="..\..\..\temp\debug\fbserver/" + PrecompiledHeaderFile="..\..\..\temp\release\fbserver/fbserver.pch" + AssemblerListingLocation="..\..\..\temp\release\fbserver/" + ObjectFile="..\..\..\temp\release\fbserver/" + ProgramDataBaseFileName="..\..\..\temp\release\fbserver/" BrowseInformation="1" WarningLevel="3" SuppressStartupBanner="true" @@ -180,14 +183,14 @@ <Tool Name="VCLinkerTool" AdditionalDependencies="comctl32.lib ws2_32.lib mpr.lib version.lib icuuc.lib icuin.lib" - OutputFile="..\..\..\temp\debug\firebird\bin\fbserver.exe" + OutputFile="..\..\..\temp\release\firebird\bin\fbserver.exe" LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories="../../../extern/icu/lib" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\..\temp\debug\fbserver\fbserver.pdb" SubSystem="2" StackReserveSize="2097152" + TargetMachine="17" /> <Tool Name="VCALinkTool" @@ -215,9 +218,9 @@ /> </Configuration> <Configuration - Name="Release|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" + Name="Debug|Win32" + OutputDirectory="..\..\..\temp\debug\fbserver" + IntermediateDirectory="..\..\..\temp\debug\fbserver" ConfigurationType="1" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" UseOfMFC="0" @@ -241,26 +244,23 @@ PreprocessorDefinitions="_DEBUG" MkTypLibCompatible="true" SuppressStartupBanner="true" - TargetEnvironment="3" - TypeLibraryName="..\..\..\temp\release\fbserver\fbserver.tlb" + TargetEnvironment="1" + TypeLibraryName="..\..\..\temp\debug\fbserver\fbserver.tlb" /> <Tool Name="VCCLCompilerTool" AdditionalOptions="/EHsc-" - Optimization="4" - InlineFunctionExpansion="1" - EnableIntrinsicFunctions="true" - FavorSizeOrSpeed="1" - OmitFramePointers="true" + Optimization="0" AdditionalIncludeDirectories="../../../src/include,../../../src/include/gen" - PreprocessorDefinitions="NDEBUG,_WINDOWS,SUPERSERVER,WIN32" + PreprocessorDefinitions="_DEBUG,_WINDOWS,SUPERSERVER,WIN32,DEV_BUILD" ExceptionHandling="0" - RuntimeLibrary="2" + BasicRuntimeChecks="3" + RuntimeLibrary="3" RuntimeTypeInfo="false" - PrecompiledHeaderFile="..\..\..\temp\release\fbserver/fbserver.pch" - AssemblerListingLocation="..\..\..\temp\release\fbserver/" - ObjectFile="..\..\..\temp\release\fbserver/" - ProgramDataBaseFileName="..\..\..\temp\release\fbserver/" + Precompi... [truncated message content] |