From 7a3cf4a3d0d8ea9d3d2cf43945ebd0c723cbd974 Mon Sep 17 00:00:00 2001 From: Petar Dimoski Date: Tue, 19 Jul 2011 10:21:57 +0100 Subject: Build LCM/LCD 64bit libraries Added support for building 64bit LCM/LCD libraries ST-Ericsson ID: 341979 ST-Ericsson FOSS-OUT ID: STETL-FOSS-OUT-10204 Depends-On: Ia6634dab4f2d10f1a3391da463104db7aa52b67f Change-Id: Ia4ff449a39b32e7cc44a56fad0a866f99bff0c68 Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/24495 Reviewed-by: Viktor MLADENOVSKI Reviewed-by: QATOOLS Reviewed-by: QATEST Tested-by: Vlatko STENKOSKI --- lcmodule/source/LCM.rc | 207 +++++++++-------- lcmodule/source/LCM.vcproj | 250 +++++++++++++++++++- source/LCDriver.rc | 7 +- source/LCDriver.vcproj | 552 +++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 901 insertions(+), 115 deletions(-) diff --git a/lcmodule/source/LCM.rc b/lcmodule/source/LCM.rc index 1bc8f62..23eb70f 100644 --- a/lcmodule/source/LCM.rc +++ b/lcmodule/source/LCM.rc @@ -1,104 +1,103 @@ -// Microsoft Visual C++ generated resource script. -// -#include "resource.h" - -#define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 2 resource. -// -#include "windows.h" - -///////////////////////////////////////////////////////////////////////////// -#undef APSTUDIO_READONLY_SYMBOLS - -///////////////////////////////////////////////////////////////////////////// -// English (U.S.) resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) -#ifdef _WIN32 -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -#pragma code_page(1252) -#endif //_WIN32 - -#ifdef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// TEXTINCLUDE -// - -1 TEXTINCLUDE -BEGIN - "resource.h\0" -END - -2 TEXTINCLUDE -BEGIN - "#include ""windows.h""\r\n" - "\0" -END - -3 TEXTINCLUDE -BEGIN - "\r\n" - "\0" -END - -#endif // APSTUDIO_INVOKED - - -///////////////////////////////////////////////////////////////////////////// -// -// Version -// - -VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,0,0,1 - PRODUCTVERSION 1,0,0,1 - FILEFLAGSMASK 0x1fL -#ifdef _DEBUG - FILEFLAGS 0x9L -#else - FILEFLAGS 0x8L -#endif - FILEOS 0x4L - FILETYPE 0x2L - FILESUBTYPE 0x0L -BEGIN - BLOCK "StringFileInfo" - BEGIN - BLOCK "040904b0" - BEGIN - VALUE "Comments", "Build date: 2011-06-29" - VALUE "CompanyName", "ST Ericsson AB" - VALUE "FileDescription", "LCM Dynamic Link Library" - VALUE "FileVersion", "1,0,0,1" - VALUE "InternalName", "LCM" - VALUE "LegalCopyright", "Copyright (C) ST Ericsson 2011" - VALUE "OriginalFilename", "LCM.dll" - VALUE "PrivateBuild", "http://gerrit.lud.stericsson.com/gerrit/22864" - VALUE "ProductName", "CXA1104507 Loader Communication Module" - VALUE "ProductVersion", "P1T" - END - END - BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", 0x409, 1200 - END -END - -#endif // English (U.S.) resources -///////////////////////////////////////////////////////////////////////////// - - - -#ifndef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 3 resource. -// - - -///////////////////////////////////////////////////////////////////////////// -#endif // not APSTUDIO_INVOKED - +// Microsoft Visual C++ generated resource script. +// +#include "resource.h" + +#define APSTUDIO_READONLY_SYMBOLS +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 2 resource. +// +#include "windows.h" + +///////////////////////////////////////////////////////////////////////////// +#undef APSTUDIO_READONLY_SYMBOLS + +///////////////////////////////////////////////////////////////////////////// +// English (U.S.) resources + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) +#ifdef _WIN32 +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US +#pragma code_page(1252) +#endif //_WIN32 + +#ifdef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// TEXTINCLUDE +// + +1 TEXTINCLUDE +BEGIN + "resource.h\0" +END + +2 TEXTINCLUDE +BEGIN + "#include ""windows.h""\r\n" + "\0" +END + +3 TEXTINCLUDE +BEGIN + "\r\n" + "\0" +END + +#endif // APSTUDIO_INVOKED + + +///////////////////////////////////////////////////////////////////////////// +// +// Version +// + +VS_VERSION_INFO VERSIONINFO + FILEVERSION 1,0,0,1 + PRODUCTVERSION 1,0,0,1 + FILEFLAGSMASK 0x1fL +#ifdef _DEBUG + FILEFLAGS 0x9L +#else + FILEFLAGS 0x8L +#endif + FILEOS 0x4L + FILETYPE 0x2L + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904b0" + BEGIN + VALUE "Comments", "Build date: 2011-07-13" + VALUE "CompanyName", "STEricsson AB" + VALUE "FileDescription", "LCDriver Dynamic Link Library" + VALUE "FileVersion", "1, 0, 0, 1" + VALUE "InternalName", "Loader Communication Driver" + VALUE "LegalCopyright", "Copyright (C) STEricsson AB 2011" + VALUE "PrivateBuild", "http://gerrit.lud.stericsson.com/gerrit/24495" + VALUE "ProductName", "CXA1104507 Loader Communication Module" + VALUE "ProductVersion", "Test-Version" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1200 + END +END + +#endif // English (U.S.) resources +///////////////////////////////////////////////////////////////////////////// + + + +#ifndef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 3 resource. +// + + +///////////////////////////////////////////////////////////////////////////// +#endif // not APSTUDIO_INVOKED + diff --git a/lcmodule/source/LCM.vcproj b/lcmodule/source/LCM.vcproj index 6e5714c..0b9462e 100644 --- a/lcmodule/source/LCM.vcproj +++ b/lcmodule/source/LCM.vcproj @@ -1,7 +1,7 @@ + @@ -95,6 +98,88 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -599,7 +769,18 @@ + + + @@ -610,7 +791,18 @@ + + + @@ -629,7 +821,18 @@ + + + @@ -640,7 +843,18 @@ + + + @@ -659,7 +873,18 @@ + + + @@ -670,7 +895,18 @@ + + + diff --git a/source/LCDriver.rc b/source/LCDriver.rc index f681e3b..7d5bad3 100644 --- a/source/LCDriver.rc +++ b/source/LCDriver.rc @@ -81,16 +81,15 @@ BEGIN BEGIN BLOCK "000904b0" BEGIN - VALUE "Comments", "Build date: 2011-06-29" + VALUE "Comments", "Build date: 2011-07-13" VALUE "CompanyName", "STEricsson AB" VALUE "FileDescription", "LCDriver Dynamic Link Library" VALUE "FileVersion", "1, 0, 0, 1" VALUE "InternalName", "Loader Communication Driver" VALUE "LegalCopyright", "Copyright (C) STEricsson AB 2011" - VALUE "OriginalFilename", "LCDriver_CNH1606432.dll" - VALUE "PrivateBuild", "http://gerrit.lud.stericsson.com/gerrit/22864" + VALUE "PrivateBuild", "http://gerrit.lud.stericsson.com/gerrit/24495" VALUE "ProductName", "CXC 173 0865, LCDriver DLL" - VALUE "ProductVersion", "P1S" + VALUE "ProductVersion", "Test-Version" END END BLOCK "VarFileInfo" diff --git a/source/LCDriver.vcproj b/source/LCDriver.vcproj index d3906db..23d1308 100644 --- a/source/LCDriver.vcproj +++ b/source/LCDriver.vcproj @@ -11,6 +11,9 @@ + @@ -93,6 +96,90 @@ + + + + + + + + + + + + + + + + + + + + @@ -137,6 +224,8 @@ /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -380,6 +635,17 @@ Outputs="autogen\a2_command_ids.h" /> + + + @@ -391,6 +657,17 @@ Outputs="autogen\a2_command_ids.h" /> + + + @@ -402,6 +679,17 @@ Outputs="autogen\a2_command_ids.h" /> + + + + + + @@ -432,6 +731,17 @@ Outputs="autogen\a2_commands.h" /> + + + @@ -443,6 +753,17 @@ Outputs="autogen\a2_commands.h" /> + + + + + + @@ -469,6 +801,17 @@ Outputs="autogen\a2_commands_impl.h" /> + + + @@ -480,6 +823,17 @@ Outputs="autogen\a2_commands_impl.h" /> + + + + + + @@ -506,6 +871,17 @@ Outputs="autogen\a2_commands_marshal.cpp" /> + + + @@ -517,6 +893,17 @@ Outputs="autogen\a2_commands_marshal.cpp" /> + + + + + + @@ -547,6 +945,17 @@ Outputs="autogen\command_ids.h" /> + + + @@ -558,6 +967,17 @@ Outputs="autogen\command_ids.h" /> + + + + + + @@ -588,6 +1019,17 @@ Outputs="autogen\commands.h" /> + + + @@ -599,6 +1041,17 @@ Outputs="autogen\commands.h" /> + + + + + + @@ -625,6 +1089,17 @@ Outputs="autogen\commands_impl.h" /> + + + @@ -636,6 +1111,17 @@ Outputs="autogen\commands_impl.h" /> + + + + + + @@ -662,6 +1159,17 @@ Outputs="autogen\commands_marshal.cpp" /> + + + @@ -673,6 +1181,17 @@ Outputs="autogen\commands_marshal.cpp" /> + + + + + + @@ -707,6 +1237,17 @@ Outputs="autogen\lcdriver_error_codes.h" /> + + + @@ -718,6 +1259,17 @@ Outputs="autogen\lcdriver_error_codes.h" /> + + +