80486DX2-66/86Box-fork
1
0
Fork 0
Code Issues Pull Requests Activity

Merge branch '86Box:master' into master

Browse Source
This commit is contained in:
Ompronce
2021-08-29 05:19:14 -04:00
committed by GitHub
parent 0468164c2b 139268c749
commit af7cb08b3e
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/CMakeLists.txt
View File

@@ -64,12 +64,16 @@ target_link_libraries(86Box PNG::PNG)
if(ARCH STREQUAL "i386") if(ARCH STREQUAL "i386")
if(MSVC) if(MSVC)
set_target_properties(86Box PROPERTIES LINK_FLAGS "/LARGEADDRESSAWARE") target_link_options(86Box PRIVATE "/LARGEADDRESSAWARE")
elseif(MINGW) else()
set_target_properties(86Box PROPERTIES LINK_FLAGS "-Wl,--large-address-aware") target_link_options(86Box PRIVATE "LINKER:--large-address-aware")
endif() endif()
endif() endif()
if(NOT MSVC)
target_link_options(86Box PRIVATE "-static")
endif()
configure_file(include/86box/version.h.in include/86box/version.h @ONLY) configure_file(include/86box/version.h.in include/86box/version.h @ONLY)
include_directories(${CMAKE_CURRENT_BINARY_DIR}/include) include_directories(${CMAKE_CURRENT_BINARY_DIR}/include)

2
src/win/86Box.rc
View File

@@ -1296,7 +1296,7 @@ BEGIN
VALUE "FileDescription", EMU_NAME "\0" VALUE "FileDescription", EMU_NAME "\0"
VALUE "FileVersion", EMU_VERSION "\0" VALUE "FileVersion", EMU_VERSION "\0"
VALUE "InternalName", EMU_NAME "\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 "OriginalFilename", "86box.exe\0"
VALUE "ProductName", EMU_NAME "\0" VALUE "ProductName", EMU_NAME "\0"
VALUE "ProductVersion", EMU_VERSION "\0" VALUE "ProductVersion", EMU_VERSION "\0"