diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml index 79c9fe59f..5ab4f0117 100644 --- a/.github/workflows/c-cpp.yml +++ b/.github/workflows/c-cpp.yml @@ -47,11 +47,11 @@ jobs: x64: y clang: n continue-on-error: false - - msystem: CLANG64 - prefix: mingw-w64-clang-x86_64 - x64: y - clang: y - continue-on-error: true +# - msystem: CLANG64 +# prefix: mingw-w64-clang-x86_64 +# x64: y +# clang: y +# continue-on-error: true steps: - uses: msys2/setup-msys2@v2 diff --git a/src/win/86Box.rc b/src/win/86Box.rc index d6e98e6ee..e48df8eae 100644 --- a/src/win/86Box.rc +++ b/src/win/86Box.rc @@ -1296,7 +1296,7 @@ BEGIN VALUE "FileDescription", EMU_NAME "\0" VALUE "FileVersion", EMU_VERSION "\0" VALUE "InternalName", EMU_NAME "\0" - VALUE "LegalCopyright", "Copyright © 2007-2020 " EMU_NAME " contributors\0" + VALUE "LegalCopyright", "Copyright \u00A9 2007-2020 " EMU_NAME " contributors\0" VALUE "OriginalFilename", "86box.exe\0" VALUE "ProductName", EMU_NAME "\0" VALUE "ProductVersion", EMU_VERSION "\0" diff --git a/src/win/CMakeLists.txt b/src/win/CMakeLists.txt index 839f2b0bb..6102cde68 100644 --- a/src/win/CMakeLists.txt +++ b/src/win/CMakeLists.txt @@ -29,12 +29,14 @@ if(MSVC) target_compile_definitions(ui PRIVATE NO_INCLUDE_MANIFEST) target_sources(86Box PRIVATE 86Box.manifest) - target_sources(plat PRIVATE win_opendir.c) - # Append null to resource strings (fixes file dialogs) set_property(SOURCE 86Box.rc PROPERTY COMPILE_FLAGS -n) endif() +if(NOT MINGW) + target_sources(plat PRIVATE win_opendir.c) +endif() + if(DINPUT) target_sources(plat PRIVATE win_joystick.cpp) target_link_libraries(86Box dinput8)