Fix Microsoft Visual Studio Release build.

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@3516 91ce42f0-d328-0410-95d8-f526ca767f89

diff --git a/bacula/src/win32/bacula.sln b/bacula/src/win32/bacula.sln
index 61d267250a55c896a362e7cde2bf1a9db6846418..9028f3bb0a9d5ff4a3585c0aeb607da47336289b 100644 (file)
--- a/bacula/src/win32/bacula.sln
+++ b/bacula/src/win32/bacula.sln
@@ -171,7 +171,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "installer", "installer\inst
                {CAD30B43-D93B-47D5-9161-6A3E9BADCC1D} = {CAD30B43-D93B-47D5-9161-6A3E9BADCC1D}
                {F8AF7D74-2918-422B-A7B6-4D98566B7160} = {F8AF7D74-2918-422B-A7B6-4D98566B7160}
                {374BF775-AF68-4A88-814A-48F692DFFE5A} = {374BF775-AF68-4A88-814A-48F692DFFE5A}
-               {208D3989-794B-47A2-9D04-D7AEE1524078} = {208D3989-794B-47A2-9D04-D7AEE1524078}
                {6A7AA493-E46C-4994-B8D6-AA6C9C19C9BA} = {6A7AA493-E46C-4994-B8D6-AA6C9C19C9BA}
                {2D729599-C008-4154-BCCB-53E6A260F220} = {2D729599-C008-4154-BCCB-53E6A260F220}
                {0F56AEB0-14DA-4A80-8962-1F85A17339D0} = {0F56AEB0-14DA-4A80-8962-1F85A17339D0}
@@ -260,7 +259,6 @@ Global
                {CAD30B43-D93B-47D5-9161-6A3E9BADCC1D}.Release|Win32.Build.0 = Release|Win32
                {208D3989-794B-47A2-9D04-D7AEE1524078}.Debug|Win32.ActiveCfg = Debug|Win32
                {208D3989-794B-47A2-9D04-D7AEE1524078}.Release|Win32.ActiveCfg = Release|Win32
-               {208D3989-794B-47A2-9D04-D7AEE1524078}.Release|Win32.Build.0 = Release|Win32
                {0F56AEB0-14DA-4A80-8962-1F85A17339D0}.Debug|Win32.ActiveCfg = Debug|Win32
                {0F56AEB0-14DA-4A80-8962-1F85A17339D0}.Debug|Win32.Build.0 = Debug|Win32
                {0F56AEB0-14DA-4A80-8962-1F85A17339D0}.Release|Win32.ActiveCfg = Release|Win32

diff --git a/bacula/src/win32/bacula/bacula.vcproj b/bacula/src/win32/bacula/bacula.vcproj
index 38bff747c693068323d9bf8b2c0867eaa82d155e..07057309620fa4f440f49206b6ae92ee21d7d531 100644 (file)
--- a/bacula/src/win32/bacula/bacula.vcproj
+++ b/bacula/src/win32/bacula/bacula.vcproj
@@ -84,7 +84,7 @@
                        OutputDirectory="$(SolutionDir)$(ConfigurationName)"
                        IntermediateDirectory="$(ConfigurationName)"
                        ConfigurationType="4"
-                       CharacterSet="1"
+                       CharacterSet="2"
                        WholeProgramOptimization="1"
                        >
                        <Tool
@@ -104,12 +104,16 @@
                        />
                        <Tool
                                Name="VCCLCompilerTool"
+                               Optimization="3"
+                               EnableIntrinsicFunctions="true"
                                AdditionalIncludeDirectories="../compat;&quot;../../../../depkgs-msvc/include&quot;;../..;&quot;../../../../depkgs-msvc/include/mysql&quot;;&quot;../../../../depkgs-msvc/vss/inc&quot;"
                                PreprocessorDefinitions="WIN32;NDEBUG;_LIB;HAVE_WIN32;WIN32_VSS;USING_DLL;_USE_32BIT_TIME_T;_WIN32_WINNT=0x0500;_CRT_SECURE_NO_DEPRECATE"
+                               StringPooling="true"
                                RuntimeLibrary="2"
                                UsePrecompiledHeader="0"
+                               BrowseInformation="1"
                                WarningLevel="3"
-                               Detect64BitPortabilityProblems="true"
+                               Detect64BitPortabilityProblems="false"
                                DebugInformationFormat="3"
                        />
                        <Tool

diff --git a/bacula/src/win32/filed/baculafd.vcproj b/bacula/src/win32/filed/baculafd.vcproj
index e96519717211bf003d9ff998bd281062ee477c17..71f6463ffc5f7c11c4f4f77fcc511f0f82ded2e2 100644 (file)
--- a/bacula/src/win32/filed/baculafd.vcproj
+++ b/bacula/src/win32/filed/baculafd.vcproj
@@ -22,9 +22,10 @@
                        ConfigurationType="1"\r
                        InheritedPropertySheets="..\..\..\..\..\..\Program Files\Microsoft Visual Studio 8\VC\VCProjectDefaults\UpgradeFromVC60.vsprops"\r
                        UseOfMFC="0"\r
-                       UseOfATL="1"\r
+                       UseOfATL="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
                        CharacterSet="2"\r
+                       WholeProgramOptimization="1"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
@@ -80,7 +81,7 @@
                                OutputFile="$(OutDir)\bacula-fd.exe"\r
                                LinkIncremental="0"\r
                                SuppressStartupBanner="true"\r
-                               AdditionalLibraryDirectories="..\..\..\..\depkgs-win32\pthreads\release;..\..\..\..\depkgs-win32\zlib\release;..\..\..\..\depkgs-win32\gettext\lib;%VSSSDK_DIR%\lib\win2003\obj\i386"\r
+                               AdditionalLibraryDirectories="../../../../depkgs-msvc/lib"\r
                                IgnoreDefaultLibraryNames=""\r
                                DelayLoadDLLs="$(NOINHERIT)"\r
                                GenerateDebugInformation="true"\r

diff --git a/bacula/src/win32/installer/installer.vcproj b/bacula/src/win32/installer/installer.vcproj
index b160cc2c05e879ec74d1eb86897561ba3292619d..17021b690cb3d6e5741fe0fcce3eb9f874a4057b 100644 (file)
--- a/bacula/src/win32/installer/installer.vcproj
+++ b/bacula/src/win32/installer/installer.vcproj
@@ -22,10 +22,10 @@
                        >
                        <Tool
                                Name="VCNMakeTool"
-                               BuildCommandLine="..\..\..\..\depkgs-msvc\nsis\makensis /V3 /DVERSION=1.39.18 /DDOC_DIR=..\..\..\..\docs /DBUILD_TOOLS=VC8_DEBUG /DVC_REDIST_DIR=&quot;$(VCInstallDir)redist\Debug_NonRedist\x86\Microsoft.VC80.DebugCRT&quot; /DDEPKGS_BIN=..\..\..\..\depkgs-msvc\bin /DBACULA_BIN=..\$(ConfigurationName) /DCATS_DIR=..\cats /DSCRIPT_DIR=..\scripts winbacula.nsi"
-                               ReBuildCommandLine="del winbacula-*.exe&#x0D;&#x0A;makensis -V3 -DVERSION=$(VERSION) -DDOC_DIR=..\..\..\..\docs -DBUILD_TOOLS=VC8_DEBUG -DVC_REDIST_DIR=$(VCInstallDir)redist\Debug_NonRedist\x86\Microsoft.VC80.DebugCRT -DDEPKGS_BIN=..\..\..\..\depkgs-msvc\bin -DBACULA_BIN=..\$(ConfigurationName) -DCATS_DIR=..\cats -DSCRIPT_DIR=..\scripts winbacula.nsi&#x0D;&#x0A;"
+                               BuildCommandLine="..\..\..\..\depkgs-msvc\nsis\makensis /V3 /DVERSION=1.39.23 /DDOC_DIR=..\..\..\..\docs /DBUILD_TOOLS=VC8_DEBUG /DVC_REDIST_DIR=&quot;$(VCInstallDir)redist\Debug_NonRedist\x86\Microsoft.VC80.DebugCRT&quot; /DDEPKGS_BIN=..\..\..\..\depkgs-msvc\bin /DBACULA_BIN=..\$(ConfigurationName) /DCATS_DIR=..\cats /DSCRIPT_DIR=..\scripts winbacula.nsi"
+                               ReBuildCommandLine="del winbacula-*.exe&#x0D;&#x0A;..\..\..\..\depkgs-msvc\nsis\makensis -V3 -DVERSION=1.39.23 -DDOC_DIR=..\..\..\..\docs -DBUILD_TOOLS=VC8_DEBUG -DVC_REDIST_DIR=$(VCInstallDir)redist\Debug_NonRedist\x86\Microsoft.VC80.DebugCRT -DDEPKGS_BIN=..\..\..\..\depkgs-msvc\bin -DBACULA_BIN=..\$(ConfigurationName) -DCATS_DIR=..\cats -DSCRIPT_DIR=..\scripts winbacula.nsi&#x0D;&#x0A;"
                                CleanCommandLine="del winbacula-*.exe"
-                               Output="winbacula-1.39.18.exe"
+                               Output="winbacula-1.39.23.exe"
                                PreprocessorDefinitions="VERSION=$(VERSION);DOC_DIR=..\..\..\..\docs;BUILD_TOOLS=VC8_DEBUG;VC_REDIST_DIR=$(VCInstallDir)redist\Debug_NonRedist\x86\Microsoft.VC80.DebugCRT;DEPKGS_BIN=..\..\..\..\depkgs-msvc\bin;BACULA_BIN=..\$(ConfigurationName);CATS_DIR=..\cats;SCRIPT_DIR=..\scripts"
                                IncludeSearchPath=""
                                ForcedIncludes=""
@@ -42,10 +42,10 @@
                        >
                        <Tool
                                Name="VCNMakeTool"
-                               BuildCommandLine="makensis -V3 -DVERSION=$(VERSION) -DDOC_DIR=..\..\..\..\docs -DBUILD_TOOLS=VC8_DEBUG -DVC_REDIST_DIR=$(VCInstallDir)redist\x86\Microsoft.VC80.CRT -DDEPKGS_BIN=..\..\..\..\depkgs-msvc\bin -DBACULA_BIN=..\$(ConfigurationName) -DCATS_DIR=..\cats -DSCRIPT_DIR=..\scripts winbacula.nsi"
-                               ReBuildCommandLine="del winbacula-*.exe&#x0D;&#x0A;makensis -V3 -DVERSION=$(VERSION) -DDOC_DIR=..\..\..\..\docs -DBUILD_TOOLS=VC8 -DVC_REDIST_DIR=$(VCInstallDir)redist\x86\Microsoft.VC80.CRT -DDEPKGS_BIN=..\..\..\..\depkgs-msvc\bin -DBACULA_BIN=..\$(ConfigurationName) -DCATS_DIR=..\cats -DSCRIPT_DIR=..\scripts winbacula.nsi&#x0D;&#x0A;"
+                               BuildCommandLine="..\..\..\..\depkgs-msvc\nsis\makensis /V3 /DVERSION=1.39.23 /DDOC_DIR=..\..\..\..\docs /DBUILD_TOOLS=VC8_DEBUG /DVC_REDIST_DIR=&quot;$(VCInstallDir)redist\Debug_NonRedist\x86\Microsoft.VC80.DebugCRT&quot; /DDEPKGS_BIN=..\..\..\..\depkgs-msvc\bin /DBACULA_BIN=..\$(ConfigurationName) /DCATS_DIR=..\cats /DSCRIPT_DIR=..\scripts winbacula.nsi"
+                               ReBuildCommandLine="del winbacula-*.exe&#x0D;&#x0A;..\..\..\..\depkgs-msvc\nsis\makensis -V3 -DVERSION=1.39.23 -DDOC_DIR=..\..\..\..\docs -DBUILD_TOOLS=VC8 -DVC_REDIST_DIR=$(VCInstallDir)redist\x86\Microsoft.VC80.CRT -DDEPKGS_BIN=..\..\..\..\depkgs-msvc\bin -DBACULA_BIN=..\$(ConfigurationName) -DCATS_DIR=..\cats -DSCRIPT_DIR=..\scripts winbacula.nsi&#x0D;&#x0A;"
                                CleanCommandLine="del winbacula-*.exe"
-                               Output=""
+                               Output="winbacula-1.39.23.exe"
                                PreprocessorDefinitions=""
                                IncludeSearchPath=""
                                ForcedIncludes=""

diff --git a/bacula/src/win32/libbac/libbac.vcproj b/bacula/src/win32/libbac/libbac.vcproj
index 177630bb4225913d21b90bdf3b1a19c91a4797dd..f9adfa9b31b90c5c6222d399ccf13259089040ea 100644 (file)
--- a/bacula/src/win32/libbac/libbac.vcproj
+++ b/bacula/src/win32/libbac/libbac.vcproj
@@ -144,7 +144,7 @@
                                AdditionalDependencies="wsock32.lib pthreadVCE.lib ssleay32.lib libeay32.lib "\r
                                OutputFile="$(OutDir)\bacula.dll"\r
                                AdditionalLibraryDirectories="..\..\..\..\depkgs-msvc\lib"\r
-                               ModuleDefinitionFile="..\dll\bacula.def"\r
+                               ModuleDefinitionFile="msvc\bacula.def"\r
                                ImportLibrary="$(TargetDir)libbac.lib"\r
                        />\r
                        <Tool\r
@@ -1036,6 +1036,14 @@
                                                CompileAs="2"\r
                                        />\r
                                </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               CompileAs="2"\r
+                                       />\r
+                               </FileConfiguration>\r
                        </File>\r
                        <File\r
                                RelativePath="..\compat\print.cpp"\r
@@ -1588,11 +1596,11 @@
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\findlib\protos.h"\r
+                               RelativePath="..\..\lib\protos.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\lib\protos.h"\r
+                               RelativePath="..\..\findlib\protos.h"\r
                                >\r
                        </File>\r
                        <File\r

diff --git a/bacula/src/win32/stored/bextract/bextract.vcproj b/bacula/src/win32/stored/bextract/bextract.vcproj
index 7bdb116a718ede1b3777d6e23f9896cae5b649f3..4e5358adab483f87ce3ed981d914fc4f3b057677 100644 (file)
--- a/bacula/src/win32/stored/bextract/bextract.vcproj
+++ b/bacula/src/win32/stored/bextract/bextract.vcproj
@@ -41,7 +41,7 @@
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                                AdditionalIncludeDirectories="../../compat;../../..;../../stored;"../../../../../depkgs-msvc/include""\r
-                               PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;HAVE_WIN32;USING_DLL;_USE_32BIT_TIME_T;_WIN32_WINNT=0x0500;_CRT_SECURE_NO_DEPRECATE"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;USING_DLL;HAVE_WIN32;_USE_32BIT_TIME_T;_WIN32_WINNT=0x0500;_CRT_SECURE_NO_DEPRECATE"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
                                RuntimeLibrary="3"\r
@@ -123,7 +123,7 @@
                                InlineFunctionExpansion="2"\r
                                EnableIntrinsicFunctions="true"\r
                                AdditionalIncludeDirectories="../../compat;../../..;../../stored;"../../../../../depkgs-msvc/include""\r
-                               PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;HAVE_WIN32;WIN32_VSS;_USE_32BIT_TIME_T;_WIN32_WINNT=0x0500;_CRT_SECURE_NO_DEPRECATE"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;USING_DLL;HAVE_WIN32;WIN32_VSS;_USE_32BIT_TIME_T;_WIN32_WINNT=0x0500;_CRT_SECURE_NO_DEPRECATE"\r
                                RuntimeLibrary="2"\r
                                EnableFunctionLevelLinking="true"\r
                                UsePrecompiledHeader="0"\r

diff --git a/bacula/src/win32/tools/dbcheck/dbcheck.vcproj b/bacula/src/win32/tools/dbcheck/dbcheck.vcproj
index cbf0233750b78cf5cd924d5b22ba6ca407e82f02..d27e931a499c3dda8016acb3f03103214e148607 100644 (file)
--- a/bacula/src/win32/tools/dbcheck/dbcheck.vcproj
+++ b/bacula/src/win32/tools/dbcheck/dbcheck.vcproj
@@ -120,7 +120,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                AdditionalIncludeDirectories="../../compat;../../..;../../stored;&quot;../../../../../depkgs-msvc/include&quot;"
-                               PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+                               PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;HAVE_WIN32;USING_DLL;_USE_32BIT_TIME_T;_WIN32_WINNT=0x0500;_CRT_SECURE_NO_DEPRECATE"
                                RuntimeLibrary="2"
                                UsePrecompiledHeader="0"
                                BrowseInformation="1"
@@ -141,6 +141,7 @@
                                Name="VCLinkerTool"
                                AdditionalDependencies="bacula_cats.lib"
                                LinkIncremental="1"
+                               AdditionalLibraryDirectories="..\..\debug"
                                GenerateDebugInformation="true"
                                SubSystem="1"
                                OptimizeReferences="2"

diff --git a/bacula/src/win32/tools/scsilist/scsilist.vcproj b/bacula/src/win32/tools/scsilist/scsilist.vcproj
index 29a995b4d705918c7be27de3421e47bab33542db..791f8b56fc548e038a8060370913491f5d382ca0 100644 (file)
--- a/bacula/src/win32/tools/scsilist/scsilist.vcproj
+++ b/bacula/src/win32/tools/scsilist/scsilist.vcproj
@@ -135,6 +135,7 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
+                               AdditionalDependencies="advapi32.lib"
                                LinkIncremental="1"
                                GenerateDebugInformation="true"
                                SubSystem="1"

diff --git a/bacula/src/win32/wx-console/wx-console.vcproj b/bacula/src/win32/wx-console/wx-console.vcproj
index 8165410838a431a145a876d4331ec2f89632bc34..5ca0447b31c35c44d26bf5e05cb230a7c1b5c528 100644 (file)
--- a/bacula/src/win32/wx-console/wx-console.vcproj
+++ b/bacula/src/win32/wx-console/wx-console.vcproj
@@ -118,7 +118,7 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                AdditionalIncludeDirectories="../compat;&quot;../../../../depkgs-msvc/include&quot;;../..;&quot;../../../../depkgs-msvc\lib\wx_dll\msw&quot;"\r
-                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;wxUSE_GUI;_CONSOLE;HAVE_WIN32;HAVE_WXCONSOLE;USING_DLL;_USE_32BIT_TIME_T;_WIN32_WINNT=0x0500;_CRT_SECURE_NO_DEPRECATE"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;wxUSE_GUI;WXUSINGDLL;__WXMSW__;HAVE_WIN32;HAVE_WXCONSOLE;USING_DLL;_STAT_H;_STAT_DEFINED;_USE_32BIT_TIME_T;_WIN32_WINNT=0x0500;_CRT_SECURE_NO_DEPRECATE"\r
                                RuntimeLibrary="2"\r
                                UsePrecompiledHeader="0"\r
                                BrowseInformation="1"\r