diff options
| author | Blaze Miladinov <blaze.miladinov@seavus.com> | 2012-04-06 14:14:28 +0200 |
|---|---|---|
| committer | Viktor Mladenovski <viktor.mladenovski@seavus.com> | 2012-05-25 14:45:14 +0200 |
| commit | ef925129008cf073654d4e41e691b55674baeee7 (patch) | |
| tree | dca92001aaf70f2be8ebec32cc23dc708db07adb | |
| parent | 9f79e7a9892b5e8a3db704e3632ea118d314b250 (diff) | |
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>
| -rw-r--r-- | source/LCDriver.h | 4 | ||||
| -rw-r--r-- | source/LCDriver.vcproj | 34 | ||||
| -rw-r--r-- | source/config/error_codes_desc_cpp.xsl | 4 |
3 files changed, 41 insertions, 1 deletions
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 @@ -556,6 +556,10 @@ UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
>
<File
+ RelativePath=".\error_codes_desc.h"
+ >
+ </File>
+ <File
RelativePath=".\LCDriver.h"
>
</File>
@@ -616,6 +620,10 @@ >
</File>
<File
+ RelativePath=".\autogen\error_codes_desc.cpp"
+ >
+ </File>
+ <File
RelativePath=".\autogen\lcdriver_error_codes.h"
>
</File>
@@ -1200,6 +1208,32 @@ >
</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 "$(InputDir)lcdriver_error_codes.xml" -xsl "$(InputPath)" -out "$(ProjectDir)\autogen\error_codes_desc.cpp" -PARAM errorCodesLcmXml ../../lcmodule/source/cnh1606344_ldr_communication_module/config/error_codes.xml
"
+ AdditionalDependencies=""$(InputDir)lcdriver_error_codes.xml""
+ 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 "$(InputDir)lcdriver_error_codes.xml" -xsl "$(InputPath)" -out "$(ProjectDir)\autogen\error_codes_desc.cpp" -PARAM errorCodesLcmXml ../../lcmodule/source/cnh1606344_ldr_communication_module/config/error_codes.xml
"
+ AdditionalDependencies=""$(InputDir)lcdriver_error_codes.xml""
+ Outputs="autogen\error_codes_desc.cpp"
+ />
+ </FileConfiguration>
+ </File>
+ <File
RelativePath=".\config\lcdriver_error_codes.xml"
>
</File>
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 <string> #include <map> -#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 |