From 3520fdfbc51c62a6d3493bc3320fe1721b60ace5 Mon Sep 17 00:00:00 2001 From: Mr-Wiseguy Date: Fri, 15 Mar 2024 19:47:29 -0400 Subject: [PATCH] Added icons and version number, disabled 8x MSAA and set default to 2x --- CMakeLists.txt | 11 +++++++++++ assets/config_menu.rml | 2 +- assets/config_menu/graphics.rml | 4 ++-- assets/launcher.rml | 3 +++ assets/recomp.rcss | 2 +- assets/scss/styles/components/BottomLeft.scss | 14 ++++++++++++++ assets/scss/styles/components/_components.scss | 1 + icons/128.ico | Bin 0 -> 67646 bytes icons/16.ico | Bin 0 -> 1150 bytes icons/256.ico | Bin 0 -> 32841 bytes icons/32.ico | Bin 0 -> 4286 bytes icons/512.ico | Bin 0 -> 53716 bytes icons/64.ico | Bin 0 -> 16958 bytes icons/app.rc | 6 ++++++ src/game/config.cpp | 2 +- src/ui/ui_launcher.cpp | 3 +++ 16 files changed, 43 insertions(+), 5 deletions(-) create mode 100644 assets/scss/styles/components/BottomLeft.scss create mode 100644 icons/128.ico create mode 100644 icons/16.ico create mode 100644 icons/256.ico create mode 100644 icons/32.ico create mode 100644 icons/512.ico create mode 100644 icons/64.ico create mode 100644 icons/app.rc diff --git a/CMakeLists.txt b/CMakeLists.txt index 43ea6c2..04972c3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -206,6 +206,17 @@ if (WIN32) "${CMAKE_SOURCE_DIR}/lib/rt64/src/contrib/dxc/bin/x64/dxil.dll" "${CMAKE_SOURCE_DIR}/lib/rt64/src/contrib/dxc/bin/x64/dxcompiler.dll" $) + + set_target_properties( + Zelda64Recompiled + PROPERTIES + LINK_FLAGS_DEBUG "/SUBSYSTEM:CONSOLE" + LINK_FLAGS_RELEASE "/SUBSYSTEM:WINDOWS /ENTRY:mainCRTStartup" + LINK_FLAGS_RELWITHDEBINFO "/SUBSYSTEM:WINDOWS /ENTRY:mainCRTStartup" + LINK_FLAGS_MINSIZEREL "/SUBSYSTEM:WINDOWS /ENTRY:mainCRTStartup" + ) + + target_sources(Zelda64Recompiled PRIVATE ${CMAKE_SOURCE_DIR}/icons/app.rc) endif() target_link_libraries(Zelda64Recompiled PRIVATE diff --git a/assets/config_menu.rml b/assets/config_menu.rml index 11af278..a0d81bb 100644 --- a/assets/config_menu.rml +++ b/assets/config_menu.rml @@ -70,7 +70,7 @@
Debug
- +