From ef925129008cf073654d4e41e691b55674baeee7 Mon Sep 17 00:00:00 2001
From: Blaze Miladinov <blaze.miladinov@seavus.com>
Date: Fri, 6 Apr 2012 14:14:28 +0200
Subject: Implement runtime linking with LCDriver DLL.

ST-Ericsson ID: 426337
ST-Ericsson FOSS-OUT ID: STETL-FOSS-OUT-10204

Change-Id: Ica0517e99d60b8abaa731c6e03c486c9b35eb3dd
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/54943
Reviewed-by: QABUILD
Reviewed-by: QATEST
Tested-by: Cvetko MLADENOVSKI <cvetko.mladenovski@seavus.com>
Reviewed-by: Vlatko PISTOLOV <vlatko.pistolov@seavus.com>
Tested-by: Vlatko PISTOLOV <vlatko.pistolov@seavus.com>
---
 source/LCDriver.h                      |  4 ++++
 source/LCDriver.vcproj                 | 34 ++++++++++++++++++++++++++++++++++
 source/config/error_codes_desc_cpp.xsl |  4 +++-
 3 files changed, 41 insertions(+), 1 deletion(-)

diff --git a/source/LCDriver.h b/source/LCDriver.h
index 80be9d7..013bcb5 100644
--- a/source/LCDriver.h
+++ b/source/LCDriver.h
@@ -9,6 +9,8 @@
 #if defined(_WIN32)
 #ifdef LCDRIVER_EXPORTS
 #define LCDRIVER_API __declspec(dllexport)
+#elif defined LCDRIVER_LOCALDEFINES
+#define LCDRIVER_API
 #else
 #define LCDRIVER_API __declspec(dllimport)
 #endif //LCDRIVER_EXPORTS
@@ -22,6 +24,8 @@ typedef unsigned long uint32;
 #elif (defined(__linux__) || defined(__APPLE__))
 #ifdef LCDRIVER_EXPORTS
 #define LCDRIVER_API __attribute__((visibility("default")))
+#elif defined LCDRIVER_LOCALDEFINES
+#define LCDRIVER_API
 #else
 #define LCDRIVER_API
 #endif
diff --git a/source/LCDriver.vcproj b/source/LCDriver.vcproj
index 703954c..ef7e7c4 100644
--- a/source/LCDriver.vcproj
+++ b/source/LCDriver.vcproj
@@ -555,6 +555,10 @@
 			Filter="h;hpp;hxx;hm;inl;inc;xsd"
 			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
 			>
+			<File
+				RelativePath=".\error_codes_desc.h"
+				>
+			</File>
 			<File
 				RelativePath=".\LCDriver.h"
 				>
@@ -615,6 +619,10 @@
 				RelativePath=".\autogen\commands_marshal.cpp"
 				>
 			</File>
+			<File
+				RelativePath=".\autogen\error_codes_desc.cpp"
+				>
+			</File>
 			<File
 				RelativePath=".\autogen\lcdriver_error_codes.h"
 				>
@@ -1199,6 +1207,32 @@
 				RelativePath=".\config\common.xsl"
 				>
 			</File>
+			<File
+				RelativePath=".\config\error_codes_desc_cpp.xsl"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Generating error_codes_desc.cpp..."
+						CommandLine="java -classpath ..\lcmodule\tools\xalan-j_2_7_1\xalan.jar org.apache.xalan.xslt.Process -in &quot;$(InputDir)lcdriver_error_codes.xml&quot; -xsl &quot;$(InputPath)&quot; -out &quot;$(ProjectDir)\autogen\error_codes_desc.cpp&quot; -PARAM errorCodesLcmXml ../../lcmodule/source/cnh1606344_ldr_communication_module/config/error_codes.xml&#x0D;&#x0A;"
+						AdditionalDependencies="&quot;$(InputDir)lcdriver_error_codes.xml&quot;"
+						Outputs="autogen\error_codes_desc.cpp"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Generating error_codes_desc.cpp..."
+						CommandLine="java -classpath ..\lcmodule\tools\xalan-j_2_7_1\xalan.jar org.apache.xalan.xslt.Process -in &quot;$(InputDir)lcdriver_error_codes.xml&quot; -xsl &quot;$(InputPath)&quot; -out &quot;$(ProjectDir)\autogen\error_codes_desc.cpp&quot; -PARAM errorCodesLcmXml ../../lcmodule/source/cnh1606344_ldr_communication_module/config/error_codes.xml&#x0D;&#x0A;"
+						AdditionalDependencies="&quot;$(InputDir)lcdriver_error_codes.xml&quot;"
+						Outputs="autogen\error_codes_desc.cpp"
+					/>
+				</FileConfiguration>
+			</File>
 			<File
 				RelativePath=".\config\lcdriver_error_codes.xml"
 				>
diff --git a/source/config/error_codes_desc_cpp.xsl b/source/config/error_codes_desc_cpp.xsl
index b25b941..92f48d9 100644
--- a/source/config/error_codes_desc_cpp.xsl
+++ b/source/config/error_codes_desc_cpp.xsl
@@ -20,9 +20,11 @@
 #include &lt;string&gt;
 #include &lt;map&gt;
 
-#include "String_s.h"
 #include "LCDriver.h"
 #include "error_codes_desc.h"
+#if defined(__MINGW32__) || defined(__linux__) || defined(__APPLE__)
+#include "String_s.h"
+#endif // __MINGW32__ || __linux__ || __APPLE__)
 
 /*******************************************************************************
  * Types, constants
-- 
cgit v1.2.3