UI - Refactoring progress

(see previous log message)

Makefile

@@ -15,8 +15,6 @@ FILEDUMPS =
 IMGUI = imgui.cpp imgui_draw.cpp
 
 COMMON = \
-	 imgui_impl_sdl.cc \
-	 \
 	 utilities.cc \
 	 texture.cc \
 	 rendertarget.cc \
@@ -24,10 +22,6 @@ COMMON = \
 	 \
 	 filewatcher.cc \
 	 window.cc \
-	 ui-actions.cc \
-	 ui-colorgrading.cc \
-	 ui-dialogs.cc \
-	 ui-utilities.cc \
 	 globals.cc \
 	 profiling.cc \
 	 shaders.cc \
@@ -43,6 +37,12 @@ COMMON = \
 	 opparser.cc \
 	 opcomp.cc \
 	 opmgr.cc \
+	 \
+	 ui-actions.cc \
+	 ui-colorgrading.cc \
+	 ui-dialogs.cc \
+	 ui-imgui-sdl.cc \
+	 ui-utilities.cc \
 # END COMMON
 
 DEMO = \

main.cc

@@ -1,5 +1,5 @@
 #include "externals.hh"
-#include "imgui_impl_sdl.h"
+#include "ui-imgui-sdl.hh"
 #include "demo.hh"
 #include "globals.hh"
 #include "profiling.hh"

ui-imgui-sdl.cc

@@ -7,7 +7,7 @@
 // https://github.com/ocornut/imgui
 
 #include "externals.hh"
-#include "imgui_impl_sdl.h"
+#include "ui-imgui-sdl.hh"
 
 // Data
 static double       g_Time = 0.0f;

ui-imgui-sdl.hh

@@ -6,8 +6,10 @@
 // If you are new to ImGui, see examples/README.txt and documentation at the top of imgui.cpp.
 // https://github.com/ocornut/imgui
 
-struct SDL_Window;
+#pragma once
-typedef union SDL_Event SDL_Event;
+#ifndef REAL_BUILD
+# include "externals.hh"
+#endif
 
 IMGUI_API bool        ImGui_ImplSdl_Init(SDL_Window* window);
 IMGUI_API void        ImGui_ImplSdl_Shutdown();

window.cc

@@ -1,6 +1,7 @@
 #include "externals.hh"
 #include "window.hh"
-#include "imgui_impl_sdl.h"
+#include "ui-imgui-sdl.hh"
+
 #include <imgui_internal.h>