diff --git a/windows/src/engine/keyman32/keyman32.vcxproj b/windows/src/engine/keyman32/keyman32.vcxproj index 11c7d42496..e437912316 100644 --- a/windows/src/engine/keyman32/keyman32.vcxproj +++ b/windows/src/engine/keyman32/keyman32.vcxproj @@ -157,7 +157,7 @@ $(ProjectDir)..\..\..\..\core\build\ARM64\$(Configuration)\src;$(ProjectDir)..\..\..\..\core\build\ARM64\$(Configuration)\subprojects\icu\source\common;$(ProjectDir)..\..\..\..\core\build\ARM64\$(Configuration)\subprojects\icu\source\i18n;$(ProjectDir)..\..\..\..\core\build\rust\ARM64\$(Configuration);$(VC_LibraryPath_ARM64);$(WindowsSDK_LibraryPath_ARM64) - $(ProjectDir)..\..\..\..\common\include;$(ProjectDir)..\..\..\..\core\include;$(ProjectDir)..\..\..\..\core\build\ARM64\$(Configuration)\include;$(IncludePath) + $(ProjectDir)..\..\..\..\common\include;$(ProjectDir)..\..\..\..\core\include;$(ProjectDir)..\..\..\..\core\build\arm64\$(Configuration)\include;$(IncludePath) keymanarm64 diff --git a/windows/src/engine/keyman32/keymanarm64.rc b/windows/src/engine/keyman32/keymanarm64.rc index c4fe9ce92e..e143be7077 100644 --- a/windows/src/engine/keyman32/keymanarm64.rc +++ b/windows/src/engine/keyman32/keymanarm64.rc @@ -1 +1 @@ -#include "version64.rc" +#include "versionarm64.rc" diff --git a/windows/src/engine/keyman32/versionarm64.rc b/windows/src/engine/keyman32/versionarm64.rc new file mode 100644 index 0000000000..a2f3332e59 --- /dev/null +++ b/windows/src/engine/keyman32/versionarm64.rc @@ -0,0 +1,32 @@ +#include "../../../../common/windows/cpp/include/keymanversion.h" + +1 VERSIONINFO + FILEVERSION KV_FILEVERSION + PRODUCTVERSION KV_PRODUCTVERSION + FILEFLAGSMASK 0x3fL + FILEFLAGS 0x0L + FILEOS 0x4L + FILETYPE 0x2L + FILESUBTYPE 0x0L + BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "0C0904E4" + BEGIN + VALUE "CompanyName", KV_COMPANY_NAME + VALUE "FileDescription", "Keyman Engine Processor Arm64\0" + VALUE "FileVersion", KV_VERSION_STRING + VALUE "InternalName", "KEYMANARM64\0" + VALUE "LegalCopyright", KV_LEGAL_COPYRIGHT + VALUE "LegalTrademarks", KV_LEGAL_TRADEMARKS + VALUE "OriginalFilename", "KEYMANARM64.DLL\0" + VALUE "ProductName", "Keyman Engine\0" + VALUE "ProductVersion", KV_VERSION_STRING + VALUE "Comments", "\0" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0xc09, 1252 + END + END diff --git a/windows/src/engine/keymanhp/build.sh b/windows/src/engine/keymanhp/build.sh index c72be7b7d0..89f3a2f163 100755 --- a/windows/src/engine/keymanhp/build.sh +++ b/windows/src/engine/keymanhp/build.sh @@ -37,7 +37,7 @@ function do_clean_arm64() { function do_build_x64() { create-windows-output-folders - build_version.res + run_in_vs_env rc versionx64.rc sed "s/Keyman Engine HP/Keyman Engine x64/g; s/arch64/amd64/g" manifesthp.in > manifest.in build_manifest.res @@ -49,7 +49,7 @@ function do_build_x64() { function do_build_arm64() { create-windows-output-folders - build_version.res + run_in_vs_env rc versionarm64.rc sed "s/Keyman Engine HP/Keyman Engine arm64/g; s/arch64/arm64/g" manifesthp.in > manifest.in build_manifest.res diff --git a/windows/src/engine/keymanhp/keymanarm64.rc b/windows/src/engine/keymanhp/keymanarm64.rc new file mode 100644 index 0000000000..343916115f --- /dev/null +++ b/windows/src/engine/keymanhp/keymanarm64.rc @@ -0,0 +1,6 @@ +// Microsoft Visual C++ generated resource script. +// +#include "versionarm64.rc" +#include "manifest.rc" +1 ICON "..\\..\\desktop\\branding\\keymandesktop90-64.ico" + diff --git a/windows/src/engine/keymanhp/keymanhp.cpp b/windows/src/engine/keymanhp/keymanhp.cpp index 5d5c2985b7..81d386c000 100644 --- a/windows/src/engine/keymanhp/keymanhp.cpp +++ b/windows/src/engine/keymanhp/keymanhp.cpp @@ -70,7 +70,7 @@ BOOL KeymanStarted = FALSE; #define ARCH_LOG_FILE ".keymanhp-x64" #elif defined(_M_ARM64) #define WINDOW_TITLE L"Keymanhp-arm64" - #define EXECUTABLE_TITLE L"Keyman Engine arm64" + #define EXECUTABLE_TITLE L"Keyman Engine Arm64" #define ARCH_LOG_FILE ".keymanhp-arm64" #else #error Unknown architecture diff --git a/windows/src/engine/keymanhp/keymanhp.vcxproj b/windows/src/engine/keymanhp/keymanhp.vcxproj index e42d415885..82fa901a96 100644 --- a/windows/src/engine/keymanhp/keymanhp.vcxproj +++ b/windows/src/engine/keymanhp/keymanhp.vcxproj @@ -283,7 +283,16 @@ - + + true + true + true + true + + + true + true + diff --git a/windows/src/engine/keymanhp/keymanhp.vcxproj.filters b/windows/src/engine/keymanhp/keymanhp.vcxproj.filters index 116cf084a4..7c736dcc17 100644 --- a/windows/src/engine/keymanhp/keymanhp.vcxproj.filters +++ b/windows/src/engine/keymanhp/keymanhp.vcxproj.filters @@ -34,7 +34,10 @@ - + + Resource Files + + Resource Files diff --git a/windows/src/engine/keymanhp/keymanhp.rc b/windows/src/engine/keymanhp/keymanx64.rc similarity index 84% rename from windows/src/engine/keymanhp/keymanhp.rc rename to windows/src/engine/keymanhp/keymanx64.rc index 124704538b..2912156cd3 100644 --- a/windows/src/engine/keymanhp/keymanhp.rc +++ b/windows/src/engine/keymanhp/keymanx64.rc @@ -1,6 +1,6 @@ // Microsoft Visual C++ generated resource script. // -#include "version.rc" +#include "versionx64.rc" #include "manifest.rc" 1 ICON "..\\..\\desktop\\branding\\keymandesktop90-64.ico" diff --git a/windows/src/engine/keymanhp/versionarm64.rc b/windows/src/engine/keymanhp/versionarm64.rc new file mode 100644 index 0000000000..42b56aee6e --- /dev/null +++ b/windows/src/engine/keymanhp/versionarm64.rc @@ -0,0 +1,32 @@ +#include "../../../../common/windows/cpp/include/keymanversion.h" + +1 VERSIONINFO + FILEVERSION KV_FILEVERSION + PRODUCTVERSION KV_PRODUCTVERSION + FILEFLAGSMASK 0x3fL + FILEFLAGS 0x0L + FILEOS 0x4L + FILETYPE 0x2L + FILESUBTYPE 0x0L + BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "0C0904E4" + BEGIN + VALUE "CompanyName", KV_COMPANY_NAME + VALUE "FileDescription", "Keyman Engine Arm64\0" + VALUE "FileVersion", KV_VERSION_STRING + VALUE "InternalName", "KEYMANARM64\0" + VALUE "LegalCopyright", KV_LEGAL_COPYRIGHT + VALUE "LegalTrademarks", KV_LEGAL_TRADEMARKS + VALUE "OriginalFilename", "KEYMAN.HP.ARM64.EXE\0" + VALUE "ProductName", "Keyman Engine\0" + VALUE "ProductVersion", KV_VERSION_STRING + VALUE "Comments", "\0" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0xc09, 1252 + END + END diff --git a/windows/src/engine/keymanhp/version.rc b/windows/src/engine/keymanhp/versionx64.rc similarity index 93% rename from windows/src/engine/keymanhp/version.rc rename to windows/src/engine/keymanhp/versionx64.rc index 80133aa7f2..9baa88c50c 100644 --- a/windows/src/engine/keymanhp/version.rc +++ b/windows/src/engine/keymanhp/versionx64.rc @@ -19,7 +19,7 @@ VALUE "InternalName", "KEYMANX64\0" VALUE "LegalCopyright", KV_LEGAL_COPYRIGHT VALUE "LegalTrademarks", KV_LEGAL_TRADEMARKS - VALUE "OriginalFilename", "KEYMANX64.EXE\0" + VALUE "OriginalFilename", "KEYMAN.HP.64.EXE\0" VALUE "ProductName", "Keyman Engine\0" VALUE "ProductVersion", KV_VERSION_STRING VALUE "Comments", "\0"