diff options
| author | Stanislaw Halik <sthalik@misaki.pl> | 2023-04-10 12:01:48 +0200 |
|---|---|---|
| committer | Stanislaw Halik <sthalik@misaki.pl> | 2023-04-10 12:36:39 +0200 |
| commit | 7f5ebe0332aeef2fe2b1854d92f15602b706a9dd (patch) | |
| tree | 13c343669d1c79860665ca69a4445e10b62984ca | |
| parent | c1cbf905c0459681d6bc34579bfcf90f838d8f58 (diff) | |
fix more msvc snafu
| -rw-r--r-- | main/floormat.rc | 1 | ||||
| -rw-r--r-- | userconfig-sthalik@Windows-MSVC.cmake | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/main/floormat.rc b/main/floormat.rc index e994bd1a..03405218 100644 --- a/main/floormat.rc +++ b/main/floormat.rc @@ -1,2 +1 @@ -#include <windows.h> IDI_ICON1 ICON DISCARDABLE "floormat.ico" diff --git a/userconfig-sthalik@Windows-MSVC.cmake b/userconfig-sthalik@Windows-MSVC.cmake index 72834103..ba0ca07d 100644 --- a/userconfig-sthalik@Windows-MSVC.cmake +++ b/userconfig-sthalik@Windows-MSVC.cmake @@ -14,6 +14,7 @@ sets(BOOL FLOORMAT_PRECOMPILED-HEADERS OFF) sets(BOOL FLOORMAT_SUBMODULE-SDL2 ON) add_link_options(-STACK:41943040) +add_link_options(-WX:NO) if(CMAKE_SIZEOF_VOID_P GREATER 4) set(CMAKE_C_COMPILER_LAUNCHER msvc64.cmd) @@ -21,12 +22,14 @@ if(CMAKE_SIZEOF_VOID_P GREATER 4) set(CMAKE_C_LINKER_LAUNCHER msvc64.cmd) set(CMAKE_CXX_LINKER_LAUNCHER msvc64.cmd) set(CMAKE_RC_COMPILER_LAUNCHER msvc64.cmd) + SET(CMAKE_RC_LINKER_LAUNCHER msvc64.cmd) else() set(CMAKE_C_COMPILER_LAUNCHER msvc.cmd) set(CMAKE_CXX_COMPILER_LAUNCHER msvc.cmd) set(CMAKE_C_LINKER_LAUNCHER msvc.cmd) set(CMAKE_CXX_LINKER_LAUNCHER msvc.cmd) set(CMAKE_RC_COMPILER_LAUNCHER msvc.cmd) + SET(CMAKE_RC_LINKER_LAUNCHER msvc.cmd) endif() function(fm-userconfig-external) |