refactor(windows): merge keyman64 build into keyman32 #11906
Conversation
Merges the build settings for keyman64.dll vc++ project into the keyman32.dll project, so they are both built from the same project, in preparation for ARM support, to minimize repetition in the source tree. There should be no material differences to the built libraries. Also cleans up some noise in keyman32.vcxproj which made it easier to verify the changes. Fixes: #11904
keymanapp-test-bot
bot
added
has-user-test
user-test-missing
User Test Results |
| @@ -18,7 +18,7 @@ builder_describe "Keyman common Windows modules" \ | |||
|
|
|||
| builder_parse "$@" | |||
|
|
|||
| if [[ $BUILDER_OS != windows ]]; then | |||
| if [[ $BUILDER_OS != win ]]; then | |||
There was a problem hiding this comment.
This script isn't actually used at this point, but I noticed this when testing. Just a silly.
| #ifdef _WIN64 | ||
| #error hotkeys.cpp is not required for win64. | ||
| #endif | ||
| #ifndef _WIN64 |
There was a problem hiding this comment.
Swapping the condition around, because the .cpp files are now included with all archs, and it is easier to track in the .cpp than having conditional exclusions in the .vcxproj
keymanapp-test-bot
bot
added
user-test-required
| @@ -31,6 +31,9 @@ | |||
| //////////////////////////////////////////////////////////////////////////// | |||
|
|
|||
| #include "pch.h" | |||
|
|
|||
| #ifndef _WIN64 | |||
There was a problem hiding this comment.
Shouldn't this be the other way round?
| #ifndef _WIN64 | |
| #ifdef _WIN64 |
There was a problem hiding this comment.
No, this is correct as it is -- even though that is confusing! The syskbd* files are only used in the x86 host.
There was a problem hiding this comment.
Can we add a comment or fill in the description at the top?
There was a problem hiding this comment.
Can we add a comment or fill in the description at the top?
See #11929. Apologies for missing this before merge.
Test Results
|
keymanapp-test-bot
bot
removed
the
user-test-required
Co-authored-by: Eberhard Beilharz <[email protected]>
|
Changes in this pull request will be available for download in Keyman version 18.0.68-alpha |
Merges the build settings for keyman64.dll vc++ project into the keyman32.dll project, so they are both built from the same project, in preparation for ARM support, to minimize repetition in the source tree.
There should be no material differences to the built libraries.
Also cleans up some noise in keyman32.vcxproj which made it easier to verify the changes.
Fixes: #11904
User Testing