diff options
| author | Přemysl Eric Janouch <p@janouch.name> | 2023-07-21 12:36:31 +0200 |
|---|---|---|
| committer | Přemysl Eric Janouch <p@janouch.name> | 2023-07-21 12:37:01 +0200 |
| commit | 8b5ea67aff71bfe0fc1f5cf3f11cda2303e03002 (patch) | |
| tree | 2a044078aeded46f2ac5582e0cafb5b7bfb29cc7 | |
| parent | 6f02af814f099325458e14aff4f1ac83d31385dc (diff) | |
| download | xK-8b5ea67aff71bfe0fc1f5cf3f11cda2303e03002.tar.gz xK-8b5ea67aff71bfe0fc1f5cf3f11cda2303e03002.tar.xz xK-8b5ea67aff71bfe0fc1f5cf3f11cda2303e03002.zip | |
xW: fix Clang build
| -rw-r--r-- | xW/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | xW/xW.rc | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/xW/CMakeLists.txt b/xW/CMakeLists.txt index 9ae439e..7af0e31 100644 --- a/xW/CMakeLists.txt +++ b/xW/CMakeLists.txt @@ -18,6 +18,7 @@ add_compile_options ("$<$<CXX_COMPILER_ID:MSVC>:/utf-8>") add_compile_options ("$<$<CXX_COMPILER_ID:GNU>:-Wall;-Wextra>") add_compile_options ("$<$<CXX_COMPILER_ID:Clang>:-Wall;-Wextra>") add_link_options ("$<$<CXX_COMPILER_ID:GNU>:-static;-municode>") +add_link_options ("$<$<CXX_COMPILER_ID:Clang>:-static;-municode>") set (project_config ${PROJECT_BINARY_DIR}/config.h) configure_file (${PROJECT_SOURCE_DIR}/config.h.in ${project_config}) @@ -22,10 +22,13 @@ BEGIN VK_PRIOR, ID_PREVIOUS_BUFFER, CONTROL, VIRTKEY VK_NEXT, ID_NEXT_BUFFER, CONTROL, VIRTKEY VK_TAB, ID_SWITCH_BUFFER, CONTROL, VIRTKEY + // These are proper, but llvm-rc won't accept them (GitHub #64002). +#ifndef __clang__ "!", ID_GOTO_HIGHLIGHT, ALT "a", ID_GOTO_ACTIVITY, ALT "H", ID_TOGGLE_UNIMPORTANT, ALT "h", ID_DISPLAY_FULL_LOG, ALT +#endif END VS_VERSION_INFO VERSIONINFO |