diff --git a/CMakeLists.txt b/CMakeLists.txt index 6e0ac5b..9fde522 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -289,7 +289,7 @@ if (WIN32) LINK_FLAGS_MINSIZEREL "/SUBSYSTEM:WINDOWS /ENTRY:mainCRTStartup" ) - # target_sources(BanjoRecompiled PRIVATE ${CMAKE_SOURCE_DIR}/icons/app.rc) + target_sources(BanjoRecompiled PRIVATE ${CMAKE_SOURCE_DIR}/icons/app.rc) target_link_libraries(BanjoRecompiled PRIVATE SDL2 Winmm.lib) endif() diff --git a/assets/LatoLatin-Bold.ttf b/assets/LatoLatin-Bold.ttf deleted file mode 100644 index c598c24..0000000 Binary files a/assets/LatoLatin-Bold.ttf and /dev/null differ diff --git a/assets/LatoLatin-BoldItalic.ttf b/assets/LatoLatin-BoldItalic.ttf deleted file mode 100644 index c1f225a..0000000 Binary files a/assets/LatoLatin-BoldItalic.ttf and /dev/null differ diff --git a/assets/LatoLatin-Italic.ttf b/assets/LatoLatin-Italic.ttf deleted file mode 100644 index c61fc07..0000000 Binary files a/assets/LatoLatin-Italic.ttf and /dev/null differ diff --git a/assets/LatoLatin-Regular.ttf b/assets/LatoLatin-Regular.ttf deleted file mode 100644 index bcc5778..0000000 Binary files a/assets/LatoLatin-Regular.ttf and /dev/null differ diff --git a/icons/128.ico b/icons/128.ico new file mode 100644 index 0000000..eb0d575 Binary files /dev/null and b/icons/128.ico differ diff --git a/icons/16.ico b/icons/16.ico new file mode 100644 index 0000000..2083dd5 Binary files /dev/null and b/icons/16.ico differ diff --git a/icons/256.ico b/icons/256.ico new file mode 100644 index 0000000..b87cf2b Binary files /dev/null and b/icons/256.ico differ diff --git a/icons/32.ico b/icons/32.ico new file mode 100644 index 0000000..bb993f0 Binary files /dev/null and b/icons/32.ico differ diff --git a/icons/512.ico b/icons/512.ico new file mode 100644 index 0000000..b87cf2b Binary files /dev/null and b/icons/512.ico differ diff --git a/icons/512.png b/icons/512.png new file mode 100644 index 0000000..5ad150e Binary files /dev/null and b/icons/512.png differ diff --git a/icons/64.ico b/icons/64.ico new file mode 100644 index 0000000..17de69c Binary files /dev/null and b/icons/64.ico differ diff --git a/icons/app.rc b/icons/app.rc new file mode 100644 index 0000000..d1cfaaa --- /dev/null +++ b/icons/app.rc @@ -0,0 +1,6 @@ +1 ICON DISCARDABLE "512.ico" +2 ICON DISCARDABLE "256.ico" +3 ICON DISCARDABLE "128.ico" +4 ICON DISCARDABLE "64.ico" +5 ICON DISCARDABLE "32.ico" +6 ICON DISCARDABLE "16.ico" \ No newline at end of file diff --git a/src/ui/ui_state.cpp b/src/ui/ui_state.cpp index d3e995f..dc40a4b 100644 --- a/src/ui/ui_state.cpp +++ b/src/ui/ui_state.cpp @@ -216,10 +216,6 @@ public: bool fallback_face; }; FontFace font_faces[] = { - {"LatoLatin-Regular.ttf", false}, - {"LatoLatin-Italic.ttf", false}, - {"LatoLatin-Bold.ttf", false}, - {"LatoLatin-BoldItalic.ttf", false}, {"Suplexmentary Comic NC.ttf", false}, {"NotoEmoji-Regular.ttf", true}, {"promptfont/promptfont.ttf", false},