[Box Backup-dev] COMMIT r281 - box/chris/win32/vc2005-compile-fixes/infrastructure/msvc/2005
boxbackup-dev@fluffy.co.uk
boxbackup-dev@fluffy.co.uk
Thu, 22 Dec 2005 23:33:46 +0000 (GMT)
Author: chris
Date: 2005-12-22 23:33:42 +0000 (Thu, 22 Dec 2005)
New Revision: 281
Modified:
box/chris/win32/vc2005-compile-fixes/infrastructure/msvc/2005/bbackupctl.vcproj
box/chris/win32/vc2005-compile-fixes/infrastructure/msvc/2005/bbackupd.vcproj
box/chris/win32/vc2005-compile-fixes/infrastructure/msvc/2005/boxbackup.suo
box/chris/win32/vc2005-compile-fixes/infrastructure/msvc/2005/boxquery.vcproj
box/chris/win32/vc2005-compile-fixes/infrastructure/msvc/2005/common.vcproj
box/chris/win32/vc2005-compile-fixes/infrastructure/msvc/2005/win32test.vcproj
Log:
* Tidied up include directories
* Fix compilation problems caused by openssl/include/openssl symlinks
Modified: box/chris/win32/vc2005-compile-fixes/infrastructure/msvc/2005/bbackupctl.vcproj
===================================================================
--- box/chris/win32/vc2005-compile-fixes/infrastructure/msvc/2005/bbackupctl.vcproj 2005-12-22 23:14:49 UTC (rev 280)
+++ box/chris/win32/vc2005-compile-fixes/infrastructure/msvc/2005/bbackupctl.vcproj 2005-12-22 23:33:42 UTC (rev 281)
@@ -40,7 +40,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories=""$(ProjectDir)..\..\..\..\db-4.2.52.NC\build_win32";"$(ProjectDir)..\..\..\lib\backupclient";"$(ProjectDir)..\..\..\lib\server";"$(ProjectDir)..\..\..\lib\crypto";"$(ProjectDir)..\..\..\..\openssl\include";"$(ProjectDir)..\..\..\lib\compress";"$(ProjectDir)..\..\..\..\zlib\include";"$(ProjectDir)..\..\..\lib\win32";"$(ProjectDir)..\..\..\lib\common\""
+ AdditionalIncludeDirectories=""$(ProjectDir)..\..\..\lib\backupclient";"$(ProjectDir)..\..\..\lib\common";"$(ProjectDir)..\..\..\lib\compress";"$(ProjectDir)..\..\..\lib\crypto";"$(ProjectDir)..\..\..\lib\server";"$(ProjectDir)..\..\..\lib\win32";"$(ProjectDir)..\..\..\..\openssl\inc32";"$(ProjectDir)..\..\..\..\zlib\include""
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;PLATFORM_DISABLE_MEM_LEAK_TESTING;_CRT_SECURE_NO_DEPRECATE"
MinimalRebuild="true"
BasicRuntimeChecks="3"
Modified: box/chris/win32/vc2005-compile-fixes/infrastructure/msvc/2005/bbackupd.vcproj
===================================================================
--- box/chris/win32/vc2005-compile-fixes/infrastructure/msvc/2005/bbackupd.vcproj 2005-12-22 23:14:49 UTC (rev 280)
+++ box/chris/win32/vc2005-compile-fixes/infrastructure/msvc/2005/bbackupd.vcproj 2005-12-22 23:33:42 UTC (rev 281)
@@ -40,7 +40,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories=""$(SolutionDir)..\..\..\..\db-4.2.52.NC\build_win32";"$(SolutionDir)..\..\..\..\boost_1_31_0";"$(SolutionDir)..\..\..\..\openssl\include";"$(SolutionDir)..\..\..\..\zlib\include";"$(SolutionDir)..\..\..\lib\backupclient";"$(SolutionDir)..\..\..\lib\server";"$(SolutionDir)..\..\..\lib\crypto";"$(SolutionDir)..\..\..\lib\compress";"$(SolutionDir)..\..\..\lib\win32";"$(SolutionDir)..\..\..\lib\common\""
+ AdditionalIncludeDirectories=""$(SolutionDir)..\..\..\lib\backupclient";"$(SolutionDir)..\..\..\lib\common";"$(SolutionDir)..\..\..\lib\compress";"$(SolutionDir)..\..\..\lib\crypto";"$(SolutionDir)..\..\..\lib\server";"$(SolutionDir)..\..\..\lib\win32";"$(SolutionDir)..\..\..\..\openssl\inc32";"$(SolutionDir)..\..\..\..\zlib\include""
PreprocessorDefinitions="BOOST_REGEX_NO_LIB;WIN32;_DEBUG;_CONSOLE;PLATFORM_DISABLE_MEM_LEAK_TESTING;_CRT_SECURE_NO_DEPRECATE"
MinimalRebuild="true"
BasicRuntimeChecks="3"
Modified: box/chris/win32/vc2005-compile-fixes/infrastructure/msvc/2005/boxbackup.suo
===================================================================
(Binary files differ)
Modified: box/chris/win32/vc2005-compile-fixes/infrastructure/msvc/2005/boxquery.vcproj
===================================================================
--- box/chris/win32/vc2005-compile-fixes/infrastructure/msvc/2005/boxquery.vcproj 2005-12-22 23:14:49 UTC (rev 280)
+++ box/chris/win32/vc2005-compile-fixes/infrastructure/msvc/2005/boxquery.vcproj 2005-12-22 23:33:42 UTC (rev 281)
@@ -41,7 +41,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories=""$(ProjectDir)..\..\..\lib\backupclient";"$(ProjectDir)..\..\..\lib\server";"$(ProjectDir)..\..\..\lib\crypto";"$(ProjectDir)..\..\..\..\openssl\include";"$(ProjectDir)..\..\..\lib\compress";"$(ProjectDir)..\..\..\..\zlib\include";"$(ProjectDir)..\..\..\lib\win32";"$(ProjectDir)..\..\..\lib\common\";"$(SolutionDir)..\..\..\..\boost_1_31_0""
+ AdditionalIncludeDirectories=""$(ProjectDir)..\..\..\lib\backupclient";"$(ProjectDir)..\..\..\lib\common";"$(ProjectDir)..\..\..\lib\compress";"$(ProjectDir)..\..\..\lib\crypto";"$(ProjectDir)..\..\..\lib\server";"$(ProjectDir)..\..\..\lib\win32";"$(ProjectDir)..\..\..\..\openssl\inc32";"$(ProjectDir)..\..\..\..\zlib\include""
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;PLATFORM_DISABLE_MEM_LEAK_TESTING;_CRT_SECURE_NO_DEPRECATE"
MinimalRebuild="true"
BasicRuntimeChecks="3"
Modified: box/chris/win32/vc2005-compile-fixes/infrastructure/msvc/2005/common.vcproj
===================================================================
--- box/chris/win32/vc2005-compile-fixes/infrastructure/msvc/2005/common.vcproj 2005-12-22 23:14:49 UTC (rev 280)
+++ box/chris/win32/vc2005-compile-fixes/infrastructure/msvc/2005/common.vcproj 2005-12-22 23:33:42 UTC (rev 281)
@@ -40,7 +40,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories=""$(ProjectDir)..\..\..\lib\backupclient";"$(ProjectDir)..\..\..\lib\server";"$(ProjectDir)..\..\..\lib\crypto";"$(ProjectDir)..\..\..\..\openssl\include";"$(ProjectDir)..\..\..\lib\compress";"$(ProjectDir)..\..\..\..\zlib\include";"$(ProjectDir)..\..\..\lib\win32";"$(ProjectDir)..\..\..\lib\common\";$(NOINHERIT)"
+ AdditionalIncludeDirectories=""$(ProjectDir)..\..\..\lib\backupclient";"$(ProjectDir)..\..\..\lib\common";"$(ProjectDir)..\..\..\lib\compress";"$(ProjectDir)..\..\..\lib\crypto";"$(ProjectDir)..\..\..\lib\server";"$(ProjectDir)..\..\..\lib\win32";"$(ProjectDir)..\..\..\..\openssl\inc32";"$(ProjectDir)..\..\..\..\zlib\include";$(NOINHERIT)"
PreprocessorDefinitions="WIN32;_DEBUG;_LIB;PLATFORM_DISABLE_MEM_LEAK_TESTING;_CRT_SECURE_NO_DEPRECATE"
MinimalRebuild="true"
BasicRuntimeChecks="3"
Modified: box/chris/win32/vc2005-compile-fixes/infrastructure/msvc/2005/win32test.vcproj
===================================================================
--- box/chris/win32/vc2005-compile-fixes/infrastructure/msvc/2005/win32test.vcproj 2005-12-22 23:14:49 UTC (rev 280)
+++ box/chris/win32/vc2005-compile-fixes/infrastructure/msvc/2005/win32test.vcproj 2005-12-22 23:33:42 UTC (rev 281)
@@ -40,7 +40,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories=""$(ProjectDir)..\..\..\bin\bbackupd";"$(ProjectDir)..\..\..\..\db-4.2.52.NC\build_win32";"$(ProjectDir)..\..\..\lib\backupclient";"$(ProjectDir)..\..\..\lib\server";"$(ProjectDir)..\..\..\lib\crypto";"$(ProjectDir)..\..\..\..\openssl\include";"$(ProjectDir)..\..\..\lib\compress";"$(ProjectDir)..\..\..\..\zlib\include";"$(ProjectDir)..\..\..\lib\win32";"$(ProjectDir)..\..\..\lib\common\""
+ AdditionalIncludeDirectories=""$(ProjectDir)..\..\..\bin\bbackupd";"$(ProjectDir)..\..\..\lib\backupclient";"$(ProjectDir)..\..\..\lib\common";"$(ProjectDir)..\..\..\lib\compress";"$(ProjectDir)..\..\..\lib\crypto";"$(ProjectDir)..\..\..\lib\server";"$(ProjectDir)..\..\..\lib\win32";"$(ProjectDir)..\..\..\..\openssl\inc32";"$(ProjectDir)..\..\..\..\zlib\include""
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;PLATFORM_DISABLE_MEM_LEAK_TESTING;_CRT_SECURE_NO_DEPRECATE"
MinimalRebuild="true"
BasicRuntimeChecks="3"