From 1ab23d5531ed2c80f1ebd370a924ad0f92030251 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Hrdli=C4=8Dka?= Date: Sun, 29 Aug 2021 08:38:26 +0200 Subject: [PATCH 1/2] cmake: more fixes --- src/CMakeLists.txt | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index dc7f76dd0..cbe6f79f5 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -64,12 +64,16 @@ target_link_libraries(86Box PNG::PNG) if(ARCH STREQUAL "i386") if(MSVC) - set_target_properties(86Box PROPERTIES LINK_FLAGS "/LARGEADDRESSAWARE") - elseif(MINGW) - set_target_properties(86Box PROPERTIES LINK_FLAGS "-Wl,--large-address-aware") + target_link_options(86Box PRIVATE "/LARGEADDRESSAWARE") + else() + target_link_options(86Box PRIVATE "LINKER:--large-address-aware") endif() endif() +if(NOT MSVC) + target_link_options(86Box PRIVATE "-static") +endif() + configure_file(include/86box/version.h.in include/86box/version.h @ONLY) include_directories(${CMAKE_CURRENT_BINARY_DIR}/include) From 139268c7495cf8e46680ad18c542e6993ba8f584 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Hrdli=C4=8Dka?= Date: Sun, 29 Aug 2021 08:49:46 +0200 Subject: [PATCH 2/2] fix copyright sign in version information --- src/win/86Box.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/win/86Box.rc b/src/win/86Box.rc index e48df8eae..9f98c9350 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 \u00A9 2007-2020 " EMU_NAME " contributors\0" + VALUE "LegalCopyright", "Copyright \xc2\xa9 2007-2020 " EMU_NAME " contributors\0" VALUE "OriginalFilename", "86box.exe\0" VALUE "ProductName", EMU_NAME "\0" VALUE "ProductVersion", EMU_VERSION "\0"