PDG patches

gfacchinetti · Aug 1, 2014 · 747a1a6 · 747a1a6
1 parent 2ad3c4f
commit 747a1a6
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 31 deletions.
diff --git a/ObjectHandler/oh/logger.hpp b/ObjectHandler/oh/logger.hpp
@@ -26,14 +26,14 @@
 
 #include <oh/singleton.hpp>
 
-// Some older builds of log4cxx did not include file log4cxxdefines.h.
-// If the #include below fails, it means either that you have the wrong
-// version of log4cxx, or that your log4cxx installation (if any) cannot
-// be found at all.
-#include <log4cxx/log4cxxdefines.h>
-#if LOG4CXX_VERSION != 0x001000f3
-    #error using an incorrect version of log4cxx, please update.
-#endif
+//// Some older builds of log4cxx did not include file log4cxxdefines.h.
+//// If the #include below fails, it means either that you have the wrong
+//// version of log4cxx, or that your log4cxx installation (if any) cannot
+//// be found at all.
+//#include <log4cxx/log4cxxdefines.h>
+//#if LOG4CXX_VERSION != 0x001000f3
+//    #error using an incorrect version of log4cxx, please update.
+//#endif
 
 #include <log4cxx/logger.h>
 #include <log4cxx/simplelayout.h>

diff --git a/ObjectHandler/ohlib_vc9.vcproj b/ObjectHandler/ohlib_vc9.vcproj
@@ -4,6 +4,7 @@
 	Version="9.00"
 	Name="ohlib"
 	ProjectGUID="{CD623FE5-3B3E-4511-80A9-A99D893349A4}"
+	RootNamespace="ohlib"
 	TargetFrameworkVersion="131072"
 	>
 	<Platforms>
@@ -43,7 +44,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/MP"
 				Optimization="0"
-				AdditionalIncludeDirectories=".;..\log4cxx\src\main\include\log4cxx\win32;..\log4cxx\src\main\include"
+				AdditionalIncludeDirectories=".;&quot;C:\Projects\CVA\3rdPartyLibs\apache-log4cxx-0.10.0\src\main\include&quot;"
 				PreprocessorDefinitions="_DEBUG;_LIB;WIN32;LOG4CXX_STATIC"
 				MinimalRebuild="false"
 				BasicRuntimeChecks="3"
@@ -122,8 +123,8 @@
 				AdditionalOptions="/MP"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories=".;..\log4cxx\src\main\include\log4cxx\win32;..\log4cxx\src\main\include"
-				PreprocessorDefinitions="NDEBUG;_LIB;WIN32;LOG4CXX_STATIC"
+				AdditionalIncludeDirectories=".;&quot;C:\Projects\CVA\3rdPartyLibs\apache-log4cxx-0.10.0\src\main\include&quot;"
+				PreprocessorDefinitions="NDEBUG;_LIB;WIN32"
 				StringPooling="true"
 				MinimalRebuild="false"
 				RuntimeLibrary="2"
@@ -201,7 +202,7 @@
 				AdditionalOptions="/MP"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories=".;..\log4cxx\src\main\include\log4cxx\win32;..\log4cxx\src\main\include"
+				AdditionalIncludeDirectories=".;&quot;C:\Projects\CVA\3rdPartyLibs\apache-log4cxx-0.10.0\src\main\include&quot;"
 				PreprocessorDefinitions="NDEBUG;_LIB;WIN32;LOG4CXX_STATIC"
 				StringPooling="true"
 				MinimalRebuild="false"
@@ -279,8 +280,8 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/MP"
 				Optimization="0"
-				AdditionalIncludeDirectories=".;..\log4cxx\src\main\include\log4cxx\win32;..\log4cxx\src\main\include"
-				PreprocessorDefinitions="_DEBUG;_LIB;WIN32;LOG4CXX_STATIC"
+				AdditionalIncludeDirectories=".;&quot;C:\Projects\CVA\3rdPartyLibs\apache-log4cxx-0.10.0\src\main\include&quot;"
+				PreprocessorDefinitions="_DEBUG;_LIB;WIN32"
 				MinimalRebuild="false"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"

diff --git a/ObjectHandler/ohxl/ohxll/ohxll_vc9.vcproj b/ObjectHandler/ohxl/ohxll/ohxll_vc9.vcproj
@@ -49,7 +49,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/MP"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..;..\..\..\log4cxx\src\main\include\log4cxx\win32;..\..\..\log4cxx\src\main\include"
+				AdditionalIncludeDirectories="..\..;&quot;C:\Projects\CVA\3rdPartyLibs\apache-log4cxx-0.10.0\src\main\include&quot;"
 				PreprocessorDefinitions="_DEBUG;_WINDOWS;_USRDLL;XLL_EXPORTS;WIN32;LOG4CXX_STATIC"
 				MinimalRebuild="false"
 				BasicRuntimeChecks="3"
@@ -77,11 +77,11 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="odbc32.lib odbccp32.lib Ws2_32.lib advapi32.lib"
+				AdditionalDependencies="odbc32.lib odbccp32.lib Ws2_32.lib advapi32.lib log4cxxD.lib"
 				OutputFile="..\..\xll\ObjectHandler-xll-vc90-mt-gd-1_5_0.xll"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\..\lib;..\..\..\log4cxx\msvc\lib"
+				AdditionalLibraryDirectories="..\..\lib;..\..\..\log4cxx\msvc\lib;&quot;C:\Projects\CVA\3rdPartyLibs\apache-log4cxx-0.10.0\projects\Debug&quot;"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile="..\..\xll\ObjectHandler-xll-vc90-mt-gd-1_5_0.pdb"
 				RandomizedBaseAddress="1"
@@ -149,7 +149,7 @@
 				AdditionalOptions="/MP"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..;..\..\..\log4cxx\src\main\include\log4cxx\win32;..\..\..\log4cxx\src\main\include"
+				AdditionalIncludeDirectories="..\..;&quot;C:\Projects\CVA\3rdPartyLibs\apache-log4cxx-0.10.0\src\main\include&quot;"
 				PreprocessorDefinitions="NDEBUG;_WINDOWS;_USRDLL;XLL_EXPORTS;WIN32;LOG4CXX_STATIC"
 				StringPooling="true"
 				MinimalRebuild="false"
@@ -178,11 +178,11 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="odbc32.lib odbccp32.lib Ws2_32.lib advapi32.lib"
+				AdditionalDependencies="odbc32.lib odbccp32.lib Ws2_32.lib advapi32.lib log4cxx.lib"
 				OutputFile="..\..\xll\ObjectHandler-xll-vc90-mt-1_5_0.xll"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\..\lib,..\..\..\log4cxx\msvc\lib"
+				AdditionalLibraryDirectories="..\..\lib;..\..\..\log4cxx\msvc\lib;&quot;C:\Projects\CVA\3rdPartyLibs\apache-log4cxx-0.10.0\projects\Release&quot;"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile="..\..\xll\ObjectHandler-xll-vc90-mt-1_5_0.pdb"
 				OptimizeReferences="2"

diff --git a/ObjectHandler/ohxl/ohxllib/ohxllib_vc9.vcproj b/ObjectHandler/ohxl/ohxllib/ohxllib_vc9.vcproj
@@ -44,7 +44,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/MP"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..;..\..\..\log4cxx\src\main\include\log4cxx\win32;..\..\..\log4cxx\src\main\include"
+				AdditionalIncludeDirectories="..\..;&quot;C:\Projects\CVA\3rdPartyLibs\apache-log4cxx-0.10.0\src\main\include&quot;;..\..\..\log4cxx\src\main\include\log4cxx\win32;..\..\..\log4cxx\src\main\include"
 				PreprocessorDefinitions="_DEBUG;_LIB;XLL_STATIC;WIN32;LOG4CXX_STATIC"
 				MinimalRebuild="false"
 				BasicRuntimeChecks="3"
@@ -123,7 +123,7 @@
 				AdditionalOptions="/MP"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..;..\..\..\log4cxx\src\main\include\log4cxx\win32;..\..\..\log4cxx\src\main\include"
+				AdditionalIncludeDirectories="..\..;&quot;C:\Projects\CVA\3rdPartyLibs\apache-log4cxx-0.10.0\src\main\include&quot;;..\..\..\log4cxx\src\main\include\log4cxx\win32;..\..\..\log4cxx\src\main\include"
 				PreprocessorDefinitions="NDEBUG;_LIB;XLL_STATIC;WIN32;LOG4CXX_STATIC"
 				StringPooling="true"
 				MinimalRebuild="false"
@@ -203,7 +203,7 @@
 				AdditionalOptions="/MP"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..;..\..\..\log4cxx\src\main\include\log4cxx\win32;..\..\..\log4cxx\src\main\include"
+				AdditionalIncludeDirectories="..\..;&quot;C:\Projects\CVA\3rdPartyLibs\apache-log4cxx-0.10.0\src\main\include&quot;;..\..\..\log4cxx\src\main\include\log4cxx\win32;..\..\..\log4cxx\src\main\include"
 				PreprocessorDefinitions="NDEBUG;_LIB;XLL_STATIC;WIN32;LOG4CXX_STATIC"
 				StringPooling="true"
 				MinimalRebuild="false"
@@ -282,7 +282,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/MP"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..;..\..\..\log4cxx\src\main\include\log4cxx\win32;..\..\..\log4cxx\src\main\include"
+				AdditionalIncludeDirectories="..\..;&quot;C:\Projects\CVA\3rdPartyLibs\apache-log4cxx-0.10.0\src\main\include&quot;;..\..\..\log4cxx\src\main\include\log4cxx\win32;..\..\..\log4cxx\src\main\include"
 				PreprocessorDefinitions="_DEBUG;_LIB;XLL_STATIC;WIN32;LOG4CXX_STATIC"
 				MinimalRebuild="false"
 				BasicRuntimeChecks="3"

diff --git a/log4cxx/msvc/log4cxx_vc9.vcproj b/log4cxx/msvc/log4cxx_vc9.vcproj
@@ -274,8 +274,7 @@
 				Name="VCPreLinkEventTool"
 			/>
 			<Tool
-				Name="VCLibrarianTool"
-				OutputFile=".\lib\log4cxxs-vc90-mt-0_10_0.lib"
+				Name="VCLinkerTool"
 			/>
 			<Tool
 				Name="VCALinkTool"

diff --git a/log4cxx/src/main/include/log4cxx/auto_link.hpp b/log4cxx/src/main/include/log4cxx/auto_link.hpp
@@ -82,11 +82,11 @@
 #pragma comment(lib, APR_LIB_NAME)
 #pragma comment(lib, APRUTIL_LIB_NAME)
 
-#ifdef BOOST_LIB_DIAGNOSTIC
-#  pragma message("Linking to lib file: " LOG4CXX_LIB_NAME)
-#  pragma message("Linking to lib file: " APR_LIB_NAME)
-#  pragma message("Linking to lib file: " APRUTIL_LIB_NAME)
-#endif
+//#ifdef BOOST_LIB_DIAGNOSTIC
+//#  pragma message("Linking to lib file: " LOG4CXX_LIB_NAME)
+//#  pragma message("Linking to lib file: " APR_LIB_NAME)
+//#  pragma message("Linking to lib file: " APRUTIL_LIB_NAME)
+//#endif
 
 #endif