Menu
▾
▴
[Bacula-commits] bacula/src/win32/filed baculafd.vcproj,1.7,1.8
|
From: Robert N. <rob...@us...> - 2006-09-30 02:20:55
|
Update of /cvsroot/bacula/bacula/src/win32/filed In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv18439/src/win32/filed Modified Files: baculafd.vcproj Log Message: Fix remaining issues with Microsoft Visual Studio build. Index: baculafd.vcproj =================================================================== RCS file: /cvsroot/bacula/bacula/src/win32/filed/baculafd.vcproj,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- baculafd.vcproj 29 Sep 2006 09:55:51 -0000 1.7 +++ baculafd.vcproj 30 Sep 2006 02:20:45 -0000 1.8 @@ -5,7 +5,6 @@ Name="baculafd" ProjectGUID="{6A435DBB-4D3D-4DAE-8CB3-E0AF169A240B}" RootNamespace="baculafd" - Keyword="MFCProj" > <Platforms> <Platform @@ -16,16 +15,13 @@ </ToolFiles> <Configurations> <Configuration - Name="Release|Win32" + Name="Debug|Win32" OutputDirectory="$(SolutionDir)$(ConfigurationName)" - IntermediateDirectory=".\Release" + IntermediateDirectory="$(ConfigurationName)" ConfigurationType="1" - InheritedPropertySheets="..\..\..\..\..\..\Program Files\Microsoft Visual Studio 8\VC\VCProjectDefaults\UpgradeFromVC60.vsprops" UseOfMFC="0" - UseOfATL="0" ATLMinimizesCRunTimeLibraryUsage="false" CharacterSet="2" - WholeProgramOptimization="1" > <Tool Name="VCPreBuildEventTool" @@ -41,49 +37,42 @@ /> <Tool Name="VCMIDLTool" - TypeLibraryName=".\Release/baculafd.tlb" + TypeLibraryName=".\Debug/baculafd.tlb" HeaderFileName="" /> <Tool Name="VCCLCompilerTool" - Optimization="3" - InlineFunctionExpansion="2" - EnableIntrinsicFunctions="true" - AdditionalIncludeDirectories=".;../compat;"../../../../depkgs-msvc/include";../..;"../../../../depkgs-msvc/include/mysql";"../../../../depkgs-msvc/vss";../libwin32" - PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE;HAVE_WIN32;WIN32_VSS;USING_DLL;_USE_32BIT_TIME_T;_WIN32_WINNT=0x0500;_CRT_SECURE_NO_DEPRECATE" - StringPooling="true" - RuntimeLibrary="2" - EnableFunctionLevelLinking="true" - PrecompiledHeaderFile=".\Release/baculafd.pch" - AssemblerListingLocation=".\Release/" - ObjectFile=".\Release/" - ProgramDataBaseFileName=".\Release/" + Optimization="0" + AdditionalIncludeDirectories=".;../compat;../../../../depkgs-msvc/include;../..;../../../../depkgs-msvc/vss;../libwin32" + PreprocessorDefinitions="_DEBUG;_WINMAIN_;PTW32_BUILD;_CONSOLE;HAVE_WIN32;USING_DLL;_USE_32BIT_TIME_T;WIN32_VSS;_WIN32_WINNT=0x0500;_CRT_SECURE_NO_DEPRECATE;__need_getopt" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="3" + UsePrecompiledHeader="0" BrowseInformation="1" WarningLevel="3" + Detect64BitPortabilityProblems="false" SuppressStartupBanner="true" - DebugInformationFormat="3" + DebugInformationFormat="4" /> <Tool Name="VCManagedResourceCompilerTool" /> <Tool Name="VCResourceCompilerTool" - PreprocessorDefinitions="NDEBUG" + PreprocessorDefinitions="_DEBUG" Culture="1033" - AdditionalIncludeDirectories="" /> <Tool Name="VCPreLinkEventTool" /> <Tool Name="VCLinkerTool" - AdditionalDependencies="pthreadVCE.lib zlib.lib wsock32.lib atls.lib" + AdditionalDependencies="pthreadVCE.lib zlib.lib wsock32.lib atlsd.lib" OutputFile="$(OutDir)\bacula-fd.exe" LinkIncremental="0" SuppressStartupBanner="true" AdditionalLibraryDirectories="../../../../depkgs-msvc/lib" - IgnoreDefaultLibraryNames="" - DelayLoadDLLs="$(NOINHERIT)" GenerateDebugInformation="true" SubSystem="2" TargetMachine="1" @@ -100,7 +89,7 @@ <Tool Name="VCBscMakeTool" SuppressStartupBanner="true" - OutputFile=".\Release/baculafd.bsc" + OutputFile=".\Debug/baculafd.bsc" /> <Tool Name="VCFxCopTool" @@ -116,14 +105,15 @@ /> </Configuration> <Configuration - Name="Debug|Win32" + Name="Release|Win32" OutputDirectory="$(SolutionDir)$(ConfigurationName)" - IntermediateDirectory=".\Debug" + IntermediateDirectory="$(ConfigurationName)" ConfigurationType="1" - InheritedPropertySheets="..\..\..\..\..\..\Program Files\Microsoft Visual Studio 8\VC\VCProjectDefaults\UpgradeFromVC60.vsprops" UseOfMFC="0" + UseOfATL="0" ATLMinimizesCRunTimeLibraryUsage="false" CharacterSet="2" + WholeProgramOptimization="1" > <Tool Name="VCPreBuildEventTool" @@ -139,23 +129,24 @@ /> <Tool Name="VCMIDLTool" - TypeLibraryName=".\Debug/baculafd.tlb" + TypeLibraryName=".\Release/baculafd.tlb" HeaderFileName="" /> <Tool Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories=".;../compat;"../../../../depkgs-msvc/include";../..;"../../../../depkgs-msvc/include/mysql";"../../../../depkgs-msvc/vss";../libwin32" - PreprocessorDefinitions="_DEBUG;_WINMAIN_;PTW32_BUILD;WIN32;_CONSOLE;HAVE_WIN32;USING_DLL;_USE_32BIT_TIME_T;WIN32_VSS;_WIN32_WINNT=0x0500;_CRT_SECURE_NO_DEPRECATE;__need_getopt" - MinimalRebuild="true" + Optimization="4" + InlineFunctionExpansion="2" + EnableIntrinsicFunctions="true" + AdditionalIncludeDirectories=".;../compat;../../../../depkgs-msvc/include;../..;../../../../depkgs-msvc/vss;../libwin32" + PreprocessorDefinitions="NDEBUG;_CONSOLE;HAVE_WIN32;WIN32_VSS;USING_DLL;_USE_32BIT_TIME_T;_WIN32_WINNT=0x0500;_CRT_SECURE_NO_DEPRECATE" + StringPooling="true" BasicRuntimeChecks="3" - RuntimeLibrary="3" - PrecompiledHeaderFile=".\Debug/baculafd.pch" - AssemblerListingLocation=".\Debug/" - ObjectFile=".\Debug/" - ProgramDataBaseFileName=".\Debug/" + RuntimeLibrary="2" + EnableFunctionLevelLinking="true" + UsePrecompiledHeader="0" BrowseInformation="1" WarningLevel="3" + Detect64BitPortabilityProblems="false" SuppressStartupBanner="true" DebugInformationFormat="3" /> @@ -164,20 +155,21 @@ /> <Tool Name="VCResourceCompilerTool" - PreprocessorDefinitions="_DEBUG" + PreprocessorDefinitions="NDEBUG" Culture="1033" + AdditionalIncludeDirectories="" /> <Tool Name="VCPreLinkEventTool" /> <Tool Name="VCLinkerTool" - AdditionalDependencies="pthreadVCE.lib zlib.lib wsock32.lib atlsd.lib" + AdditionalDependencies="pthreadVCE.lib zlib.lib wsock32.lib atls.lib" OutputFile="$(OutDir)\bacula-fd.exe" LinkIncremental="0" SuppressStartupBanner="true" - AdditionalLibraryDirectories=""../../../../depkgs-msvc/lib"" - IgnoreDefaultLibraryNames="" + AdditionalLibraryDirectories="../../../../depkgs-msvc/lib" + DelayLoadDLLs="$(NOINHERIT)" GenerateDebugInformation="true" SubSystem="2" TargetMachine="1" @@ -194,7 +186,7 @@ <Tool Name="VCBscMakeTool" SuppressStartupBanner="true" - OutputFile=".\Debug/baculafd.bsc" + OutputFile=".\Release/baculafd.bsc" /> <Tool Name="VCFxCopTool" |