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 ("$<$:/utf-8>") add_compile_options ("$<$:-Wall;-Wextra>") add_compile_options ("$<$:-Wall;-Wextra>") add_link_options ("$<$:-static;-municode>") +add_link_options ("$<$:-static;-municode>") set (project_config ${PROJECT_BINARY_DIR}/config.h) configure_file (${PROJECT_SOURCE_DIR}/config.h.in ${project_config}) diff --git a/xW/xW.rc b/xW/xW.rc index f041995..2948a21 100644 --- a/xW/xW.rc +++ b/xW/xW.rc @@ -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