Added SPELUNKY_PSP_WITH_IMGUI compile definition

cmake/DependenciesDarwin.cmake

@@ -21,7 +21,9 @@ macro(add_darwin_dependencies)
     target_compile_definitions(Dependencies INTERFACE
             SPELUNKY_PSP_PLATFORM_DARWIN
             SPELUNKY_PSP_PLATFORM_DESKTOP
+            SPELUNKY_PSP_WITH_IMGUI
     )
+    set(SPELUNKY_PSP_WITH_IMGUI TRUE)
 endmacro()
 
 macro(spelunky_psp_post_build_darwin)

cmake/DependenciesLinux.cmake

@@ -18,10 +18,13 @@ macro(add_linux_dependencies)
 
     add_library(Dependencies INTERFACE)
     target_link_libraries(Dependencies INTERFACE SDL_2_XX)
+    # TODO: Separate target, i.e PlatformDefinitions
     target_compile_definitions(Dependencies INTERFACE
         SPELUNKY_PSP_PLATFORM_LINUX
         SPELUNKY_PSP_PLATFORM_DESKTOP
+        SPELUNKY_PSP_WITH_IMGUI
     )
+    set(SPELUNKY_PSP_WITH_IMGUI TRUE)
 endmacro()
 
 macro(spelunky_psp_post_build_linux)

cmake/DependenciesWindows.cmake

@@ -14,7 +14,9 @@ macro(add_windows_dependencies)
     target_compile_definitions(Dependencies INTERFACE
             SPELUNKY_PSP_PLATFORM_WINDOWS
             SPELUNKY_PSP_PLATFORM_DESKTOP
-            )
+            SPELUNKY_PSP_WITH_IMGUI
+    )
+    set(SPELUNKY_PSP_WITH_IMGUI TRUE)
 endmacro()
 
 macro(spelunky_psp_post_build_windows)

src/game-loop/CMakeLists.txt

@@ -371,5 +371,6 @@ target_link_libraries(GameLoop
         Audio
         glad
         GraphicsUtils
-        imgui
+        $<$<BOOL:${SPELUNKY_PSP_WITH_IMGUI}>:imgui>
+        Dependencies
 )

src/game-loop/src/prefabs/ui/CheatConsole.cpp

@@ -3,13 +3,16 @@
 #include "components/generic/ScriptingComponent.hpp"
 #include "components/generic/ImguiComponent.hpp"
 #include "logger/log.h"
-#include "imgui_impl_opengl2.h"
-#include "imgui_impl_sdl2.h"
 #include "Input.hpp"
 #include "prefabs/npc/RedFrog.hpp"
 #include "components/specialized/MainDudeComponent.hpp"
 #include "game-loop/GameLoop.hpp"
 
+// TODO: Better way to handle this than if-defing as there will be more imgui-components
+#if defined(SPELUNKY_PSP_WITH_IMGUI)
+#include "imgui_impl_opengl2.h"
+#include "imgui_impl_sdl2.h"
+
 namespace {
     // Based on ImGui's example console:
     static int Stricmp(const char *s1, const char *s2) {
@@ -309,6 +312,13 @@ namespace {
         const std::function<void()> dont_render_callback = [](){};
     };
 }
+#else
+class CheatConsoleScript final : public ScriptBase {
+    public:
+        explicit CheatConsoleScript(entt::entity self) { }
+        void update(entt::entity owner, uint32_t delta_time_ms) override { }
+};
+#endif
 
 namespace prefabs {
 

src/game-loop/src/system/RenderingSystem.cpp

@@ -7,8 +7,6 @@
 #include "components/generic/QuadComponent.hpp"
 #include "components/generic/MeshComponent.hpp"
 #include "components/generic/BlinkingComponent.hpp"
-#include "imgui_impl_opengl2.h"
-#include "imgui_impl_sdl2.h"
 #include "components/generic/ImguiComponent.hpp"
 
 void RenderingSystem::update(std::uint32_t delta_time_ms)
@@ -141,6 +139,10 @@ void RenderingSystem::update_opengl(std::uint32_t delta_time_ms) {
     });
 }
 
+#if defined(SPELUNKY_PSP_WITH_IMGUI)
+#include "imgui_impl_opengl2.h"
+#include "imgui_impl_sdl2.h"
+
 void RenderingSystem::update_imgui() {
 
     ImGui_ImplOpenGL2_NewFrame();
@@ -161,3 +163,6 @@ void RenderingSystem::update_imgui() {
         ImGui_ImplOpenGL2_RenderDrawData(draw_data);
     }
 }
+#else
+void RenderingSystem::update_imgui() {}
+#endif

src/input/CMakeLists.txt

@@ -31,5 +31,6 @@ target_link_libraries(Input
         $<$<BOOL:${SPELUNKY_PSP_PLATFORM_LINUX}>:SDL_2_XX>
         $<$<BOOL:${SPELUNKY_PSP_PLATFORM_WINDOWS}>:SDL_1_XX>
         $<$<BOOL:${SPELUNKY_PSP_PLATFORM_PSP}>:SDL_1_XX>
-        $<$<BOOL:${SPELUNKY_PSP_PLATFORM_DESKTOP}>:imgui>
+        $<$<BOOL:${SPELUNKY_PSP_WITH_IMGUI}>:imgui>
+        Dependencies
 )

src/input/src/Input_Desktop.cpp

@@ -1,7 +1,14 @@
 #include "Input.hpp"
 
 #include <SDL2/SDL_events.h>
-#include "imgui_impl_sdl2.h"
+
+#if defined(SPELUNKY_PSP_WITH_IMGUI)
+    #include "imgui_impl_sdl2.h"
+    void imgui_event_processing(const SDL_Event* event) { ImGui_ImplSDL2_ProcessEvent(event); }
+#else
+    void imgui_event_processing(const SDL_Event* event) {}
+#endif
+
 
 const char* Input::get_pause_binding_msg()
 {
@@ -52,7 +59,7 @@ void Input::poll()
 
     while (SDL_PollEvent(&event))
     {
-        ImGui_ImplSDL2_ProcessEvent(&event);
+        imgui_event_processing(&event);
         if (event.type == SDL_EventType::SDL_KEYDOWN || event.type == SDL_EventType::SDL_KEYUP)
         {
             const auto& key = event.key.keysym.sym;

src/video/CMakeLists.txt

@@ -34,5 +34,6 @@ target_link_libraries(Video
         $<IF:$<BOOL:${SPELUNKY_PSP_PLATFORM_LINUX}>,SDL_2_XX,>
         $<IF:$<BOOL:${SPELUNKY_PSP_PLATFORM_DARWIN}>,SDL_2_XX,>
         $<IF:$<BOOL:${SPELUNKY_PSP_PLATFORM_ANDROID}>,SDL_2_XX,>
-        $<IF:$<BOOL:${SPELUNKY_PSP_PLATFORM_DESKTOP}>,imgui,>
+        $<IF:$<BOOL:${SPELUNKY_PSP_WITH_IMGUI}>,imgui,>
+        Dependencies
 )

src/video/src/Video_Desktop.cpp

@@ -8,6 +8,7 @@
 #include <SDL2/SDL_video.h>
 #include <stdexcept>
 
+#if defined(SPELUNKY_PSP_WITH_IMGUI)
 #include "imgui.h"
 #include "imgui_impl_sdl2.h"
 #include "imgui_impl_opengl2.h"
@@ -37,7 +38,13 @@ namespace {
             ImGui::DestroyContext();
         }
     };
+}
+#else
+struct Imgui { Imgui(SDL_Window *window, void *gl_context) {}};
+#endif
 
+namespace
+{
     std::pair<int, int> query_screen_dimensions() {
         SDL_DisplayMode dm;
         if (SDL_GetDesktopDisplayMode(0, &dm) != 0)

vendor/CMakeLists.txt

@@ -12,6 +12,6 @@ add_subdirectory(glad)
 add_subdirectory(cjson)
 add_subdirectory(entt)
 
-if (SPELUNKY_PSP_PLATFORM_DESKTOP)
+if (SPELUNKY_PSP_WITH_IMGUI)
     add_subdirectory(imgui)
 endif()