]> git.sur5r.net Git - bacula/bacula/commitdiff
Fix remaining issues with Microsoft Visual Studio build.
authorRobert Nelson <robertn@the-nelsons.org>
Sat, 30 Sep 2006 02:20:47 +0000 (02:20 +0000)
committerRobert Nelson <robertn@the-nelsons.org>
Sat, 30 Sep 2006 02:20:47 +0000 (02:20 +0000)
git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@3519 91ce42f0-d328-0410-95d8-f526ca767f89

36 files changed:
bacula/src/win32/bacula.sln
bacula/src/win32/bacula/bacula.vcproj
bacula/src/win32/build-msvc.cmd [new file with mode: 0644]
bacula/src/win32/cats/cats.vcproj [deleted file]
bacula/src/win32/cats/cats_bdb/cats_bdb.vcproj
bacula/src/win32/cats/cats_mysql/cats_mysql.vcproj
bacula/src/win32/cats/cats_pgsql/cats_pgsql.vcproj
bacula/src/win32/compat/compat.vcproj [deleted file]
bacula/src/win32/console/console.vcproj
bacula/src/win32/dird/dird.vcproj
bacula/src/win32/filed/baculafd.vcproj
bacula/src/win32/installer/Makefile
bacula/src/win32/installer/build-installer.cmd [new file with mode: 0644]
bacula/src/win32/installer/installer.vcproj
bacula/src/win32/installer/winbacula.nsi
bacula/src/win32/libbac/libbac.vcproj
bacula/src/win32/libfind/Makefile [deleted file]
bacula/src/win32/libfind/libfind.vcproj [deleted file]
bacula/src/win32/libwin32/libwin32.vcproj [deleted file]
bacula/src/win32/stored/baculasd/baculasd.vcproj
bacula/src/win32/stored/bcopy/bcopy.vcproj
bacula/src/win32/stored/bextract/bextract.vcproj
bacula/src/win32/stored/bls/bls.vcproj
bacula/src/win32/stored/bscan/bscan.vcproj
bacula/src/win32/stored/btape/btape.vcproj
bacula/src/win32/stored/postest/postest.vcproj
bacula/src/win32/stored/storelib/storelib.vcproj
bacula/src/win32/tools/dbcheck/dbcheck.vcproj
bacula/src/win32/tools/drivetype/drivetype.vcproj
bacula/src/win32/tools/fstype/fstype.vcproj
bacula/src/win32/tools/scsilist/scsilist.vcproj
bacula/src/win32/tools/testfind/testfind.vcproj
bacula/src/win32/tools/testls/testls.vcproj
bacula/src/win32/wx-console/wx-console.vcproj
bacula/src/wx-console/wxbmainframe.cpp
bacula/src/wx-console/wxbmainframe.h

index 9028f3bb0a9d5ff4a3585c0aeb607da47336289b..a48052fdf786bc950002d8bbd25b42250c87c1da 100644 (file)
@@ -42,6 +42,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
        ProjectSection(SolutionItems) = preProject
                build-depkgs-mingw32 = build-depkgs-mingw32
                build-depkgs-msvc.cmd = build-depkgs-msvc.cmd
+               build-msvc.cmd = build-msvc.cmd
                build-win32-cross-tools = build-win32-cross-tools
                ..\..\autoconf\bacula-macros\db.m4 = ..\..\autoconf\bacula-macros\db.m4
                External-mingw32 = External-mingw32
index 07057309620fa4f440f49206b6ae92ee21d7d531..091f0b651fd3a0c4e3e3594ca5d6bff50ed74784 100644 (file)
                                Name="VCCLCompilerTool"
                                Optimization="0"
                                AdditionalIncludeDirectories="../compat;&quot;../../../../depkgs-msvc/include&quot;;../..;&quot;../../../../depkgs-msvc/include/mysql&quot;;&quot;../../../../depkgs-msvc/vss/inc&quot;"
-                               PreprocessorDefinitions="WIN32;_DEBUG;_LIBWIN32;HAVE_WIN32;WIN32_VSS;USING_DLL;_USE_32BIT_TIME_T;_WIN32_WINNT=0x0500;_CRT_SECURE_NO_DEPRECATE"
+                               PreprocessorDefinitions="_DEBUG;_LIB;HAVE_WIN32;WIN32_VSS;USING_DLL;_USE_32BIT_TIME_T;_WIN32_WINNT=0x0500;_CRT_SECURE_NO_DEPRECATE"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="3"
                                RuntimeLibrary="3"
                                UsePrecompiledHeader="0"
+                               BrowseInformation="1"
                                WarningLevel="3"
-                               Detect64BitPortabilityProblems="true"
+                               Detect64BitPortabilityProblems="false"
+                               SuppressStartupBanner="true"
                                DebugInformationFormat="4"
                        />
                        <Tool
@@ -71,6 +73,8 @@
                        />
                        <Tool
                                Name="VCBscMakeTool"
+                               SuppressStartupBanner="true"
+                               OutputFile=".\Debug/bacula.bsc"
                        />
                        <Tool
                                Name="VCFxCopTool"
                        />
                        <Tool
                                Name="VCCLCompilerTool"
-                               Optimization="3"
+                               Optimization="4"
                                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"
+                               PreprocessorDefinitions="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"
diff --git a/bacula/src/win32/build-msvc.cmd b/bacula/src/win32/build-msvc.cmd
new file mode 100644 (file)
index 0000000..8265adb
--- /dev/null
@@ -0,0 +1,7 @@
+@echo off
+setlocal
+PATH ..\..\..\depkgs-msvc\tools;%PATH%
+for /f %%i in ( 'sed -ne "s/.*[ \t]VERSION[ \t][ \t]*\x22\(.*\)\x22/\1/p" ^< ..\version.h' ) do @set VERSION=%%i 
+echo Building Bacula version %VERSION%
+vcbuild bacula.sln %*
+endlocal
diff --git a/bacula/src/win32/cats/cats.vcproj b/bacula/src/win32/cats/cats.vcproj
deleted file mode 100644 (file)
index 09de1b0..0000000
+++ /dev/null
@@ -1,522 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>\r
-<VisualStudioProject\r
-       ProjectType="Visual C++"\r
-       Version="8.00"\r
-       Name="libcats"\r
-       ProjectGUID="{BAB13141-20F9-4B2D-8C0A-021804ADD077}"\r
-       RootNamespace="libcats"\r
-       Keyword="Win32Proj"\r
-       >\r
-       <Platforms>\r
-               <Platform\r
-                       Name="Win32"\r
-               />\r
-       </Platforms>\r
-       <ToolFiles>\r
-       </ToolFiles>\r
-       <Configurations>\r
-               <Configuration\r
-                       Name="Debug|Win32"\r
-                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"\r
-                       IntermediateDirectory="$(ConfigurationName)"\r
-                       ConfigurationType="4"\r
-                       CharacterSet="2"\r
-                       >\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCMIDLTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCCLCompilerTool"\r
-                               Optimization="0"\r
-                               AdditionalIncludeDirectories="../compat;../../../../depkgs-win32/include;../..;../../../../depkgs-win32/include/pthreads;../../../../depkgs-win32/include/mysql;../../../../depkgs-win32/include/postgresql;../../../../depkgs-win32/vss/inc"\r
-                               PreprocessorDefinitions="WIN32;_DEBUG;_LIB;HAVE_WIN32;HAVE_MYSQL;WIN32_VSS;_USE_32BIT_TIME_T;_WIN32_WINNT=0x0500;_CRT_SECURE_NO_DEPRECATE"\r
-                               MinimalRebuild="true"\r
-                               BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="3"\r
-                               UsePrecompiledHeader="0"\r
-                               WarningLevel="3"\r
-                               Detect64BitPortabilityProblems="false"\r
-                               DebugInformationFormat="4"\r
-                       />\r
-                       <Tool\r
-                               Name="VCManagedResourceCompilerTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCLibrarianTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCALinkTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCXDCMakeTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCBscMakeTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCFxCopTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPostBuildEventTool"\r
-                       />\r
-               </Configuration>\r
-               <Configuration\r
-                       Name="Release|Win32"\r
-                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"\r
-                       IntermediateDirectory="$(ConfigurationName)"\r
-                       ConfigurationType="4"\r
-                       UseOfATL="1"\r
-                       CharacterSet="2"\r
-                       WholeProgramOptimization="0"\r
-                       >\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCMIDLTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCCLCompilerTool"\r
-                               AdditionalIncludeDirectories="../compat;../../../../depkgs-win32/include;../..;../../../../depkgs-win32/include/pthreads;../../../../depkgs-win32/include/mysql;../../../../depkgs-win32/include/postgresql;../../../../depkgs-win32/vss/inc"\r
-                               PreprocessorDefinitions="WIN32;NDEBUG;_LIB;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
-                               BrowseInformation="1"\r
-                               WarningLevel="3"\r
-                               Detect64BitPortabilityProblems="false"\r
-                               DebugInformationFormat="3"\r
-                       />\r
-                       <Tool\r
-                               Name="VCManagedResourceCompilerTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCLibrarianTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCALinkTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCXDCMakeTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCBscMakeTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCFxCopTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPostBuildEventTool"\r
-                       />\r
-               </Configuration>\r
-       </Configurations>\r
-       <References>\r
-       </References>\r
-       <Files>\r
-               <Filter\r
-                       Name="Source Files"\r
-                       Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"\r
-                       UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"\r
-                       >\r
-                       <File\r
-                               RelativePath="..\..\cats\bdb.c"\r
-                               >\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               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="..\..\cats\bdb_create.c"\r
-                               >\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               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="..\..\cats\bdb_delete.c"\r
-                               >\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               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="..\..\cats\bdb_find.c"\r
-                               >\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               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="..\..\cats\bdb_get.c"\r
-                               >\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               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="..\..\cats\bdb_list.c"\r
-                               >\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               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="..\..\cats\bdb_update.c"\r
-                               >\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               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="..\..\cats\mysql.c"\r
-                               >\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               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="..\..\cats\postgresql.c"\r
-                               >\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               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="..\..\cats\sql.c"\r
-                               >\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               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="..\..\cats\sql_create.c"\r
-                               >\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               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="..\..\cats\sql_delete.c"\r
-                               >\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               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="..\..\cats\sql_find.c"\r
-                               >\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               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="..\..\cats\sql_get.c"\r
-                               >\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               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="..\..\cats\sql_list.c"\r
-                               >\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               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="..\..\cats\sql_update.c"\r
-                               >\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               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="..\..\cats\sqlite.c"\r
-                               >\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               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
-               </Filter>\r
-               <Filter\r
-                       Name="Header Files"\r
-                       Filter="h;hpp;hxx;hm;inl;inc;xsd"\r
-                       UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"\r
-                       >\r
-                       <File\r
-                               RelativePath="..\..\cats\bdb.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\cats\cats.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\cats\protos.h"\r
-                               >\r
-                       </File>\r
-               </Filter>\r
-               <Filter\r
-                       Name="Resource Files"\r
-                       Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"\r
-                       UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
-                       >\r
-               </Filter>\r
-       </Files>\r
-       <Globals>\r
-       </Globals>\r
-</VisualStudioProject>\r
index 757a3962e08f36a29fe382bfbdb541d0439460c7..24fc1481c950dba2f0ad7970c380d541434bbbf8 100644 (file)
@@ -5,7 +5,6 @@
        Name="cats_bdb"
        ProjectGUID="{1E6FC8D7-0A08-461A-B9AB-FD3CC5DC0B9C}"
        RootNamespace="cats_bdb"
-       Keyword="Win32Proj"
        >
        <Platforms>
                <Platform
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="../../compat;&quot;../../../../../depkgs-msvc/include&quot;;../../..;&quot;../../../../../depkgs-msvc/include/mysql&quot;;&quot;../../../../../depkgs-msvc/vss/inc&quot;"
-                               PreprocessorDefinitions="WIN32;_DEBUG;_LIB;HAVE_WIN32;HAVE_BACULA_DB;USING_DLL;BUILDING_CATS;_USE_32BIT_TIME_T;_WIN32_WINNT=0x0500;_CRT_SECURE_NO_DEPRECATE"
+                               AdditionalIncludeDirectories="../../compat;../../../../../depkgs-msvc/include;../../.."
+                               PreprocessorDefinitions="_DEBUG;_LIB;HAVE_WIN32;HAVE_BACULA_DB;USING_DLL;BUILDING_CATS;_USE_32BIT_TIME_T;_WIN32_WINNT=0x0500;_CRT_SECURE_NO_DEPRECATE"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="3"
                                RuntimeLibrary="3"
                                UsePrecompiledHeader="0"
                                WarningLevel="3"
-                               Detect64BitPortabilityProblems="true"
+                               Detect64BitPortabilityProblems="false"
                                DebugInformationFormat="4"
                        />
                        <Tool
@@ -62,7 +61,7 @@
                        <Tool
                                Name="VCLinkerTool"
                                AdditionalDependencies="bacula_cats.exp"
-                               AdditionalLibraryDirectories="&quot;../../../../../depkgs-msvc/lib&quot;;&quot;../../$(ConfigurationName)&quot;"
+                               AdditionalLibraryDirectories="../../../../../depkgs-msvc/lib;../../$(ConfigurationName)"
                                GenerateDebugInformation="true"
                                SubSystem="2"
                                TargetMachine="1"
                        />
                        <Tool
                                Name="VCCLCompilerTool"
-                               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;HAVE_BACULA_DB;USING_DLL;BUILDING_CATS;_USE_32BIT_TIME_T;_WIN32_WINNT=0x0500;_CRT_SECURE_NO_DEPRECATE"
+                               AdditionalIncludeDirectories="../../compat;../../../../../depkgs-msvc/include;../../.."
+                               PreprocessorDefinitions="NDEBUG;_LIB;HAVE_WIN32;HAVE_BACULA_DB;USING_DLL;BUILDING_CATS;_USE_32BIT_TIME_T;_WIN32_WINNT=0x0500;_CRT_SECURE_NO_DEPRECATE"
                                RuntimeLibrary="2"
                                UsePrecompiledHeader="0"
                                WarningLevel="3"
-                               Detect64BitPortabilityProblems="true"
+                               Detect64BitPortabilityProblems="false"
                                DebugInformationFormat="3"
                        />
                        <Tool
                        <Tool
                                Name="VCLinkerTool"
                                AdditionalDependencies="bacula_cats.exp"
-                               AdditionalLibraryDirectories="&quot;../../../../../depkgs-msvc/lib&quot;;&quot;../../$(ConfigurationName)&quot;"
+                               AdditionalLibraryDirectories="../../../../../depkgs-msvc/lib;../../$(ConfigurationName)"
                                GenerateDebugInformation="true"
                                SubSystem="2"
                                OptimizeReferences="2"
index e7a8a6e37f20ae890386b69e78505b2d27acc444..150d15b46743686fa3c6aa6a158009e599387e47 100644 (file)
@@ -5,7 +5,6 @@
        Name="cats_mysql"
        ProjectGUID="{B52BD53B-0E57-4E9A-A601-8E8171BA1CFC}"
        RootNamespace="cats_mysql"
-       Keyword="Win32Proj"
        >
        <Platforms>
                <Platform
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="../../compat;&quot;../../../../../depkgs-msvc/include&quot;;../../..;&quot;../../../../../depkgs-msvc/include/mysql&quot;;&quot;../../../../../depkgs-msvc/vss/inc&quot;"
-                               PreprocessorDefinitions="WIN32;_DEBUG;_LIB;HAVE_WIN32;HAVE_MYSQL;USING_DLL;BUILDING_CATS;_USE_32BIT_TIME_T;_WIN32_WINNT=0x0500;_CRT_SECURE_NO_DEPRECATE"
+                               AdditionalIncludeDirectories="../../compat;../../../../../depkgs-msvc/include;../../..;../../../../../depkgs-msvc/include/mysql"
+                               PreprocessorDefinitions="_DEBUG;_LIB;HAVE_WIN32;HAVE_MYSQL;USING_DLL;BUILDING_CATS;_USE_32BIT_TIME_T;_WIN32_WINNT=0x0500;_CRT_SECURE_NO_DEPRECATE"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="3"
                                RuntimeLibrary="3"
                                UsePrecompiledHeader="0"
                                WarningLevel="3"
-                               Detect64BitPortabilityProblems="true"
+                               Detect64BitPortabilityProblems="false"
                                DebugInformationFormat="4"
                        />
                        <Tool
@@ -62,7 +61,7 @@
                        <Tool
                                Name="VCLinkerTool"
                                AdditionalDependencies="libmysql.lib bacula_cats.exp"
-                               AdditionalLibraryDirectories="&quot;../../../../../depkgs-msvc/lib&quot;;&quot;../../$(ConfigurationName)&quot;"
+                               AdditionalLibraryDirectories="../../../../../depkgs-msvc/lib;../../$(ConfigurationName)"
                                GenerateDebugInformation="true"
                                SubSystem="2"
                                TargetMachine="1"
                        />
                        <Tool
                                Name="VCCLCompilerTool"
-                               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;HAVE_MYSQL;USING_DLL;BUILDING_CATS;_USE_32BIT_TIME_T;_WIN32_WINNT=0x0500;_CRT_SECURE_NO_DEPRECATE"
+                               AdditionalIncludeDirectories="../../compat;../../../../../depkgs-msvc/include;../../..;../../../../../depkgs-msvc/include/mysql"
+                               PreprocessorDefinitions="NDEBUG;_LIB;HAVE_WIN32;HAVE_MYSQL;USING_DLL;BUILDING_CATS;_USE_32BIT_TIME_T;_WIN32_WINNT=0x0500;_CRT_SECURE_NO_DEPRECATE"
                                RuntimeLibrary="2"
                                UsePrecompiledHeader="0"
                                WarningLevel="3"
-                               Detect64BitPortabilityProblems="true"
+                               Detect64BitPortabilityProblems="false"
                                DebugInformationFormat="3"
                        />
                        <Tool
index 410ac41af6039b9f43b12d1879bab58c674722a8..471006dd89ce792e30e72e92650a67b9ed8b87e6 100644 (file)
@@ -5,7 +5,6 @@
        Name="cats_pgsql"
        ProjectGUID="{2FB961E5-213C-4475-8CB3-72F904D40752}"
        RootNamespace="cats_pgsql"
-       Keyword="Win32Proj"
        >
        <Platforms>
                <Platform
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="../../compat;&quot;../../../../../depkgs-msvc/include&quot;;../../..;&quot;../../../../../depkgs-msvc/include/mysql&quot;;&quot;../../../../../depkgs-msvc/vss/inc&quot;"
-                               PreprocessorDefinitions="WIN32;_DEBUG;_LIB;HAVE_WIN32;HAVE_POSTGRESQL;USING_DLL;BUILDING_CATS;_USE_32BIT_TIME_T;_WIN32_WINNT=0x0500;_CRT_SECURE_NO_DEPRECATE"
+                               AdditionalIncludeDirectories="../../compat;../../../../../depkgs-msvc/include;../../.."
+                               PreprocessorDefinitions="_DEBUG;_LIB;HAVE_WIN32;HAVE_POSTGRESQL;USING_DLL;BUILDING_CATS;_USE_32BIT_TIME_T;_WIN32_WINNT=0x0500;_CRT_SECURE_NO_DEPRECATE"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="3"
                                RuntimeLibrary="3"
                                UsePrecompiledHeader="0"
                                WarningLevel="3"
-                               Detect64BitPortabilityProblems="true"
+                               Detect64BitPortabilityProblems="false"
                                DebugInformationFormat="4"
                        />
                        <Tool
@@ -62,7 +61,7 @@
                        <Tool
                                Name="VCLinkerTool"
                                AdditionalDependencies="libpqdll.lib bacula_cats.exp"
-                               AdditionalLibraryDirectories="&quot;../../../../../depkgs-msvc/lib&quot;;&quot;../../$(ConfigurationName)&quot;"
+                               AdditionalLibraryDirectories="../../../../../depkgs-msvc/lib;../../$(ConfigurationName)"
                                GenerateDebugInformation="true"
                                SubSystem="2"
                                TargetMachine="1"
                        />
                        <Tool
                                Name="VCCLCompilerTool"
-                               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;HAVE_POSTGRESQL;USING_DLL;BUILDING_CATS;_USE_32BIT_TIME_T;_WIN32_WINNT=0x0500;_CRT_SECURE_NO_DEPRECATE"
+                               AdditionalIncludeDirectories="../../compat;../../../../../depkgs-msvc/include;../../.."
+                               PreprocessorDefinitions="NDEBUG;_LIB;HAVE_WIN32;HAVE_POSTGRESQL;USING_DLL;BUILDING_CATS;_USE_32BIT_TIME_T;_WIN32_WINNT=0x0500;_CRT_SECURE_NO_DEPRECATE"
                                RuntimeLibrary="2"
                                UsePrecompiledHeader="0"
                                WarningLevel="3"
                        <Tool
                                Name="VCLinkerTool"
                                AdditionalDependencies="libpqdll.lib bacula_cats.exp"
-                               AdditionalLibraryDirectories="&quot;../../../../../depkgs-msvc/lib&quot;;&quot;../../$(ConfigurationName)&quot;"
+                               AdditionalLibraryDirectories="../../../../../depkgs-msvc/lib;../../$(ConfigurationName)"
                                GenerateDebugInformation="true"
                                SubSystem="2"
                                OptimizeReferences="2"
diff --git a/bacula/src/win32/compat/compat.vcproj b/bacula/src/win32/compat/compat.vcproj
deleted file mode 100644 (file)
index a69878b..0000000
+++ /dev/null
@@ -1,299 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>\r
-<VisualStudioProject\r
-       ProjectType="Visual C++"\r
-       Version="8.00"\r
-       Name="compat"\r
-       ProjectGUID="{05CF01A0-3C11-443B-B14B-D806C79212F1}"\r
-       RootNamespace="compat"\r
-       Keyword="Win32Proj"\r
-       >\r
-       <Platforms>\r
-               <Platform\r
-                       Name="Win32"\r
-               />\r
-       </Platforms>\r
-       <ToolFiles>\r
-       </ToolFiles>\r
-       <Configurations>\r
-               <Configuration\r
-                       Name="Debug|Win32"\r
-                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"\r
-                       IntermediateDirectory="$(ConfigurationName)"\r
-                       ConfigurationType="4"\r
-                       CharacterSet="2"\r
-                       >\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCMIDLTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCCLCompilerTool"\r
-                               Optimization="0"\r
-                               AdditionalIncludeDirectories="../compat;../../../../depkgs-win32/include;../..;../../../../depkgs-win32/include/pthreads;../../../../depkgs-win32/include/mysql;../../../../depkgs-win32/include/postgresql;../../../../depkgs-win32/vss/inc"\r
-                               PreprocessorDefinitions="WIN32;_DEBUG;_LIB;HAVE_WIN32;WIN32_VSS;_USE_32BIT_TIME_T;_WIN32_WINNT=0x0500;_CRT_SECURE_NO_DEPRECATE"\r
-                               MinimalRebuild="true"\r
-                               BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="3"\r
-                               UsePrecompiledHeader="0"\r
-                               WarningLevel="3"\r
-                               Detect64BitPortabilityProblems="false"\r
-                               DebugInformationFormat="4"\r
-                       />\r
-                       <Tool\r
-                               Name="VCManagedResourceCompilerTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCLibrarianTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCALinkTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCXDCMakeTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCBscMakeTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCFxCopTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPostBuildEventTool"\r
-                       />\r
-               </Configuration>\r
-               <Configuration\r
-                       Name="Release|Win32"\r
-                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"\r
-                       IntermediateDirectory="$(ConfigurationName)"\r
-                       ConfigurationType="4"\r
-                       UseOfATL="1"\r
-                       CharacterSet="2"\r
-                       WholeProgramOptimization="0"\r
-                       >\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCMIDLTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCCLCompilerTool"\r
-                               AdditionalIncludeDirectories="../compat;../../../../depkgs-win32/include;../..;../../../../depkgs-win32/include/pthreads;../../../../depkgs-win32/include/mysql;../../../../depkgs-win32/include/postgresql;../../../../depkgs-win32/vss/inc"\r
-                               PreprocessorDefinitions="WIN32;NDEBUG;_LIB;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
-                               GenerateXMLDocumentationFiles="false"\r
-                               BrowseInformation="1"\r
-                               WarningLevel="3"\r
-                               Detect64BitPortabilityProblems="false"\r
-                               DebugInformationFormat="3"\r
-                       />\r
-                       <Tool\r
-                               Name="VCManagedResourceCompilerTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCLibrarianTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCALinkTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCXDCMakeTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCBscMakeTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCFxCopTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPostBuildEventTool"\r
-                       />\r
-               </Configuration>\r
-       </Configurations>\r
-       <References>\r
-       </References>\r
-       <Files>\r
-               <Filter\r
-                       Name="Source Files"\r
-                       Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"\r
-                       UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"\r
-                       >\r
-                       <File\r
-                               RelativePath=".\compat.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\getopt.c"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\print.cpp"\r
-                               >\r
-                       </File>\r
-               </Filter>\r
-               <Filter\r
-                       Name="Header Files"\r
-                       Filter="h;hpp;hxx;hm;inl;inc;xsd"\r
-                       UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"\r
-                       >\r
-                       <File\r
-                               RelativePath=".\alloca.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\compat.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\dirent.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\sys\file.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\sys\file.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\getopt.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\grp.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\sys\ioctl.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\mswinver.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\sys\mtio.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\netdb.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\pwd.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\sched.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\sys\socket.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\sys\socket.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\sys\stat.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\sys\stat.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\stdint.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\strings.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\syslog.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\sys\time.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\sys\time.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\unistd.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\vss.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\sys\wait.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\sys\wait.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\winconfig.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\winhost.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\winsock.h"\r
-                               >\r
-                       </File>\r
-               </Filter>\r
-               <Filter\r
-                       Name="Resource Files"\r
-                       Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"\r
-                       UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
-                       >\r
-               </Filter>\r
-       </Files>\r
-       <Globals>\r
-       </Globals>\r
-</VisualStudioProject>\r
index e38c482db507d667c9204628d3b152308f641f05..57bbea9c919b1ee4b9625f894a966bd020b57a86 100644 (file)
@@ -5,7 +5,6 @@
        Name="console"\r
        ProjectGUID="{A0F65E06-9F18-40AC-81F6-A080852F1104}"\r
        RootNamespace="console"\r
-       Keyword="MFCProj"\r
        >\r
        <Platforms>\r
                <Platform\r
@@ -18,9 +17,8 @@
                <Configuration\r
                        Name="Debug|Win32"\r
                        OutputDirectory="$(SolutionDir)$(ConfigurationName)"\r
-                       IntermediateDirectory=".\Debug"\r
+                       IntermediateDirectory="$(ConfigurationName)"\r
                        ConfigurationType="1"\r
-                       InheritedPropertySheets="..\..\..\..\..\..\Program Files\Microsoft Visual Studio 8\VC\VCProjectDefaults\UpgradeFromVC60.vsprops"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
                        CharacterSet="2"\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories="../compat;&quot;../../../../depkgs-msvc/include&quot;;../..;&quot;../../../../depkgs-msvc/include/mysql&quot;"\r
+                               AdditionalIncludeDirectories="../compat;../../../../depkgs-msvc/include;../.."\r
                                PreprocessorDefinitions="_DEBUG;HAVE_CONSOLE;_WINMAIN_;PTW32_BUILD;WIN32;_CONSOLE;HAVE_WIN32;USING_DLL;_USE_32BIT_TIME_T;_WIN32_WINNT=0x0500;_CRT_SECURE_NO_DEPRECATE"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
                                RuntimeLibrary="3"\r
-                               PrecompiledHeaderFile=".\Debug/console.pch"\r
-                               AssemblerListingLocation=".\Debug/"\r
-                               ObjectFile=".\Debug/"\r
-                               ProgramDataBaseFileName=".\Debug/"\r
+                               UsePrecompiledHeader="0"\r
+                               BrowseInformation="1"\r
                                WarningLevel="3"\r
+                               Detect64BitPortabilityProblems="false"\r
                                SuppressStartupBanner="true"\r
                                DebugInformationFormat="4"\r
                        />\r
                <Configuration\r
                        Name="Release|Win32"\r
                        OutputDirectory="$(SolutionDir)$(ConfigurationName)"\r
-                       IntermediateDirectory=".\Release"\r
+                       IntermediateDirectory="$(ConfigurationName)"\r
                        ConfigurationType="1"\r
-                       InheritedPropertySheets="..\..\..\..\..\..\Program Files\Microsoft Visual Studio 8\VC\VCProjectDefaults\UpgradeFromVC60.vsprops"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
                        CharacterSet="2"\r
+                       WholeProgramOptimization="1"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="4"\r
-                               AdditionalIncludeDirectories="../compat;&quot;../../../../depkgs-msvc/include&quot;;../..;&quot;../../../../depkgs-msvc/include/mysql&quot;"\r
+                               InlineFunctionExpansion="2"\r
+                               EnableIntrinsicFunctions="true"\r
+                               AdditionalIncludeDirectories="../compat;../../../../depkgs-msvc/include;../.."\r
                                PreprocessorDefinitions="NDEBUG;HAVE_CONSOLE;_WINMAIN_;PTW32_BUILD;WIN32;_CONSOLE;HAVE_WIN32;USING_DLL;_USE_32BIT_TIME_T;_WIN32_WINNT=0x0500;_CRT_SECURE_NO_DEPRECATE"\r
                                StringPooling="true"\r
                                BasicRuntimeChecks="3"\r
                                RuntimeLibrary="2"\r
-                               PrecompiledHeaderFile=".\Release/console.pch"\r
-                               AssemblerListingLocation=".\Release/"\r
-                               ObjectFile=".\Release/"\r
-                               ProgramDataBaseFileName=".\Release/"\r
+                               UsePrecompiledHeader="0"\r
                                BrowseInformation="1"\r
                                WarningLevel="3"\r
+                               Detect64BitPortabilityProblems="false"\r
                                SuppressStartupBanner="true"\r
                                DebugInformationFormat="3"\r
                        />\r
index 0cd5f7444b12e73c00d27fa6818e61efc1d80958..c50661d15c8b0072fe04e1d6150b36d02fb17ff9 100644 (file)
        </ToolFiles>\r
        <Configurations>\r
                <Configuration\r
-                       Name="Release|Win32"\r
+                       Name="Debug|Win32"\r
                        OutputDirectory="$(SolutionDir)$(ConfigurationName)"\r
-                       IntermediateDirectory=".\Release"\r
+                       IntermediateDirectory="$(ConfigurationName)"\r
                        ConfigurationType="1"\r
-                       InheritedPropertySheets="..\..\..\..\..\..\Program Files\Microsoft Visual Studio 8\VC\VCProjectDefaults\UpgradeFromVC60.vsprops"\r
                        UseOfMFC="0"\r
-                       UseOfATL="1"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
                        CharacterSet="2"\r
                        >\r
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               TypeLibraryName=".\Release/baculadird.tlb"\r
+                               TypeLibraryName=".\Debug/baculadird.tlb"\r
                                HeaderFileName=""\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               Optimization="3"\r
-                               InlineFunctionExpansion="2"\r
-                               EnableIntrinsicFunctions="true"\r
+                               Optimization="0"\r
                                AdditionalIncludeDirectories="../compat;&quot;../../../../depkgs-msvc/include&quot;;../.."\r
-                               PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE;HAVE_WIN32;USING_DLL;USING_CATS;_USE_32BIT_TIME_T;_WIN32_WINNT=0x0500;_CRT_SECURE_NO_DEPRECATE"\r
-                               StringPooling="true"\r
-                               RuntimeLibrary="2"\r
-                               EnableFunctionLevelLinking="true"\r
-                               PrecompiledHeaderFile=".\Release/baculadird.pch"\r
-                               AssemblerListingLocation=".\Release/"\r
-                               ObjectFile=".\Release/"\r
-                               ProgramDataBaseFileName=".\Release/"\r
+                               PreprocessorDefinitions="_DEBUG;_WINMAIN_;PTW32_BUILD;WIN32;_CONSOLE;HAVE_WIN32;USING_DLL;USING_CATS;_USE_32BIT_TIME_T;_WIN32_WINNT=0x0500;_CRT_SECURE_NO_DEPRECATE"\r
+                               MinimalRebuild="true"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
+                               UsePrecompiledHeader="0"\r
                                BrowseInformation="1"\r
                                WarningLevel="3"\r
+                               Detect64BitPortabilityProblems="false"\r
                                SuppressStartupBanner="true"\r
-                               DebugInformationFormat="3"\r
+                               DebugInformationFormat="4"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="NDEBUG"\r
+                               PreprocessorDefinitions="_DEBUG"\r
                                Culture="1033"\r
-                               AdditionalIncludeDirectories=""\r
                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="bacula_cats.lib pthreadVCE.lib libmysql.lib zlib.lib wsock32.lib atls.lib"\r
+                               AdditionalDependencies="bacula_cats.lib pthreadVCE.lib zlib.lib wsock32.lib atlsd.lib"\r
                                OutputFile="$(OutDir)\bacula-dir.exe"\r
                                LinkIncremental="0"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories="&quot;../../../../depkgs-msvc/lib&quot;;&quot;$(SolutionDir)$(ConfigurationName)&quot;"\r
-                               IgnoreDefaultLibraryNames=""\r
-                               DelayLoadDLLs="$(NOINHERIT)"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
@@ -98,7 +89,7 @@
                        <Tool\r
                                Name="VCBscMakeTool"\r
                                SuppressStartupBanner="true"\r
-                               OutputFile=".\Release/baculadird.bsc"\r
+                               OutputFile=".\Debug/baculadird.bsc"\r
                        />\r
                        <Tool\r
                                Name="VCFxCopTool"\r
                        />\r
                </Configuration>\r
                <Configuration\r
-                       Name="Debug|Win32"\r
+                       Name="Release|Win32"\r
                        OutputDirectory="$(SolutionDir)$(ConfigurationName)"\r
-                       IntermediateDirectory=".\Debug"\r
+                       IntermediateDirectory="$(ConfigurationName)"\r
                        ConfigurationType="1"\r
-                       InheritedPropertySheets="..\..\..\..\..\..\Program Files\Microsoft Visual Studio 8\VC\VCProjectDefaults\UpgradeFromVC60.vsprops"\r
                        UseOfMFC="0"\r
+                       UseOfATL="1"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
                        CharacterSet="2"\r
+                       WholeProgramOptimization="1"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               TypeLibraryName=".\Debug/baculadird.tlb"\r
+                               TypeLibraryName=".\Release/baculadird.tlb"\r
                                HeaderFileName=""\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               Optimization="0"\r
+                               Optimization="4"\r
+                               InlineFunctionExpansion="2"\r
+                               EnableIntrinsicFunctions="true"\r
                                AdditionalIncludeDirectories="../compat;&quot;../../../../depkgs-msvc/include&quot;;../.."\r
-                               PreprocessorDefinitions="_DEBUG;_WINMAIN_;PTW32_BUILD;WIN32;_CONSOLE;HAVE_WIN32;USING_DLL;USING_CATS;_USE_32BIT_TIME_T;_WIN32_WINNT=0x0500;_CRT_SECURE_NO_DEPRECATE"\r
-                               MinimalRebuild="true"\r
-                               BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="3"\r
-                               PrecompiledHeaderFile=".\Debug/baculadird.pch"\r
-                               AssemblerListingLocation=".\Debug/"\r
-                               ObjectFile=".\Debug/"\r
-                               ProgramDataBaseFileName=".\Debug/"\r
+                               PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE;HAVE_WIN32;USING_DLL;USING_CATS;_USE_32BIT_TIME_T;_WIN32_WINNT=0x0500;_CRT_SECURE_NO_DEPRECATE"\r
+                               StringPooling="true"\r
+                               RuntimeLibrary="2"\r
+                               EnableFunctionLevelLinking="true"\r
                                BrowseInformation="1"\r
                                WarningLevel="3"\r
+                               Detect64BitPortabilityProblems="false"\r
                                SuppressStartupBanner="true"\r
-                               DebugInformationFormat="4"\r
+                               DebugInformationFormat="3"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG"\r
+                               PreprocessorDefinitions="NDEBUG"\r
                                Culture="1033"\r
+                               AdditionalIncludeDirectories=""\r
                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="bacula_cats.lib pthreadVCE.lib zlib.lib wsock32.lib atlsd.lib"\r
+                               AdditionalDependencies="bacula_cats.lib pthreadVCE.lib libmysql.lib zlib.lib wsock32.lib atls.lib"\r
                                OutputFile="$(OutDir)\bacula-dir.exe"\r
                                LinkIncremental="0"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories="&quot;../../../../depkgs-msvc/lib&quot;;&quot;$(SolutionDir)$(ConfigurationName)&quot;"\r
                                IgnoreDefaultLibraryNames=""\r
+                               DelayLoadDLLs="$(NOINHERIT)"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
                        <Tool\r
                                Name="VCBscMakeTool"\r
                                SuppressStartupBanner="true"\r
-                               OutputFile=".\Debug/baculadird.bsc"\r
+                               OutputFile=".\Release/baculadird.bsc"\r
                        />\r
                        <Tool\r
                                Name="VCFxCopTool"\r
index 71f6463ffc5f7c11c4f4f77fcc511f0f82ded2e2..0b3188a67d68a6fc4544ee511f3c92daed48b668 100644 (file)
@@ -5,7 +5,6 @@
        Name="baculafd"\r
        ProjectGUID="{6A435DBB-4D3D-4DAE-8CB3-E0AF169A240B}"\r
        RootNamespace="baculafd"\r
-       Keyword="MFCProj"\r
        >\r
        <Platforms>\r
                <Platform\r
        </ToolFiles>\r
        <Configurations>\r
                <Configuration\r
-                       Name="Release|Win32"\r
+                       Name="Debug|Win32"\r
                        OutputDirectory="$(SolutionDir)$(ConfigurationName)"\r
-                       IntermediateDirectory=".\Release"\r
+                       IntermediateDirectory="$(ConfigurationName)"\r
                        ConfigurationType="1"\r
-                       InheritedPropertySheets="..\..\..\..\..\..\Program Files\Microsoft Visual Studio 8\VC\VCProjectDefaults\UpgradeFromVC60.vsprops"\r
                        UseOfMFC="0"\r
-                       UseOfATL="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
                        CharacterSet="2"\r
-                       WholeProgramOptimization="1"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               TypeLibraryName=".\Release/baculafd.tlb"\r
+                               TypeLibraryName=".\Debug/baculafd.tlb"\r
                                HeaderFileName=""\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               Optimization="3"\r
-                               InlineFunctionExpansion="2"\r
-                               EnableIntrinsicFunctions="true"\r
-                               AdditionalIncludeDirectories=".;../compat;&quot;../../../../depkgs-msvc/include&quot;;../..;&quot;../../../../depkgs-msvc/include/mysql&quot;;&quot;../../../../depkgs-msvc/vss&quot;;../libwin32"\r
-                               PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE;HAVE_WIN32;WIN32_VSS;USING_DLL;_USE_32BIT_TIME_T;_WIN32_WINNT=0x0500;_CRT_SECURE_NO_DEPRECATE"\r
-                               StringPooling="true"\r
-                               RuntimeLibrary="2"\r
-                               EnableFunctionLevelLinking="true"\r
-                               PrecompiledHeaderFile=".\Release/baculafd.pch"\r
-                               AssemblerListingLocation=".\Release/"\r
-                               ObjectFile=".\Release/"\r
-                               ProgramDataBaseFileName=".\Release/"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories=".;../compat;../../../../depkgs-msvc/include;../..;../../../../depkgs-msvc/vss;../libwin32"\r
+                               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"\r
+                               MinimalRebuild="true"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
+                               UsePrecompiledHeader="0"\r
                                BrowseInformation="1"\r
                                WarningLevel="3"\r
+                               Detect64BitPortabilityProblems="false"\r
                                SuppressStartupBanner="true"\r
-                               DebugInformationFormat="3"\r
+                               DebugInformationFormat="4"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="NDEBUG"\r
+                               PreprocessorDefinitions="_DEBUG"\r
                                Culture="1033"\r
-                               AdditionalIncludeDirectories=""\r
                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="pthreadVCE.lib zlib.lib wsock32.lib atls.lib"\r
+                               AdditionalDependencies="pthreadVCE.lib zlib.lib wsock32.lib atlsd.lib"\r
                                OutputFile="$(OutDir)\bacula-fd.exe"\r
                                LinkIncremental="0"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories="../../../../depkgs-msvc/lib"\r
-                               IgnoreDefaultLibraryNames=""\r
-                               DelayLoadDLLs="$(NOINHERIT)"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
                        <Tool\r
                                Name="VCBscMakeTool"\r
                                SuppressStartupBanner="true"\r
-                               OutputFile=".\Release/baculafd.bsc"\r
+                               OutputFile=".\Debug/baculafd.bsc"\r
                        />\r
                        <Tool\r
                                Name="VCFxCopTool"\r
                        />\r
                </Configuration>\r
                <Configuration\r
-                       Name="Debug|Win32"\r
+                       Name="Release|Win32"\r
                        OutputDirectory="$(SolutionDir)$(ConfigurationName)"\r
-                       IntermediateDirectory=".\Debug"\r
+                       IntermediateDirectory="$(ConfigurationName)"\r
                        ConfigurationType="1"\r
-                       InheritedPropertySheets="..\..\..\..\..\..\Program Files\Microsoft Visual Studio 8\VC\VCProjectDefaults\UpgradeFromVC60.vsprops"\r
                        UseOfMFC="0"\r
+                       UseOfATL="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
                        CharacterSet="2"\r
+                       WholeProgramOptimization="1"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               TypeLibraryName=".\Debug/baculafd.tlb"\r
+                               TypeLibraryName=".\Release/baculafd.tlb"\r
                                HeaderFileName=""\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               Optimization="0"\r
-                               AdditionalIncludeDirectories=".;../compat;&quot;../../../../depkgs-msvc/include&quot;;../..;&quot;../../../../depkgs-msvc/include/mysql&quot;;&quot;../../../../depkgs-msvc/vss&quot;;../libwin32"\r
-                               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"\r
-                               MinimalRebuild="true"\r
+                               Optimization="4"\r
+                               InlineFunctionExpansion="2"\r
+                               EnableIntrinsicFunctions="true"\r
+                               AdditionalIncludeDirectories=".;../compat;../../../../depkgs-msvc/include;../..;../../../../depkgs-msvc/vss;../libwin32"\r
+                               PreprocessorDefinitions="NDEBUG;_CONSOLE;HAVE_WIN32;WIN32_VSS;USING_DLL;_USE_32BIT_TIME_T;_WIN32_WINNT=0x0500;_CRT_SECURE_NO_DEPRECATE"\r
+                               StringPooling="true"\r
                                BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="3"\r
-                               PrecompiledHeaderFile=".\Debug/baculafd.pch"\r
-                               AssemblerListingLocation=".\Debug/"\r
-                               ObjectFile=".\Debug/"\r
-                               ProgramDataBaseFileName=".\Debug/"\r
+                               RuntimeLibrary="2"\r
+                               EnableFunctionLevelLinking="true"\r
+                               UsePrecompiledHeader="0"\r
                                BrowseInformation="1"\r
                                WarningLevel="3"\r
+                               Detect64BitPortabilityProblems="false"\r
                                SuppressStartupBanner="true"\r
                                DebugInformationFormat="3"\r
                        />\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG"\r
+                               PreprocessorDefinitions="NDEBUG"\r
                                Culture="1033"\r
+                               AdditionalIncludeDirectories=""\r
                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="pthreadVCE.lib zlib.lib wsock32.lib atlsd.lib"\r
+                               AdditionalDependencies="pthreadVCE.lib zlib.lib wsock32.lib atls.lib"\r
                                OutputFile="$(OutDir)\bacula-fd.exe"\r
                                LinkIncremental="0"\r
                                SuppressStartupBanner="true"\r
-                               AdditionalLibraryDirectories="&quot;../../../../depkgs-msvc/lib&quot;"\r
-                               IgnoreDefaultLibraryNames=""\r
+                               AdditionalLibraryDirectories="../../../../depkgs-msvc/lib"\r
+                               DelayLoadDLLs="$(NOINHERIT)"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
                        <Tool\r
                                Name="VCBscMakeTool"\r
                                SuppressStartupBanner="true"\r
-                               OutputFile=".\Debug/baculafd.bsc"\r
+                               OutputFile=".\Release/baculafd.bsc"\r
                        />\r
                        <Tool\r
                                Name="VCFxCopTool"\r
index 486deb5116da41de99f5a1a38dd9cb08ab8cb036..5dc52baf67bb021155fd1c6e4f8bbbfeb26fb2e3 100644 (file)
@@ -11,6 +11,7 @@ VERSION := $(shell sed -ne 's/.*[ \t]VERSION[ \t][ \t]*"\(.*\)"/\1/p' < ../../ve
 
 DEFINES := \
        -DVERSION=$(VERSION) \
+       -DOUT_DIR=..\\release \
        -DDOC_DIR=$(DOCDIR) \
        -DBUILD_TOOLS=MinGW \
        -DMINGW_BIN=$(MINGW_BIN) \
@@ -19,7 +20,7 @@ DEFINES := \
        -DCATS_DIR=..\\cats \
        -DSCRIPT_DIR=..\\scripts
 
-INSTALL_EXE := winbacula-$(VERSION).exe
+INSTALL_EXE := ../release/winbacula-$(VERSION).exe
 
 BACULA_BINARIES := \
        bacula.dll \
diff --git a/bacula/src/win32/installer/build-installer.cmd b/bacula/src/win32/installer/build-installer.cmd
new file mode 100644 (file)
index 0000000..0415cf2
--- /dev/null
@@ -0,0 +1,7 @@
+@ECHO OFF
+SETLOCAL
+PATH ..\..\..\..\depkgs-msvc\nsis;..\..\..\..\depkgs-msvc\tools;%PATH%
+FOR /F %%i IN ( 'sed -ne "s/.*[ \t]VERSION[ \t][ \t]*\x22\(.*\)\x22/\1/p" ^< ..\..\version.h' ) DO @SET VERSION=%%i 
+makensis /V3 /DVERSION=%VERSION% /DOUT_DIR=%1%2 /DDOC_DIR=..\..\..\..\docs /DBUILD_TOOLS=%3 /DVC_REDIST_DIR=%4 /DDEPKGS_BIN=..\..\..\..\depkgs-msvc\bin /DBACULA_BIN=..\%2 /DCATS_DIR=..\cats /DSCRIPT_DIR=..\scripts winbacula.nsi
+EXIT /B %ERRORLEVEL%
+ENDLOCAL
index 17021b690cb3d6e5741fe0fcce3eb9f874a4057b..f203deff8c1f7442247995f736da2c95cb4948b5 100644 (file)
                        >
                        <Tool
                                Name="VCNMakeTool"
-                               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.23.exe"
+                               BuildCommandLine="build-installer $(SolutionDir) $(ConfigurationName) VC8_DEBUG &quot;$(VCInstallDir)redist\Debug_NonRedist\x86\Microsoft.VC80.DebugCRT&quot;&#x0D;&#x0A;"
+                               ReBuildCommandLine="del $(SolutionDir)$(ConfigurationName)\winbacula-*.exe&#x0D;&#x0A;build-installer $(SolutionDir) $(ConfigurationName) VC8_DEBUG &quot;$(VCInstallDir)redist\Debug_NonRedist\x86\Microsoft.VC80.DebugCRT&quot;&#x0D;&#x0A;"
+                               CleanCommandLine="del $(SolutionDir)$(ConfigurationName)\winbacula-*.exe"
+                               Output=""
                                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=""
                        >
                        <Tool
                                Name="VCNMakeTool"
-                               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="winbacula-1.39.23.exe"
+                               BuildCommandLine="build-installer $(SolutionDir) $(ConfigurationName) VC8 &quot;$(VCInstallDir)redist\x86\Microsoft.VC80.CRT&quot;&#x0D;&#x0A;"
+                               ReBuildCommandLine="del $(SolutionDir)$(ConfigurationName)\winbacula-*.exe&#x0D;&#x0A;build-installer $(SolutionDir) $(ConfigurationName) VC8 &quot;$(VCInstallDir)redist\x86\Microsoft.VC80.CRT&quot;&#x0D;&#x0A;"
+                               CleanCommandLine="del $(SolutionDir)$(ConfigurationName)\winbacula-*.exe"
+                               Output=""
                                PreprocessorDefinitions=""
                                IncludeSearchPath=""
                                ForcedIncludes=""
                        RelativePath=".\bconsole.conf.in"
                        >
                </File>
+               <File
+                       RelativePath=".\build-installer.cmd"
+                       >
+               </File>
                <File
                        RelativePath=".\client.conf.in"
                        >
index 0cc065105dbc29cfb3062b01db0264a364cacf3d..44f01adce71cc1f4e3dc230dc5ba985814e16e73 100644 (file)
@@ -50,7 +50,7 @@
 ; Basics
 ;
 Name "Bacula"
-OutFile "winbacula-${VERSION}.exe"
+OutFile "${OUT_DIR}\winbacula-${VERSION}.exe"
 SetCompressor lzma
 InstallDir "$PROGRAMFILES\Bacula"
 InstallDirRegKey HKLM "Software\Bacula" "InstallLocation"
index f9adfa9b31b90c5c6222d399ccf13259089040ea..75b52997a16949b30708ea4b897f6f55ad49c6c4 100644 (file)
@@ -48,7 +48,8 @@
                                UsePrecompiledHeader="0"\r
                                WarningLevel="3"\r
                                Detect64BitPortabilityProblems="false"\r
-                               DebugInformationFormat="3"\r
+                               SuppressStartupBanner="true"\r
+                               DebugInformationFormat="4"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
                        ConfigurationType="2"\r
                        UseOfATL="1"\r
                        CharacterSet="2"\r
-                       WholeProgramOptimization="0"\r
+                       WholeProgramOptimization="1"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
+                               Optimization="4"\r
+                               InlineFunctionExpansion="2"\r
+                               EnableIntrinsicFunctions="true"\r
                                AdditionalIncludeDirectories="../compat;&quot;../../../../depkgs-msvc/include&quot;;../.."\r
                                PreprocessorDefinitions="WIN32;NDEBUG;_LIB;HAVE_WIN32;WIN32_VSS;BUILDING_DLL;_USE_32BIT_TIME_T;_WIN32_WINNT=0x0500;_CRT_SECURE_NO_DEPRECATE"\r
+                               StringPooling="true"\r
+                               BasicRuntimeChecks="3"\r
                                RuntimeLibrary="2"\r
                                EnableFunctionLevelLinking="true"\r
                                UsePrecompiledHeader="0"\r
                                Name="VCLinkerTool"\r
                                AdditionalDependencies="wsock32.lib pthreadVCE.lib ssleay32.lib libeay32.lib "\r
                                OutputFile="$(OutDir)\bacula.dll"\r
+                               LinkIncremental="0"\r
+                               SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories="..\..\..\..\depkgs-msvc\lib"\r
                                ModuleDefinitionFile="msvc\bacula.def"\r
                                ImportLibrary="$(TargetDir)libbac.lib"\r
+                               GenerateDebugInformation="true"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
diff --git a/bacula/src/win32/libfind/Makefile b/bacula/src/win32/libfind/Makefile
deleted file mode 100644 (file)
index 8f36f4e..0000000
+++ /dev/null
@@ -1,66 +0,0 @@
-#
-# Makefile for win32 bacula executables
-# Using MinGW cross-compiler on GNU/Linux
-#  
-#  Written for Bacula by Howard Thomson, April 2006
-# 
-
-include ../Makefile.inc
-
-INCLUDES = \
-       $(INCLUDE_GCC) \
-       $(INCLUDE_MINGW) \
-       $(INCLUDE_PTHREADS) \
-       $(INCLUDE_BACULA) \
-       $(INCLUDE_ZLIB) \
-       $(INCLUDE_VSS) \
-       $(INCLUDE_ICONS) \
-       $(INCLUDE_OPENSSL)
-
-DEFINES = \
-       -DWIN32 \
-       $(HAVES)
-
-######################################################################
-
-# Files files in src/lib
-
-LIB_OBJS = \
-       $(OBJDIR)/attribs.o \
-       $(OBJDIR)/bfile.o \
-       $(OBJDIR)/create_file.o \
-       $(OBJDIR)/drivetype.o \
-       $(OBJDIR)/enable_priv.o \
-       $(OBJDIR)/find.o \
-       $(OBJDIR)/find_one.o \
-       $(OBJDIR)/fstype.o \
-       $(OBJDIR)/makepath.o \
-       $(OBJDIR)/match.o \
-       $(OBJDIR)/save-cwd.o
-
-######################################################################
-
-# Targets
-
-.PHONY: all clean
-
-all: $(LIBDIR)/libfind.a
-
-clean:
-       @echo "Cleaning `pwd`"
-       $(ECHO_CMD)rm -f $(OBJDIR)/*.[od] $(LIBDIR)/libfind.a
-
-#
-# Rules for generating from ../lib
-# 
-
-$(LIBDIR)/libfind.a: $(LIB_OBJS)
-       @echo "Updating archive $@"
-       $(call checkdir,$@)
-       $(ECHO_CMD)$(AR) rs $@ $^
-
-include ../Makefile.rules
-
-ifneq ($(MAKECMDGOALS),clean)
-include $(patsubst %.o,%.d,$(filter-out %.res,$(LIB_OBJS)))
-endif
diff --git a/bacula/src/win32/libfind/libfind.vcproj b/bacula/src/win32/libfind/libfind.vcproj
deleted file mode 100644 (file)
index 773426d..0000000
+++ /dev/null
@@ -1,409 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>\r
-<VisualStudioProject\r
-       ProjectType="Visual C++"\r
-       Version="8.00"\r
-       Name="libfind"\r
-       ProjectGUID="{05567F02-5DD8-4EB6-9C8E-C236C1D9AB1F}"\r
-       RootNamespace="libfind"\r
-       Keyword="Win32Proj"\r
-       >\r
-       <Platforms>\r
-               <Platform\r
-                       Name="Win32"\r
-               />\r
-       </Platforms>\r
-       <ToolFiles>\r
-       </ToolFiles>\r
-       <Configurations>\r
-               <Configuration\r
-                       Name="Debug|Win32"\r
-                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"\r
-                       IntermediateDirectory="$(ConfigurationName)"\r
-                       ConfigurationType="4"\r
-                       CharacterSet="2"\r
-                       >\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCMIDLTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCCLCompilerTool"\r
-                               Optimization="0"\r
-                               AdditionalIncludeDirectories="../compat;../../../../depkgs-win32/include;../..;../../../../depkgs-win32/include/pthreads;../../../../depkgs-win32/include/mysql;../../../../depkgs-win32/include/postgresql;../../../../depkgs-win32/vss/inc"\r
-                               PreprocessorDefinitions="WIN32;_DEBUG;_LIB;HAVE_WIN32;_USE_32BIT_TIME_T;_WIN32_WINNT=0x0500;_CRT_SECURE_NO_DEPRECATE"\r
-                               MinimalRebuild="true"\r
-                               BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="3"\r
-                               UsePrecompiledHeader="0"\r
-                               WarningLevel="3"\r
-                               Detect64BitPortabilityProblems="false"\r
-                               DebugInformationFormat="4"\r
-                       />\r
-                       <Tool\r
-                               Name="VCManagedResourceCompilerTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCLibrarianTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCALinkTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCXDCMakeTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCBscMakeTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCFxCopTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPostBuildEventTool"\r
-                       />\r
-               </Configuration>\r
-               <Configuration\r
-                       Name="Release|Win32"\r
-                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"\r
-                       IntermediateDirectory="$(ConfigurationName)"\r
-                       ConfigurationType="4"\r
-                       CharacterSet="2"\r
-                       WholeProgramOptimization="0"\r
-                       >\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCMIDLTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCCLCompilerTool"\r
-                               AdditionalIncludeDirectories="../compat;../../../../depkgs-win32/include;../..;../../../../depkgs-win32/include/pthreads;../../../../depkgs-win32/include/mysql;../../../../depkgs-win32/include/postgresql;../../../../depkgs-win32/vss/inc"\r
-                               PreprocessorDefinitions="WIN32;NDEBUG;_LIB;HAVE_WIN32;_USE_32BIT_TIME_T;_WIN32_WINNT=0x0500;_CRT_SECURE_NO_DEPRECATE"\r
-                               RuntimeLibrary="2"\r
-                               EnableFunctionLevelLinking="true"\r
-                               UsePrecompiledHeader="0"\r
-                               BrowseInformation="1"\r
-                               WarningLevel="3"\r
-                               Detect64BitPortabilityProblems="false"\r
-                               DebugInformationFormat="3"\r
-                       />\r
-                       <Tool\r
-                               Name="VCManagedResourceCompilerTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCLibrarianTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCALinkTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCXDCMakeTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCBscMakeTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCFxCopTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPostBuildEventTool"\r
-                       />\r
-               </Configuration>\r
-       </Configurations>\r
-       <References>\r
-       </References>\r
-       <Files>\r
-               <Filter\r
-                       Name="Source Files"\r
-                       Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"\r
-                       UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"\r
-                       >\r
-                       <File\r
-                               RelativePath="..\..\findlib\attribs.c"\r
-                               >\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               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="..\..\findlib\bfile.c"\r
-                               >\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               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="..\..\findlib\create_file.c"\r
-                               >\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               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="..\..\findlib\drivetype.c"\r
-                               >\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               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="..\..\findlib\enable_priv.c"\r
-                               >\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               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="..\..\findlib\find.c"\r
-                               >\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               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="..\..\findlib\find_one.c"\r
-                               >\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               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="..\..\findlib\fstype.c"\r
-                               >\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               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="..\..\findlib\makepath.c"\r
-                               >\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               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="..\..\findlib\match.c"\r
-                               >\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               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="..\..\findlib\save-cwd.c"\r
-                               >\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               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
-               </Filter>\r
-               <Filter\r
-                       Name="Header Files"\r
-                       Filter="h;hpp;hxx;hm;inl;inc;xsd"\r
-                       UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"\r
-                       >\r
-                       <File\r
-                               RelativePath="..\..\findlib\bfile.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\findlib\find.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\findlib\protos.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\findlib\save-cwd.h"\r
-                               >\r
-                       </File>\r
-               </Filter>\r
-               <Filter\r
-                       Name="Resource Files"\r
-                       Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"\r
-                       UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
-                       >\r
-               </Filter>\r
-               <File\r
-                       RelativePath=".\ReadMe.txt"\r
-                       >\r
-               </File>\r
-       </Files>\r
-       <Globals>\r
-       </Globals>\r
-</VisualStudioProject>\r
diff --git a/bacula/src/win32/libwin32/libwin32.vcproj b/bacula/src/win32/libwin32/libwin32.vcproj
deleted file mode 100644 (file)
index 99ace24..0000000
+++ /dev/null
@@ -1,170 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>\r
-<VisualStudioProject\r
-       ProjectType="Visual C++"\r
-       Version="8.00"\r
-       Name="libwin32"\r
-       ProjectGUID="{79C9F7C0-1DFE-4526-9F4F-1608E4549D24}"\r
-       RootNamespace="libwin32"\r
-       Keyword="Win32Proj"\r
-       >\r
-       <Platforms>\r
-               <Platform\r
-                       Name="Win32"\r
-               />\r
-       </Platforms>\r
-       <ToolFiles>\r
-       </ToolFiles>\r
-       <Configurations>\r
-               <Configuration\r
-                       Name="Debug|Win32"\r
-                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"\r
-                       IntermediateDirectory="$(ConfigurationName)"\r
-                       ConfigurationType="4"\r
-                       CharacterSet="2"\r
-                       >\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCMIDLTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCCLCompilerTool"\r
-                               Optimization="0"\r
-                               AdditionalIncludeDirectories="../compat;../../../../depkgs-win32/include;../..;../../../../depkgs-win32/include/pthreads;../../../../depkgs-win32/include/mysql;../../../../depkgs-win32/include/postgresql;../../../../depkgs-win32/vss/inc"\r
-                               PreprocessorDefinitions="WIN32;_DEBUG;_LIB;HAVE_WIN32;WIN32_VSS;_USE_32BIT_TIME_T;_WIN32_WINNT=0x0500;_CRT_SECURE_NO_DEPRECATE"\r
-                               MinimalRebuild="true"\r
-                               BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="3"\r
-                               UsePrecompiledHeader="0"\r
-                               WarningLevel="3"\r
-                               Detect64BitPortabilityProblems="false"\r
-                               DebugInformationFormat="4"\r
-                       />\r
-                       <Tool\r
-                               Name="VCManagedResourceCompilerTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCLibrarianTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCALinkTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCXDCMakeTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCBscMakeTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCFxCopTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPostBuildEventTool"\r
-                       />\r
-               </Configuration>\r
-               <Configuration\r
-                       Name="Release|Win32"\r
-                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"\r
-                       IntermediateDirectory="$(ConfigurationName)"\r
-                       ConfigurationType="4"\r
-                       UseOfATL="1"\r
-                       CharacterSet="2"\r
-                       WholeProgramOptimization="0"\r
-                       >\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCMIDLTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCCLCompilerTool"\r
-                               AdditionalIncludeDirectories="../compat;../../../../depkgs-win32/include;../..;../../../../depkgs-win32/include/pthreads;../../../../depkgs-win32/include/mysql;../../../../depkgs-win32/include/postgresql;../../../../depkgs-win32/vss/inc"\r
-                               PreprocessorDefinitions="WIN32;NDEBUG;_LIB;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
-                               BrowseInformation="1"\r
-                               WarningLevel="3"\r
-                               Detect64BitPortabilityProblems="false"\r
-                               DebugInformationFormat="3"\r
-                       />\r
-                       <Tool\r
-                               Name="VCManagedResourceCompilerTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCLibrarianTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCALinkTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCXDCMakeTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCBscMakeTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCFxCopTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPostBuildEventTool"\r
-                       />\r
-               </Configuration>\r
-       </Configurations>\r
-       <References>\r
-       </References>\r
-       <Files>\r
-               <Filter\r
-                       Name="Source Files"\r
-                       Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"\r
-                       UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"\r
-                       >\r
-               </Filter>\r
-               <Filter\r
-                       Name="Header Files"\r
-                       Filter="h;hpp;hxx;hm;inl;inc;xsd"\r
-                       UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"\r
-                       >\r
-               </Filter>\r
-               <Filter\r
-                       Name="Resource Files"\r
-                       Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"\r
-                       UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
-                       >\r
-               </Filter>\r
-       </Files>\r
-       <Globals>\r
-       </Globals>\r
-</VisualStudioProject>\r
index d40c959c9da9ab3fc9ca0b1483fa596d91a0ea73..4fc4417e72c6f3e17e5a7e102f6920a7b56b41f9 100644 (file)
        </ToolFiles>
        <Configurations>
                <Configuration
-                       Name="Release|Win32"
+                       Name="Debug|Win32"
                        OutputDirectory="$(SolutionDir)$(ConfigurationName)"
                        IntermediateDirectory="$(ConfigurationName)"
                        ConfigurationType="1"
-                       InheritedPropertySheets="..\..\..\..\..\..\..\Program Files\Microsoft Visual Studio 8\VC\VCProjectDefaults\UpgradeFromVC60.vsprops"
                        UseOfMFC="0"
-                       UseOfATL="1"
                        ATLMinimizesCRunTimeLibraryUsage="false"
                        CharacterSet="2"
                        >
                        />
                        <Tool
                                Name="VCMIDLTool"
-                               TypeLibraryName=".\Release/baculasd.tlb"
+                               TypeLibraryName=".\Debug/baculasd.tlb"
                                HeaderFileName=""
                        />
                        <Tool
                                Name="VCCLCompilerTool"
-                               Optimization="3"
-                               InlineFunctionExpansion="2"
-                               EnableIntrinsicFunctions="true"
-                               AdditionalIncludeDirectories="../../..;../../compat;../../../stored;&quot;../../../../../depkgs-msvc/include&quot;"
-                               PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE;HAVE_WIN32;USING_DLL;_USE_32BIT_TIME_T;_WIN32_WINNT=0x0501;_CRT_SECURE_NO_DEPRECATE"
-                               StringPooling="true"
-                               RuntimeLibrary="2"
-                               EnableFunctionLevelLinking="true"
-                               PrecompiledHeaderFile=".\Release/baculasd.pch"
-                               AssemblerListingLocation=".\Release/"
-                               ObjectFile=".\Release/"
-                               ProgramDataBaseFileName=".\Release/"
+                               Optimization="0"
+                               AdditionalIncludeDirectories="../../..;../../compat;../../../stored;../../../../../depkgs-msvc/include"
+                               PreprocessorDefinitions="_DEBUG;WIN32;_CONSOLE;HAVE_WIN32;USING_DLL;_USE_32BIT_TIME_T;_WIN32_WINNT=0x0500;_CRT_SECURE_NO_DEPRECATE"
+                               MinimalRebuild="true"
+                               BasicRuntimeChecks="3"
+                               RuntimeLibrary="3"
+                               UsePrecompiledHeader="0"
                                BrowseInformation="1"
                                WarningLevel="3"
                                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"
-                               OutputFile="$(OutDir)\bacula-sd.exe"
+                               AdditionalDependencies="pthreadVCE.lib zlib.lib wsock32.lib atlsd.lib"
+                               OutputFile="$(OutDir)/bacula-sd.exe"
                                LinkIncremental="0"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="&quot;../../../../../depkgs-msvc/lib&quot;"
-                               DelayLoadDLLs="$(NOINHERIT)"
+                               AdditionalLibraryDirectories="../../../../../depkgs-msvc/lib"
                                GenerateDebugInformation="true"
                                SubSystem="2"
                                TargetMachine="1"
@@ -97,7 +88,7 @@
                        <Tool
                                Name="VCBscMakeTool"
                                SuppressStartupBanner="true"
-                               OutputFile=".\Release/baculasd.bsc"
+                               OutputFile=".\Debug/baculasd.bsc"
                        />
                        <Tool
                                Name="VCFxCopTool"
                        />
                </Configuration>
                <Configuration
-                       Name="Debug|Win32"
+                       Name="Release|Win32"
                        OutputDirectory="$(SolutionDir)$(ConfigurationName)"
                        IntermediateDirectory="$(ConfigurationName)"
                        ConfigurationType="1"
-                       InheritedPropertySheets="..\..\..\..\..\..\..\Program Files\Microsoft Visual Studio 8\VC\VCProjectDefaults\UpgradeFromVC60.vsprops"
                        UseOfMFC="0"
+                       UseOfATL="1"
                        ATLMinimizesCRunTimeLibraryUsage="false"
                        CharacterSet="2"
+                       WholeProgramOptimization="1"
                        >
                        <Tool
                                Name="VCPreBuildEventTool"
                        />
                        <Tool
                                Name="VCMIDLTool"
-                               TypeLibraryName=".\Debug/baculasd.tlb"
+                               TypeLibraryName=".\Release/baculasd.tlb"
                                HeaderFileName=""
                        />
                        <Tool
                                Name="VCCLCompilerTool"
-                               Optimization="0"
-                               AdditionalIncludeDirectories="../../..;../../compat;../../../stored;&quot;../../../../../depkgs-msvc/include&quot;"
-                               PreprocessorDefinitions="_DEBUG;WIN32;_CONSOLE;HAVE_WIN32;USING_DLL;_USE_32BIT_TIME_T;_WIN32_WINNT=0x0500;_CRT_SECURE_NO_DEPRECATE"
-                               MinimalRebuild="true"
-                               BasicRuntimeChecks="3"
-                               RuntimeLibrary="3"
-                               PrecompiledHeaderFile=".\Debug/baculasd.pch"
-                               AssemblerListingLocation=".\Debug/"
-                               ObjectFile=".\Debug/"
-                               ProgramDataBaseFileName=".\Debug/"
+                               Optimization="4"
+                               InlineFunctionExpansion="2"
+                               EnableIntrinsicFunctions="true"
+                               AdditionalIncludeDirectories="../../..;../../compat;../../../stored;../../../../../depkgs-msvc/include"
+                               PreprocessorDefinitions="NDEBUG;_CONSOLE;HAVE_WIN32;USING_DLL;_USE_32BIT_TIME_T;_WIN32_WINNT=0x0501;_CRT_SECURE_NO_DEPRECATE"
+                               StringPooling="true"
+                               RuntimeLibrary="2"
+                               EnableFunctionLevelLinking="true"
+                               UsePrecompiledHeader="0"
                                BrowseInformation="1"
                                WarningLevel="3"
+                               Detect64BitPortabilityProblems="false"
                                SuppressStartupBanner="true"
-                               DebugInformationFormat="4"
+                               DebugInformationFormat="3"
                        />
                        <Tool
                                Name="VCManagedResourceCompilerTool"
                        />
                        <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"
-                               OutputFile="$(OutDir)/bacula-sd.exe"
+                               AdditionalDependencies="pthreadVCE.lib zlib.lib wsock32.lib atls.lib"
+                               OutputFile="$(OutDir)\bacula-sd.exe"
                                LinkIncremental="0"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="&quot;../../../../../depkgs-msvc/lib&quot;"
+                               AdditionalLibraryDirectories="../../../../../depkgs-msvc/lib"
+                               DelayLoadDLLs="$(NOINHERIT)"
                                GenerateDebugInformation="true"
                                SubSystem="2"
                                TargetMachine="1"
                        <Tool
                                Name="VCBscMakeTool"
                                SuppressStartupBanner="true"
-                               OutputFile=".\Debug/baculasd.bsc"
+                               OutputFile=".\Release/baculasd.bsc"
                        />
                        <Tool
                                Name="VCFxCopTool"
index 9c770b6ac76a745fe6fe74a8c3cd9fa9b602e896..e721e2f47b2bb8e0a744bae36cfc12dfa1865bc6 100644 (file)
@@ -5,7 +5,6 @@
        Name="bcopy"\r
        ProjectGUID="{614CE916-0972-4126-9392-CD9FC0ADD7DE}"\r
        RootNamespace="bcopy"\r
-       Keyword="Win32Proj"\r
        >\r
        <Platforms>\r
                <Platform\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories="../../..;../../compat;../../../stored;&quot;../../../../../depkgs-msvc/include&quot;"\r
-                               PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;HAVE_WIN32;USING_DLL;_USE_32BIT_TIME_T;_WIN32_WINNT=0x0500;_CRT_SECURE_NO_DEPRECATE"\r
+                               AdditionalIncludeDirectories="../../..;../../compat;../../../stored;../../../../../depkgs-msvc/include"\r
+                               PreprocessorDefinitions="_DEBUG;_CONSOLE;HAVE_WIN32;USING_DLL;_USE_32BIT_TIME_T;_WIN32_WINNT=0x0500;_CRT_SECURE_NO_DEPRECATE"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
                                RuntimeLibrary="3"\r
                                UsePrecompiledHeader="0"\r
+                               BrowseInformation="1"\r
                                WarningLevel="3"\r
                                Detect64BitPortabilityProblems="false"\r
+                               SuppressStartupBanner="true"\r
                                DebugInformationFormat="4"\r
                        />\r
                        <Tool\r
@@ -62,7 +63,8 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalDependencies="wsock32.lib pthreadVCE.lib atlsd.lib"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="0"\r
+                               SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories="../../../../../depkgs-msvc/lib"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="1"\r
                        ConfigurationType="1"\r
                        UseOfATL="1"\r
                        CharacterSet="2"\r
-                       WholeProgramOptimization="0"\r
+                       WholeProgramOptimization="1"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               Optimization="3"\r
+                               Optimization="4"\r
                                InlineFunctionExpansion="2"\r
                                EnableIntrinsicFunctions="true"\r
-                               AdditionalIncludeDirectories="../../..;../../compat;../../../stored;&quot;../../../../../depkgs-msvc/include&quot;"\r
-                               PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;HAVE_WIN32;USING_DLL;_USE_32BIT_TIME_T;_WIN32_WINNT=0x0500;_CRT_SECURE_NO_DEPRECATE"\r
+                               AdditionalIncludeDirectories="../../..;../../compat;../../../stored;../../../../../depkgs-msvc/include"\r
+                               PreprocessorDefinitions="NDEBUG;_CONSOLE;HAVE_WIN32;USING_DLL;_USE_32BIT_TIME_T;_WIN32_WINNT=0x0500;_CRT_SECURE_NO_DEPRECATE"\r
+                               StringPooling="true"\r
+                               BasicRuntimeChecks="3"\r
                                RuntimeLibrary="2"\r
                                EnableFunctionLevelLinking="true"\r
                                UsePrecompiledHeader="0"\r
                                BrowseInformation="1"\r
                                WarningLevel="3"\r
                                Detect64BitPortabilityProblems="false"\r
+                               SuppressStartupBanner="true"\r
                                DebugInformationFormat="3"\r
                        />\r
                        <Tool\r
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalDependencies="wsock32.lib pthreadVCE.lib atls.lib"\r
-                               LinkIncremental="1"\r
+                               LinkIncremental="0"\r
                                AdditionalLibraryDirectories="../../../../../depkgs-msvc/lib"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="1"\r
index 4e5358adab483f87ce3ed981d914fc4f3b057677..e875c5c83e4609c2e332a5d8d5459259b360d947 100644 (file)
@@ -5,7 +5,6 @@
        Name="bextract"\r
        ProjectGUID="{6A7AA493-E46C-4994-B8D6-AA6C9C19C9BA}"\r
        RootNamespace="bextract"\r
-       Keyword="Win32Proj"\r
        >\r
        <Platforms>\r
                <Platform\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories="../../compat;../../..;../../stored;&quot;../../../../../depkgs-msvc/include&quot;"\r
-                               PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;USING_DLL;HAVE_WIN32;_USE_32BIT_TIME_T;_WIN32_WINNT=0x0500;_CRT_SECURE_NO_DEPRECATE"\r
+                               AdditionalIncludeDirectories="../../compat;../../..;../../stored;../../../../../depkgs-msvc/include"\r
+                               PreprocessorDefinitions="_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
                                UsePrecompiledHeader="0"\r
                                WarningLevel="3"\r
                                Detect64BitPortabilityProblems="false"\r
+                               SuppressStartupBanner="true"\r
                                DebugInformationFormat="4"\r
                        />\r
                        <Tool\r
@@ -62,7 +62,7 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalDependencies="wsock32.lib zlib.lib pthreadVCE.lib atlsd.lib"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="0"\r
                                AdditionalLibraryDirectories="../../../../../depkgs-msvc/lib"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="1"\r
                        ConfigurationType="1"\r
                        UseOfATL="1"\r
                        CharacterSet="2"\r
-                       WholeProgramOptimization="0"\r
+                       WholeProgramOptimization="1"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               Optimization="3"\r
+                               Optimization="4"\r
                                InlineFunctionExpansion="2"\r
                                EnableIntrinsicFunctions="true"\r
-                               AdditionalIncludeDirectories="../../compat;../../..;../../stored;&quot;../../../../../depkgs-msvc/include&quot;"\r
-                               PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;USING_DLL;HAVE_WIN32;WIN32_VSS;_USE_32BIT_TIME_T;_WIN32_WINNT=0x0500;_CRT_SECURE_NO_DEPRECATE"\r
+                               AdditionalIncludeDirectories="../../compat;../../..;../../stored;../../../../../depkgs-msvc/include"\r
+                               PreprocessorDefinitions="NDEBUG;_CONSOLE;USING_DLL;HAVE_WIN32;WIN32_VSS;_USE_32BIT_TIME_T;_WIN32_WINNT=0x0500;_CRT_SECURE_NO_DEPRECATE"\r
+                               StringPooling="true"\r
+                               BasicRuntimeChecks="3"\r
                                RuntimeLibrary="2"\r
                                EnableFunctionLevelLinking="true"\r
                                UsePrecompiledHeader="0"\r
                                BrowseInformation="1"\r
                                WarningLevel="3"\r
                                Detect64BitPortabilityProblems="false"\r
+                               SuppressStartupBanner="true"\r
                                DebugInformationFormat="3"\r
                        />\r
                        <Tool\r
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalDependencies="wsock32.lib zlib.lib pthreadVCE.lib atls.lib"\r
-                               LinkIncremental="1"\r
+                               LinkIncremental="0"\r
                                AdditionalLibraryDirectories="../../../../../depkgs-msvc/lib"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="1"\r
index 7c67ec6a8cc95fef5e22ebffcfb3f279939c08d5..1a07d41848cb8c46da5ba8b0cdab877c3df2dd0e 100644 (file)
@@ -5,7 +5,6 @@
        Name="bls"\r
        ProjectGUID="{F8AF7D74-2918-422B-A7B6-4D98566B7160}"\r
        RootNamespace="bls"\r
-       Keyword="Win32Proj"\r
        >\r
        <Platforms>\r
                <Platform\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories="../../compat;../../..;../../stored;&quot;../../../../../depkgs-msvc/include&quot;"\r
-                               PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;HAVE_WIN32;USING_DLL;_USE_32BIT_TIME_T;_WIN32_WINNT=0x0500;_CRT_SECURE_NO_DEPRECATE"\r
+                               AdditionalIncludeDirectories="../../compat;../../..;../../stored;../../../../../depkgs-msvc/include"\r
+                               PreprocessorDefinitions="_DEBUG;_CONSOLE;HAVE_WIN32;USING_DLL;_USE_32BIT_TIME_T;_WIN32_WINNT=0x0500;_CRT_SECURE_NO_DEPRECATE"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
                                RuntimeLibrary="3"\r
                                UsePrecompiledHeader="0"\r
                                WarningLevel="3"\r
                                Detect64BitPortabilityProblems="false"\r
+                               SuppressStartupBanner="true"\r
                                DebugInformationFormat="4"\r
                        />\r
                        <Tool\r
@@ -62,7 +62,8 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalDependencies="wsock32.lib pthreadVCE.lib atlsd.lib"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="0"\r
+                               SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories="../../../../../depkgs-msvc/lib"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="1"\r
                        ConfigurationType="1"\r
                        UseOfATL="1"\r
                        CharacterSet="2"\r
-                       WholeProgramOptimization="0"\r
+                       WholeProgramOptimization="1"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               Optimization="3"\r
+                               Optimization="4"\r
                                InlineFunctionExpansion="2"\r
                                EnableIntrinsicFunctions="true"\r
-                               AdditionalIncludeDirectories="../../compat;../../..;../../stored;&quot;../../../../../depkgs-msvc/include&quot;"\r
-                               PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;HAVE_WIN32;USING_DLL;_USE_32BIT_TIME_T;_WIN32_WINNT=0x0500;_CRT_SECURE_NO_DEPRECATE"\r
+                               AdditionalIncludeDirectories="../../compat;../../..;../../stored;../../../../../depkgs-msvc/include"\r
+                               PreprocessorDefinitions="NDEBUG;_CONSOLE;HAVE_WIN32;USING_DLL;_USE_32BIT_TIME_T;_WIN32_WINNT=0x0500;_CRT_SECURE_NO_DEPRECATE"\r
+                               StringPooling="true"\r
+                               BasicRuntimeChecks="3"\r
                                RuntimeLibrary="2"\r
                                EnableFunctionLevelLinking="true"\r
                                UsePrecompiledHeader="0"\r
                                BrowseInformation="1"\r
                                WarningLevel="3"\r
                                Detect64BitPortabilityProblems="false"\r
+                               SuppressStartupBanner="true"\r
                                DebugInformationFormat="3"\r
                        />\r
                        <Tool\r
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalDependencies="wsock32.lib pthreadVCE.lib atls.lib"\r
-                               LinkIncremental="1"\r
+                               LinkIncremental="0"\r
                                AdditionalLibraryDirectories="../../../../../depkgs-msvc/lib"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="1"\r
index 21882e0ab7e0d9bd3d53bf424b30893048d03f83..15caf4bf8410c12bf9eacb8241295185f55cf5c4 100644 (file)
@@ -5,7 +5,6 @@
        Name="bscan"\r
        ProjectGUID="{56EADEDB-FBED-4758-8B54-7B0B47ABDABF}"\r
        RootNamespace="bscan"\r
-       Keyword="Win32Proj"\r
        >\r
        <Platforms>\r
                <Platform\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories="../../compat;../../..;../../stored;&quot;../../../../../depkgs-msvc/include&quot;"\r
-                               PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;HAVE_WIN32;USING_DLL;_USE_32BIT_TIME_T;_WIN32_WINNT=0x0500;_CRT_SECURE_NO_DEPRECATE"\r
+                               AdditionalIncludeDirectories="../../compat;../../..;../../stored;../../../../../depkgs-msvc/include"\r
+                               PreprocessorDefinitions="_DEBUG;_CONSOLE;HAVE_WIN32;USING_DLL;_USE_32BIT_TIME_T;_WIN32_WINNT=0x0500;_CRT_SECURE_NO_DEPRECATE"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
                                RuntimeLibrary="3"\r
                                UsePrecompiledHeader="0"\r
                                WarningLevel="3"\r
                                Detect64BitPortabilityProblems="false"\r
+                               SuppressStartupBanner="true"\r
                                DebugInformationFormat="4"\r
                        />\r
                        <Tool\r
@@ -62,8 +62,9 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalDependencies="bacula_cats.lib wsock32.lib pthreadVCE.lib atlsd.lib"\r
-                               LinkIncremental="2"\r
-                               AdditionalLibraryDirectories="&quot;../../../../../depkgs-msvc/lib&quot;;&quot;$(SolutionDir)$(ConfigurationName)&quot;"\r
+                               LinkIncremental="0"\r
+                               SuppressStartupBanner="true"\r
+                               AdditionalLibraryDirectories="../../../../../depkgs-msvc/lib;$(SolutionDir)$(ConfigurationName)"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="1"\r
                                TargetMachine="1"\r
                        ConfigurationType="1"\r
                        UseOfATL="1"\r
                        CharacterSet="2"\r
-                       WholeProgramOptimization="0"\r
+                       WholeProgramOptimization="1"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               Optimization="3"\r
+                               Optimization="4"\r
                                InlineFunctionExpansion="2"\r
                                EnableIntrinsicFunctions="true"\r
-                               AdditionalIncludeDirectories="../../compat;../../..;../../stored;&quot;../../../../../depkgs-msvc/include&quot;"\r
-                               PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;HAVE_WIN32;USING_DLL;_USE_32BIT_TIME_T;_WIN32_WINNT=0x0500;_CRT_SECURE_NO_DEPRECATE"\r
+                               AdditionalIncludeDirectories="../../compat;../../..;../../stored;../../../../../depkgs-msvc/include"\r
+                               PreprocessorDefinitions="NDEBUG;_CONSOLE;HAVE_WIN32;USING_DLL;_USE_32BIT_TIME_T;_WIN32_WINNT=0x0500;_CRT_SECURE_NO_DEPRECATE"\r
+                               StringPooling="true"\r
+                               BasicRuntimeChecks="3"\r
                                RuntimeLibrary="2"\r
                                EnableFunctionLevelLinking="true"\r
                                UsePrecompiledHeader="0"\r
                                BrowseInformation="1"\r
                                WarningLevel="3"\r
                                Detect64BitPortabilityProblems="false"\r
+                               SuppressStartupBanner="true"\r
                                DebugInformationFormat="3"\r
                        />\r
                        <Tool\r
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalDependencies="bacula_cats.lib wsock32.lib pthreadVCE.lib atls.lib"\r
-                               LinkIncremental="1"\r
-                               AdditionalLibraryDirectories="&quot;../../../../../depkgs-msvc/lib&quot;;&quot;$(SolutionDir)$(ConfigurationName)&quot;"\r
+                               LinkIncremental="0"\r
+                               AdditionalLibraryDirectories="../../../../../depkgs-msvc/lib;$(SolutionDir)$(ConfigurationName)"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="1"\r
                                OptimizeReferences="2"\r
index f09e798d753009e2240b86338c2683b1b2a6b4af..14ed030c01ca84b68ab7c9c4028f5be54e54f3a3 100644 (file)
@@ -5,7 +5,6 @@
        Name="btape"\r
        ProjectGUID="{496415E0-AF44-4AD8-8C99-91B837DDF469}"\r
        RootNamespace="btape"\r
-       Keyword="Win32Proj"\r
        >\r
        <Platforms>\r
                <Platform\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories="../../compat;../../..;../../stored;&quot;../../../../../depkgs-msvc/include&quot;"\r
-                               PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;HAVE_WIN32;USING_DLL;_USE_32BIT_TIME_T;_WIN32_WINNT=0x0500;_CRT_SECURE_NO_DEPRECATE"\r
+                               AdditionalIncludeDirectories="../../compat;../../..;../../stored;../../../../../depkgs-msvc/include"\r
+                               PreprocessorDefinitions="_DEBUG;_CONSOLE;HAVE_WIN32;USING_DLL;_USE_32BIT_TIME_T;_WIN32_WINNT=0x0500;_CRT_SECURE_NO_DEPRECATE"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
                                RuntimeLibrary="3"\r
                                UsePrecompiledHeader="0"\r
                                WarningLevel="3"\r
                                Detect64BitPortabilityProblems="false"\r
+                               SuppressStartupBanner="true"\r
                                DebugInformationFormat="4"\r
                        />\r
                        <Tool\r
@@ -62,7 +62,7 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalDependencies="wsock32.lib pthreadVCE.lib atlsd.lib"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="0"\r
                                AdditionalLibraryDirectories="../../../../../depkgs-msvc/lib"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="1"\r
                        ConfigurationType="1"\r
                        UseOfATL="1"\r
                        CharacterSet="2"\r
-                       WholeProgramOptimization="0"\r
+                       WholeProgramOptimization="1"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               Optimization="3"\r
+                               Optimization="4"\r
                                InlineFunctionExpansion="2"\r
                                EnableIntrinsicFunctions="true"\r
-                               AdditionalIncludeDirectories="../../compat;../../..;../../stored;&quot;../../../../../depkgs-msvc/include&quot;"\r
-                               PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;HAVE_WIN32;USING_DLL;_USE_32BIT_TIME_T;_WIN32_WINNT=0x0500;_CRT_SECURE_NO_DEPRECATE"\r
+                               AdditionalIncludeDirectories="../../compat;../../..;../../stored;../../../../../depkgs-msvc/include"\r
+                               PreprocessorDefinitions="NDEBUG;_CONSOLE;HAVE_WIN32;USING_DLL;_USE_32BIT_TIME_T;_WIN32_WINNT=0x0500;_CRT_SECURE_NO_DEPRECATE"\r
+                               StringPooling="true"\r
+                               BasicRuntimeChecks="3"\r
                                RuntimeLibrary="2"\r
                                EnableFunctionLevelLinking="true"\r
                                UsePrecompiledHeader="0"\r
                                BrowseInformation="1"\r
                                WarningLevel="3"\r
                                Detect64BitPortabilityProblems="false"\r
+                               SuppressStartupBanner="true"\r
                                DebugInformationFormat="3"\r
                        />\r
                        <Tool\r
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalDependencies="wsock32.lib pthreadVCE.lib atls.lib"\r
-                               LinkIncremental="1"\r
+                               LinkIncremental="0"\r
                                AdditionalLibraryDirectories="../../../../../depkgs-msvc/lib"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="1"\r
index a96509e1da4ef55c8f3b462d2596ca6d149986ea..26245695179399d6adb15bcd62146620c9c8d014 100644 (file)
@@ -5,7 +5,6 @@
        Name="postest"
        ProjectGUID="{208D3989-794B-47A2-9D04-D7AEE1524078}"
        RootNamespace="postest"
-       Keyword="Win32Proj"
        >
        <Platforms>
                <Platform
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="../../..;../../compat;&quot;../../../../../depkgs-msvc/include&quot;"
-                               PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;HAVE_WIN32"
+                               AdditionalIncludeDirectories="../../..;../../compat;../../../../../depkgs-msvc/include"
+                               PreprocessorDefinitions="_DEBUG;_CONSOLE;HAVE_WIN32"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="3"
                                RuntimeLibrary="3"
                                UsePrecompiledHeader="0"
                                WarningLevel="3"
                                Detect64BitPortabilityProblems="true"
+                               SuppressStartupBanner="true"
                                DebugInformationFormat="4"
                        />
                        <Tool
@@ -63,7 +63,8 @@
                        <Tool
                                Name="VCLinkerTool"
                                AdditionalDependencies="pthreadVCE.lib wsock32.lib atlsd.lib"
-                               LinkIncremental="2"
+                               LinkIncremental="0"
+                               SuppressStartupBanner="true"
                                AdditionalLibraryDirectories="../../../../../depkgs-win32/pthreads/debug"
                                GenerateDebugInformation="true"
                                SubSystem="1"
                        />
                        <Tool
                                Name="VCCLCompilerTool"
-                               AdditionalIncludeDirectories="../../..;../../compat;&quot;../../../../../depkgs-msvc/include&quot;"
-                               PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;HAVE_WIN32"
+                               Optimization="4"
+                               InlineFunctionExpansion="2"
+                               EnableIntrinsicFunctions="true"
+                               AdditionalIncludeDirectories="../../..;../../compat;../../../../../depkgs-msvc/include"
+                               PreprocessorDefinitions="NDEBUG;_CONSOLE;HAVE_WIN32"
+                               StringPooling="true"
+                               BasicRuntimeChecks="3"
                                RuntimeLibrary="2"
+                               EnableFunctionLevelLinking="true"
                                UsePrecompiledHeader="0"
+                               BrowseInformation="1"
                                WarningLevel="3"
-                               Detect64BitPortabilityProblems="true"
+                               Detect64BitPortabilityProblems="false"
+                               SuppressStartupBanner="true"
                                DebugInformationFormat="3"
                        />
                        <Tool
index 3ff8a0d3cb0660dc2ddfc70fe0f6eb1e5225c491..5ee761fb1ae1e908b569951cc21b989ddfba97e1 100644 (file)
        </ToolFiles>\r
        <Configurations>\r
                <Configuration\r
-                       Name="Release|Win32"\r
-                       OutputDirectory=".\Release"\r
-                       IntermediateDirectory=".\Release"\r
+                       Name="Debug|Win32"\r
+                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"\r
+                       IntermediateDirectory="$(ConfigurationName)"\r
                        ConfigurationType="4"\r
-                       InheritedPropertySheets="..\..\..\..\..\..\..\Program Files\Microsoft Visual Studio 8\VC\VCProjectDefaults\UpgradeFromVC60.vsprops"\r
                        UseOfMFC="0"\r
-                       UseOfATL="1"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
                        CharacterSet="2"\r
                        >\r
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               TypeLibraryName=".\Release/baculasd.tlb"\r
+                               TypeLibraryName=".\Debug/baculasd.tlb"\r
                                HeaderFileName=""\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               Optimization="3"\r
-                               InlineFunctionExpansion="2"\r
-                               EnableIntrinsicFunctions="true"\r
-                               AdditionalIncludeDirectories="../../compat;&quot;../../../../../depkgs-msvc/include&quot;;../../..;../../../stored"\r
-                               PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE;HAVE_WIN32;USING_DLL;_USE_32BIT_TIME_T;WIN32_VSS;_WIN32_WINNT=0x0501;_CRT_SECURE_NO_DEPRECATE"\r
-                               StringPooling="true"\r
-                               RuntimeLibrary="2"\r
-                               EnableFunctionLevelLinking="true"\r
-                               PrecompiledHeaderFile=".\Release/baculasd.pch"\r
-                               AssemblerListingLocation=".\Release/"\r
-                               ObjectFile=".\Release/"\r
-                               ProgramDataBaseFileName=".\Release/"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories="../../compat;../../../../../depkgs-msvc/include;../../..;../../../stored"\r
+                               PreprocessorDefinitions="_DEBUG;_CONSOLE;HAVE_WIN32;_USE_32BIT_TIME_T;USING_DLL;_WIN32_WINNT=0x0500;_CRT_SECURE_NO_DEPRECATE"\r
+                               MinimalRebuild="true"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
                                BrowseInformation="1"\r
                                WarningLevel="3"\r
                                SuppressStartupBanner="true"\r
-                               DebugInformationFormat="3"\r
+                               DebugInformationFormat="4"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="NDEBUG"\r
+                               PreprocessorDefinitions="_DEBUG"\r
                                Culture="1033"\r
-                               AdditionalIncludeDirectories=""\r
                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
@@ -85,7 +76,7 @@
                        <Tool\r
                                Name="VCBscMakeTool"\r
                                SuppressStartupBanner="true"\r
-                               OutputFile=".\Release/baculasd.bsc"\r
+                               OutputFile=".\Debug/baculasd.bsc"\r
                        />\r
                        <Tool\r
                                Name="VCFxCopTool"\r
                        />\r
                </Configuration>\r
                <Configuration\r
-                       Name="Debug|Win32"\r
-                       OutputDirectory=".\Debug"\r
-                       IntermediateDirectory=".\Debug"\r
+                       Name="Release|Win32"\r
+                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"\r
+                       IntermediateDirectory="$(ConfigurationName)"\r
                        ConfigurationType="4"\r
-                       InheritedPropertySheets="..\..\..\..\..\..\..\Program Files\Microsoft Visual Studio 8\VC\VCProjectDefaults\UpgradeFromVC60.vsprops"\r
                        UseOfMFC="0"\r
+                       UseOfATL="1"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
                        CharacterSet="2"\r
                        >\r
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               TypeLibraryName=".\Debug/baculasd.tlb"\r
+                               TypeLibraryName=".\Release/baculasd.tlb"\r
                                HeaderFileName=""\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               Optimization="0"\r
-                               AdditionalIncludeDirectories="../../compat;&quot;../../../../../depkgs-msvc/include&quot;;../../..;../../../stored"\r
-                               PreprocessorDefinitions="_DEBUG;WIN32;_CONSOLE;HAVE_WIN32;_USE_32BIT_TIME_T;USING_DLL;_WIN32_WINNT=0x0500;_CRT_SECURE_NO_DEPRECATE"\r
-                               MinimalRebuild="true"\r
-                               BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="3"\r
-                               PrecompiledHeaderFile=".\Debug/baculasd.pch"\r
-                               AssemblerListingLocation=".\Debug/"\r
-                               ObjectFile=".\Debug/"\r
-                               ProgramDataBaseFileName=".\Debug/"\r
+                               Optimization="4"\r
+                               InlineFunctionExpansion="2"\r
+                               EnableIntrinsicFunctions="true"\r
+                               AdditionalIncludeDirectories="../../compat;../../../../../depkgs-msvc/include;../../..;../../../stored"\r
+                               PreprocessorDefinitions="NDEBUG;_CONSOLE;HAVE_WIN32;USING_DLL;_USE_32BIT_TIME_T;WIN32_VSS;_WIN32_WINNT=0x0501;_CRT_SECURE_NO_DEPRECATE"\r
+                               StringPooling="true"\r
+                               RuntimeLibrary="2"\r
+                               EnableFunctionLevelLinking="true"\r
+                               UsePrecompiledHeader="0"\r
                                BrowseInformation="1"\r
                                WarningLevel="3"\r
                                SuppressStartupBanner="true"\r
-                               DebugInformationFormat="4"\r
+                               DebugInformationFormat="3"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG"\r
+                               PreprocessorDefinitions="NDEBUG"\r
                                Culture="1033"\r
+                               AdditionalIncludeDirectories=""\r
                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
                        <Tool\r
                                Name="VCBscMakeTool"\r
                                SuppressStartupBanner="true"\r
-                               OutputFile=".\Debug/baculasd.bsc"\r
+                               OutputFile=".\Release/baculasd.bsc"\r
                        />\r
                        <Tool\r
                                Name="VCFxCopTool"\r
index 32b5c58e85b88c464f5812a1a29c2f6cfb7c84de..dd150699fc4b55aa4491b7ff975501c71ec3d39d 100644 (file)
@@ -5,7 +5,6 @@
        Name="dbcheck"
        ProjectGUID="{85696E20-777A-41F6-BC00-2E7AB375B171}"
        RootNamespace="dbcheck"
-       Keyword="Win32Proj"
        >
        <Platforms>
                <Platform
@@ -40,8 +39,8 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="../../compat;../../..;../../stored;&quot;../../../../../depkgs-msvc/include&quot;"
-                               PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;HAVE_WIN32;USING_DLL;_USE_32BIT_TIME_T;_WIN32_WINNT=0x0500;_CRT_SECURE_NO_DEPRECATE"
+                               AdditionalIncludeDirectories="../../compat;../../..;../../stored;../../../../../depkgs-msvc/include"
+                               PreprocessorDefinitions="_DEBUG;_CONSOLE;HAVE_WIN32;USING_DLL;_USE_32BIT_TIME_T;_WIN32_WINNT=0x0500;_CRT_SECURE_NO_DEPRECATE"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="3"
                                RuntimeLibrary="3"
@@ -49,6 +48,7 @@
                                BrowseInformation="1"
                                WarningLevel="3"
                                Detect64BitPortabilityProblems="false"
+                               SuppressStartupBanner="true"
                                DebugInformationFormat="4"
                        />
                        <Tool
@@ -63,7 +63,8 @@
                        <Tool
                                Name="VCLinkerTool"
                                AdditionalDependencies="bacula_cats.lib"
-                               LinkIncremental="2"
+                               LinkIncremental="0"
+                               SuppressStartupBanner="true"
                                AdditionalLibraryDirectories="..\..\debug"
                                GenerateDebugInformation="true"
                                SubSystem="1"
                        />
                        <Tool
                                Name="VCCLCompilerTool"
-                               AdditionalIncludeDirectories="../../compat;../../..;../../stored;&quot;../../../../../depkgs-msvc/include&quot;"
-                               PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;HAVE_WIN32;USING_DLL;_USE_32BIT_TIME_T;_WIN32_WINNT=0x0500;_CRT_SECURE_NO_DEPRECATE"
+                               Optimization="4"
+                               InlineFunctionExpansion="2"
+                               EnableIntrinsicFunctions="true"
+                               AdditionalIncludeDirectories="../../compat;../../..;../../stored;../../../../../depkgs-msvc/include"
+                               PreprocessorDefinitions="NDEBUG;_CONSOLE;HAVE_WIN32;USING_DLL;_USE_32BIT_TIME_T;_WIN32_WINNT=0x0500;_CRT_SECURE_NO_DEPRECATE"
+                               StringPooling="true"
+                               BasicRuntimeChecks="3"
                                RuntimeLibrary="2"
+                               EnableFunctionLevelLinking="true"
                                UsePrecompiledHeader="0"
                                BrowseInformation="1"
                                WarningLevel="3"
                                Detect64BitPortabilityProblems="false"
+                               SuppressStartupBanner="true"
                                DebugInformationFormat="3"
                        />
                        <Tool
                        <Tool
                                Name="VCLinkerTool"
                                AdditionalDependencies="bacula_cats.lib"
-                               LinkIncremental="1"
+                               LinkIncremental="0"
                                AdditionalLibraryDirectories="..\..\release"
                                GenerateDebugInformation="true"
                                SubSystem="1"
index d3955af4f5bc50ed545b0e0b799ec26634406e56..cbd8568d7fcb5a9a5207fde39dbfd1cd391f9f57 100644 (file)
@@ -5,7 +5,6 @@
        Name="drivetype"\r
        ProjectGUID="{E5BC5B2E-976D-4DED-AA07-5DD52BF2163F}"\r
        RootNamespace="drivetype"\r
-       Keyword="Win32Proj"\r
        >\r
        <Platforms>\r
                <Platform\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories="../../..;../../compat;&quot;../../../../../depkgs-msvc/include&quot;"\r
-                               PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;HAVE_WIN32;WIN32_VSS;_USE_32BIT_TIME_T;_WIN32_WINNT=0x0500;_CRT_SECURE_NO_DEPRECATE"\r
+                               AdditionalIncludeDirectories="../../..;../../compat;../../../../../depkgs-msvc/include"\r
+                               PreprocessorDefinitions="_DEBUG;_CONSOLE;HAVE_WIN32;WIN32_VSS;_USE_32BIT_TIME_T;_WIN32_WINNT=0x0500;_CRT_SECURE_NO_DEPRECATE"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
                                RuntimeLibrary="3"\r
                                UsePrecompiledHeader="0"\r
                                WarningLevel="3"\r
                                Detect64BitPortabilityProblems="false"\r
+                               SuppressStartupBanner="true"\r
                                DebugInformationFormat="4"\r
                        />\r
                        <Tool\r
@@ -62,8 +62,8 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalDependencies="wsock32.lib pthreadVCE.lib atlsd.lib"\r
-                               LinkIncremental="2"\r
-                               AdditionalLibraryDirectories="&quot;../../../../../depkgs-msvc/lib&quot;"\r
+                               LinkIncremental="0"\r
+                               AdditionalLibraryDirectories="../../../../../depkgs-msvc/lib"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="1"\r
                                TargetMachine="1"\r
                        ConfigurationType="1"\r
                        UseOfATL="1"\r
                        CharacterSet="2"\r
-                       WholeProgramOptimization="0"\r
+                       WholeProgramOptimization="1"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               Optimization="3"\r
+                               Optimization="4"\r
                                InlineFunctionExpansion="2"\r
                                EnableIntrinsicFunctions="true"\r
-                               AdditionalIncludeDirectories="../../..;../../compat;&quot;../../../../../depkgs-msvc/include&quot;"\r
-                               PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;HAVE_WIN32;WIN32_VSS;_USE_32BIT_TIME_T;_WIN32_WINNT=0x0500;_CRT_SECURE_NO_DEPRECATE"\r
+                               AdditionalIncludeDirectories="../../..;../../compat;../../../../../depkgs-msvc/include"\r
+                               PreprocessorDefinitions="NDEBUG;_CONSOLE;HAVE_WIN32;WIN32_VSS;_USE_32BIT_TIME_T;_WIN32_WINNT=0x0500;_CRT_SECURE_NO_DEPRECATE"\r
+                               StringPooling="true"\r
+                               BasicRuntimeChecks="3"\r
                                RuntimeLibrary="2"\r
                                EnableFunctionLevelLinking="true"\r
                                UsePrecompiledHeader="0"\r
                                BrowseInformation="1"\r
                                WarningLevel="3"\r
                                Detect64BitPortabilityProblems="false"\r
+                               SuppressStartupBanner="true"\r
                                DebugInformationFormat="3"\r
                        />\r
                        <Tool\r
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalDependencies="wsock32.lib pthreadVCE.lib atls.lib"\r
-                               LinkIncremental="1"\r
-                               AdditionalLibraryDirectories="&quot;../../../../../depkgs-msvc/lib&quot;"\r
+                               LinkIncremental="0"\r
+                               AdditionalLibraryDirectories="../../../../../depkgs-msvc/lib"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="1"\r
                                OptimizeReferences="2"\r
index 2d71b32c209cbbc4750bdea6b6d1278482c3ab54..6a52b0f0ddb02b0bdc95d59db363e05d9f5686e2 100644 (file)
@@ -5,7 +5,6 @@
        Name="fstype"\r
        ProjectGUID="{AAF33ADD-A4F9-4BCA-B7F9-0C35C843CC7E}"\r
        RootNamespace="fstype"\r
-       Keyword="Win32Proj"\r
        >\r
        <Platforms>\r
                <Platform\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories="../../..;../../compat;&quot;../../../../../depkgs-msvc/include&quot;"\r
-                               PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;HAVE_WIN32;WIN32_VSS;_USE_32BIT_TIME_T;_WIN32_WINNT=0x0500;_CRT_SECURE_NO_DEPRECATE"\r
+                               AdditionalIncludeDirectories="../../..;../../compat;../../../../../depkgs-msvc/include"\r
+                               PreprocessorDefinitions="_DEBUG;_CONSOLE;HAVE_WIN32;WIN32_VSS;_USE_32BIT_TIME_T;_WIN32_WINNT=0x0500;_CRT_SECURE_NO_DEPRECATE"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
                                RuntimeLibrary="3"\r
                                UsePrecompiledHeader="0"\r
+                               BrowseInformation="1"\r
                                WarningLevel="3"\r
                                Detect64BitPortabilityProblems="false"\r
+                               SuppressStartupBanner="true"\r
                                DebugInformationFormat="4"\r
                        />\r
                        <Tool\r
@@ -62,8 +63,9 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalDependencies="wsock32.lib pthreadVCE.lib atlsd.lib"\r
-                               LinkIncremental="2"\r
-                               AdditionalLibraryDirectories="&quot;../../../../../depkgs-msvc/lib&quot;"\r
+                               LinkIncremental="0"\r
+                               SuppressStartupBanner="true"\r
+                               AdditionalLibraryDirectories="../../../../../depkgs-msvc/lib"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="1"\r
                                TargetMachine="1"\r
                        ConfigurationType="1"\r
                        UseOfATL="1"\r
                        CharacterSet="2"\r
-                       WholeProgramOptimization="0"\r
+                       WholeProgramOptimization="1"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               Optimization="3"\r
+                               Optimization="4"\r
                                InlineFunctionExpansion="2"\r
                                EnableIntrinsicFunctions="true"\r
-                               AdditionalIncludeDirectories="../../..;../../compat;&quot;../../../../../depkgs-msvc/include&quot;"\r
-                               PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;HAVE_WIN32;WIN32_VSS;_USE_32BIT_TIME_T;_WIN32_WINNT=0x0500;_CRT_SECURE_NO_DEPRECATE"\r
+                               AdditionalIncludeDirectories="../../..;../../compat;../../../../../depkgs-msvc/include"\r
+                               PreprocessorDefinitions="NDEBUG;_CONSOLE;HAVE_WIN32;WIN32_VSS;_USE_32BIT_TIME_T;_WIN32_WINNT=0x0500;_CRT_SECURE_NO_DEPRECATE"\r
+                               StringPooling="true"\r
+                               BasicRuntimeChecks="3"\r
                                RuntimeLibrary="2"\r
                                EnableFunctionLevelLinking="true"\r
                                UsePrecompiledHeader="0"\r
                                BrowseInformation="1"\r
                                WarningLevel="3"\r
                                Detect64BitPortabilityProblems="false"\r
+                               SuppressStartupBanner="true"\r
                                DebugInformationFormat="3"\r
                        />\r
                        <Tool\r
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalDependencies="wsock32.lib pthreadVCE.lib atls.lib"\r
-                               LinkIncremental="1"\r
-                               AdditionalLibraryDirectories="&quot;../../../../../depkgs-msvc/lib&quot;"\r
+                               LinkIncremental="0"\r
+                               AdditionalLibraryDirectories="../../../../../depkgs-msvc/lib"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="1"\r
                                OptimizeReferences="2"\r
index 791f8b56fc548e038a8060370913491f5d382ca0..11a54d74fca4da1e0c3bc1cbf5f92342725dacb1 100644 (file)
@@ -5,7 +5,6 @@
        Name="scsilist"
        ProjectGUID="{56D8C233-610E-4EE4-A73A-72CEF1C6A33A}"
        RootNamespace="scsilist"
-       Keyword="Win32Proj"
        >
        <Platforms>
                <Platform
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               PreprocessorDefinitions="WIN32;WINVER=0x0400;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE"
+                               PreprocessorDefinitions="WINVER=0x0400;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="3"
                                RuntimeLibrary="1"
                                UsePrecompiledHeader="0"
+                               BrowseInformation="1"
                                WarningLevel="4"
                                Detect64BitPortabilityProblems="true"
+                               SuppressStartupBanner="true"
                                DebugInformationFormat="4"
                        />
                        <Tool
@@ -61,7 +62,7 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               LinkIncremental="2"
+                               LinkIncremental="0"
                                GenerateDebugInformation="true"
                                SubSystem="1"
                                TargetMachine="1"
                        />
                        <Tool
                                Name="VCCLCompilerTool"
-                               PreprocessorDefinitions="WIN32;WINVER=0x0400;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE"
+                               Optimization="4"
+                               InlineFunctionExpansion="2"
+                               EnableIntrinsicFunctions="true"
+                               PreprocessorDefinitions="WINVER=0x0400;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE"
+                               StringPooling="true"
+                               BasicRuntimeChecks="3"
                                RuntimeLibrary="0"
+                               EnableFunctionLevelLinking="true"
                                UsePrecompiledHeader="0"
                                WarningLevel="4"
                                Detect64BitPortabilityProblems="true"
+                               SuppressStartupBanner="true"
                                DebugInformationFormat="3"
                        />
                        <Tool
                        <Tool
                                Name="VCLinkerTool"
                                AdditionalDependencies="advapi32.lib"
-                               LinkIncremental="1"
+                               LinkIncremental="0"
                                GenerateDebugInformation="true"
                                SubSystem="1"
                                OptimizeReferences="2"
index e9b4ae5c61030477c3a94a1ecfe6a5d6da917c3b..e94d458740581f77b1a7f58ba6b001cf02414ea0 100644 (file)
@@ -5,7 +5,6 @@
        Name="testfind"\r
        ProjectGUID="{558838F9-D792-4F56-AAB2-99C03687C5FF}"\r
        RootNamespace="testfind"\r
-       Keyword="Win32Proj"\r
        >\r
        <Platforms>\r
                <Platform\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories="../../..;../../compat;&quot;../../../../../depkgs-msvc/include&quot;"\r
-                               PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;HAVE_WIN32;USING_DLL;_USE_32BIT_TIME_T;_WIN32_WINNT=0x0500;_CRT_SECURE_NO_DEPRECATE"\r
+                               AdditionalIncludeDirectories="../../..;../../compat;../../../../../depkgs-msvc/include"\r
+                               PreprocessorDefinitions="_DEBUG;_CONSOLE;HAVE_WIN32;USING_DLL;_USE_32BIT_TIME_T;_WIN32_WINNT=0x0500;_CRT_SECURE_NO_DEPRECATE"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
                                RuntimeLibrary="3"\r
                                UsePrecompiledHeader="0"\r
+                               BrowseInformation="1"\r
                                WarningLevel="3"\r
                                Detect64BitPortabilityProblems="false"\r
+                               SuppressStartupBanner="true"\r
                                DebugInformationFormat="4"\r
                        />\r
                        <Tool\r
@@ -62,8 +63,8 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalDependencies="wsock32.lib pthreadVCE.lib atlsd.lib"\r
-                               LinkIncremental="2"\r
-                               AdditionalLibraryDirectories="&quot;../../../../../depkgs-msvc/lib&quot;"\r
+                               LinkIncremental="0"\r
+                               AdditionalLibraryDirectories="../../../../../depkgs-msvc/lib"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="1"\r
                                TargetMachine="1"\r
                        ConfigurationType="1"\r
                        UseOfATL="1"\r
                        CharacterSet="2"\r
-                       WholeProgramOptimization="0"\r
+                       WholeProgramOptimization="1"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               Optimization="0"\r
-                               InlineFunctionExpansion="1"\r
+                               Optimization="4"\r
+                               InlineFunctionExpansion="2"\r
                                EnableIntrinsicFunctions="true"\r
-                               AdditionalIncludeDirectories="../../..;../../compat;&quot;../../../../../depkgs-msvc/include&quot;"\r
-                               PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;HAVE_WIN32;USING_DLL;_USE_32BIT_TIME_T;_WIN32_WINNT=0x0500;_CRT_SECURE_NO_DEPRECATE"\r
+                               AdditionalIncludeDirectories="../../..;../../compat;../../../../../depkgs-msvc/include"\r
+                               PreprocessorDefinitions="NDEBUG;_CONSOLE;HAVE_WIN32;USING_DLL;_USE_32BIT_TIME_T;_WIN32_WINNT=0x0500;_CRT_SECURE_NO_DEPRECATE"\r
+                               StringPooling="true"\r
+                               BasicRuntimeChecks="3"\r
                                RuntimeLibrary="2"\r
                                EnableFunctionLevelLinking="true"\r
                                UsePrecompiledHeader="0"\r
                                BrowseInformation="1"\r
                                WarningLevel="3"\r
                                Detect64BitPortabilityProblems="false"\r
+                               SuppressStartupBanner="true"\r
                                DebugInformationFormat="3"\r
                        />\r
                        <Tool\r
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalDependencies="wsock32.lib pthreadVCE.lib atls.lib"\r
-                               LinkIncremental="1"\r
-                               AdditionalLibraryDirectories="&quot;../../../../../depkgs-msvc/lib&quot;"\r
+                               LinkIncremental="0"\r
+                               AdditionalLibraryDirectories="../../../../../depkgs-msvc/lib"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="1"\r
                                OptimizeReferences="2"\r
index 14da540c027b8451fb8b36a998de629ac3d63cfc..a56303cbc692d52f90d63c6d869f139222890cb6 100644 (file)
@@ -5,7 +5,6 @@
        Name="testls"\r
        ProjectGUID="{28FB58CE-AB8C-4C60-83DA-BC1BFCC59BFF}"\r
        RootNamespace="testls"\r
-       Keyword="Win32Proj"\r
        >\r
        <Platforms>\r
                <Platform\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories="../../..;../../compat;&quot;../../../../../depkgs-msvc/include&quot;"\r
-                               PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;HAVE_WIN32;USING_DLL;_USE_32BIT_TIME_T;_WIN32_WINNT=0x0500;_CRT_SECURE_NO_DEPRECATE"\r
+                               AdditionalIncludeDirectories="../../..;../../compat;../../../../../depkgs-msvc/include"\r
+                               PreprocessorDefinitions="_DEBUG;_CONSOLE;HAVE_WIN32;USING_DLL;_USE_32BIT_TIME_T;_WIN32_WINNT=0x0500;_CRT_SECURE_NO_DEPRECATE"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
                                RuntimeLibrary="3"\r
                                UsePrecompiledHeader="0"\r
+                               BrowseInformation="1"\r
                                WarningLevel="3"\r
                                Detect64BitPortabilityProblems="false"\r
                                DebugInformationFormat="4"\r
@@ -62,8 +62,9 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalDependencies="wsock32.lib pthreadVCE.lib atlsd.lib"\r
-                               LinkIncremental="2"\r
-                               AdditionalLibraryDirectories="&quot;../../../../../depkgs-msvc/lib&quot;"\r
+                               LinkIncremental="0"\r
+                               SuppressStartupBanner="true"\r
+                               AdditionalLibraryDirectories="../../../../../depkgs-msvc/lib"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="1"\r
                                TargetMachine="1"\r
                        ConfigurationType="1"\r
                        UseOfATL="1"\r
                        CharacterSet="2"\r
-                       WholeProgramOptimization="0"\r
+                       WholeProgramOptimization="1"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               Optimization="3"\r
+                               Optimization="4"\r
                                InlineFunctionExpansion="2"\r
                                EnableIntrinsicFunctions="true"\r
-                               AdditionalIncludeDirectories="../../..;../../compat;&quot;../../../../../depkgs-msvc/include&quot;"\r
-                               PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;HAVE_WIN32;USING_DLL;_USE_32BIT_TIME_T;_WIN32_WINNT=0x0500;_CRT_SECURE_NO_DEPRECATE"\r
+                               AdditionalIncludeDirectories="../../..;../../compat;../../../../../depkgs-msvc/include"\r
+                               PreprocessorDefinitions="NDEBUG;_CONSOLE;HAVE_WIN32;USING_DLL;_USE_32BIT_TIME_T;_WIN32_WINNT=0x0500;_CRT_SECURE_NO_DEPRECATE"\r
+                               StringPooling="true"\r
+                               BasicRuntimeChecks="3"\r
                                RuntimeLibrary="2"\r
                                EnableFunctionLevelLinking="true"\r
                                UsePrecompiledHeader="0"\r
                                BrowseInformation="1"\r
                                WarningLevel="3"\r
                                Detect64BitPortabilityProblems="false"\r
+                               SuppressStartupBanner="true"\r
                                DebugInformationFormat="3"\r
                        />\r
                        <Tool\r
index 5ca0447b31c35c44d26bf5e05cb230a7c1b5c528..960f10ea198156df6dbcbe1c243eda4f8355ec4e 100644 (file)
@@ -5,7 +5,6 @@
        Name="wx-console"\r
        ProjectGUID="{9BA8E10D-0D82-4B25-8543-DE34641FBC10}"\r
        RootNamespace="wx-console"\r
-       Keyword="Win32Proj"\r
        >\r
        <Platforms>\r
                <Platform\r
                <Configuration\r
                        Name="Debug|Win32"\r
                        OutputDirectory="$(SolutionDir)$(ConfigurationName)"\r
-                       IntermediateDirectory="Debug"\r
+                       IntermediateDirectory="$(ConfigurationName)"\r
                        ConfigurationType="1"\r
                        CharacterSet="2"\r
+                       DeleteExtensionsOnClean="*.obj;*.ilk;*.tlb;*.tli;*.tlh;*.tmp;*.rsp;*.pgc;*.pgd;$(TargetPath)"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories="../compat;&quot;../../../../depkgs-msvc/include&quot;;../..;&quot;../../../../depkgs-msvc\lib\wx_dll\msw&quot;"\r
+                               AdditionalIncludeDirectories="../compat;../../../../depkgs-msvc/include;../..;../../../../depkgs-msvc/lib/wx_dll/msw"\r
                                PreprocessorDefinitions="WIN32;_WINDOWS;wxUSE_GUI;WXUSINGDLL;__WXMSW__;_CONSOLE;HAVE_WIN32;HAVE_WXCONSOLE;USING_DLL;_STAT_H;_STAT_DEFINED;_USE_32BIT_TIME_T;_WIN32_WINNT=0x0500;_CRT_SECURE_NO_DEPRECATE"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
                                RuntimeLibrary="3"\r
                                UsePrecompiledHeader="0"\r
+                               BrowseInformation="1"\r
                                WarningLevel="3"\r
                                Detect64BitPortabilityProblems="false"\r
+                               SuppressStartupBanner="true"\r
                                DebugInformationFormat="4"\r
                        />\r
                        <Tool\r
@@ -62,8 +64,8 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalDependencies="wxmsw27_core.lib wxbase27.lib pthreadVCE.lib zlib.lib wsock32.lib comctl32.lib rpcrt4.lib atlsd.lib"\r
-                               LinkIncremental="0"\r
-                               AdditionalLibraryDirectories="&quot;../../../../depkgs-msvc/lib&quot;;&quot;../../../../depkgs-msvc/lib/wx_dll&quot;"\r
+                               LinkIncremental="2"\r
+                               AdditionalLibraryDirectories="../../../../depkgs-msvc/lib;../../../../depkgs-msvc/lib/wx_dll"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
                <Configuration\r
                        Name="Release|Win32"\r
                        OutputDirectory="$(SolutionDir)$(ConfigurationName)"\r
-                       IntermediateDirectory="Release"\r
+                       IntermediateDirectory="$(ConfigurationName)"\r
                        ConfigurationType="1"\r
                        CharacterSet="2"\r
+                       DeleteExtensionsOnClean="*.obj;*.ilk;*.tlb;*.tli;*.tlh;*.tmp;*.rsp;*.pgc;*.pgd;$(TargetPath)"\r
+                       WholeProgramOptimization="1"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
                        />\r
                        <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;WXUSINGDLL;__WXMSW__;HAVE_WIN32;HAVE_WXCONSOLE;USING_DLL;_STAT_H;_STAT_DEFINED;_USE_32BIT_TIME_T;_WIN32_WINNT=0x0500;_CRT_SECURE_NO_DEPRECATE"\r
+                               AdditionalIncludeDirectories="../compat;../../../../depkgs-msvc/include;../..;../../../../depkgs-msvc\lib\wx_dll\msw"\r
+                               PreprocessorDefinitions="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
index b7d8db547783d87c0e89a3fd3602974f198a23ba..abb088a7149b2491812adc0766b06dbe6b998c85 100644 (file)
@@ -81,9 +81,6 @@ enum
 /*
  *   wxbTHREAD_EVENT declaration, used by csprint
  */
-BEGIN_DECLARE_EVENT_TYPES()
-   DECLARE_EVENT_TYPE(wxbTHREAD_EVENT,       1)
-END_DECLARE_EVENT_TYPES()
 
 DEFINE_EVENT_TYPE(wxbTHREAD_EVENT)
 
index 90b4a0756ff96aad94886d8e8a8a4dabdb23410b..ba4d26c1028b76120e976b6c8db0b85f2012339d 100644 (file)
@@ -73,6 +73,8 @@ class wxbPrintObject: public wxObject {
 // wxbThreadEvent - Event used by wxbTHREAD_EVENT
 // ----------------------------------------------------------------------------
 
+DECLARE_LOCAL_EVENT_TYPE(wxbTHREAD_EVENT, -1)
+
 class wxbThreadEvent: public wxEvent {
    public:
       wxbThreadEvent(int id);