From f03996ebd2893062f31b4a2310802a6fcdf6a19a Mon Sep 17 00:00:00 2001 From: tildearrow Date: Sat, 28 Oct 2023 19:07:40 -0500 Subject: [PATCH] move furIcons somewhere else --- CMakeLists.txt | 2 +- src/engine/platform/pce.cpp | 3 +-- src/engine/platform/snes.cpp | 3 +-- src/engine/platform/swan.cpp | 3 +-- src/{gui => icon}/furIcons.h | 0 5 files changed, 4 insertions(+), 7 deletions(-) rename src/{gui => icon}/furIcons.h (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9495f8058..0b754d56c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -110,7 +110,7 @@ option(WITH_DEMOS "Install demo songs" ON) option(WITH_INSTRUMENTS "Install instruments" ON) option(WITH_WAVETABLES "Install wavetables" ON) -set(DEPENDENCIES_INCLUDE_DIRS "extern/IconFontCppHeaders") +set(DEPENDENCIES_INCLUDE_DIRS extern/IconFontCppHeaders src/icon) if (ANDROID AND NOT TERMUX) set(DEPENDENCIES_DEFINES "IS_MOBILE") diff --git a/src/engine/platform/pce.cpp b/src/engine/platform/pce.cpp index ba2af10e5..037a1cd69 100644 --- a/src/engine/platform/pce.cpp +++ b/src/engine/platform/pce.cpp @@ -19,8 +19,7 @@ #include "pce.h" #include "../engine.h" -// TODO: move this away -#include "../../gui/furIcons.h" +#include "furIcons.h" #include //#define rWrite(a,v) pendingWrites[a]=v; diff --git a/src/engine/platform/snes.cpp b/src/engine/platform/snes.cpp index fd0a6be53..0b6bdbbc9 100644 --- a/src/engine/platform/snes.cpp +++ b/src/engine/platform/snes.cpp @@ -20,8 +20,7 @@ #include "snes.h" #include "../engine.h" #include "../../ta-log.h" -// TODO: move this away -#include "../../gui/furIcons.h" +#include "furIcons.h" #include #define CHIP_FREQBASE 131072 diff --git a/src/engine/platform/swan.cpp b/src/engine/platform/swan.cpp index 315b6c47e..25260a44c 100644 --- a/src/engine/platform/swan.cpp +++ b/src/engine/platform/swan.cpp @@ -19,8 +19,7 @@ #include "swan.h" #include "../engine.h" -// TODO: move this away -#include "../../gui/furIcons.h" +#include "furIcons.h" #include "IconsFontAwesome4.h" #include diff --git a/src/gui/furIcons.h b/src/icon/furIcons.h similarity index 100% rename from src/gui/furIcons.h rename to src/icon/furIcons.h