[GTK3] Move GTK widgets into gtk3/widgets

Makefile

@@ -54,7 +54,7 @@ endif
 # Use clang if it's available.
 ifeq ($(origin CC),default)
 ifneq (, $(shell which clang))
-CC := clang 
+CC := clang
 endif
 endif
 
@@ -226,7 +226,7 @@ all: cocoa sdl tester libretro
 
 CORE_SOURCES := $(shell ls Core/*.c)
 SDL_SOURCES := $(shell ls SDL/*.c) $(OPEN_DIALOG) SDL/audio/$(SDL_AUDIO_DRIVER).c
-GTK3_SOURCES := $(shell ls gtk3/*.c) gtk3/sameboy-gtk3-resources.c SDL/audio/$(SDL_AUDIO_DRIVER).c
+GTK3_SOURCES := $(shell ls gtk3/*.c gtk3/**/*.c) gtk3/sameboy-gtk3-resources.c SDL/audio/$(SDL_AUDIO_DRIVER).c
 TESTER_SOURCES := $(shell ls Tester/*.c)
 
 ifeq ($(PLATFORM),Darwin)

gtk3/main.c

@@ -12,11 +12,11 @@
 #include "config.h"
 #include "util.h"
 
-#include "main_window.h"
-#include "console_window.h"
-#include "preferences_window.h"
-#include "vram_viewer_window.h"
-#include "printer_window.h"
+#include "widgets/console_window.h"
+#include "widgets/main_window.h"
+#include "widgets/preferences_window.h"
+#include "widgets/printer_window.h"
+#include "widgets/vram_viewer_window.h"
 
 // used for audio and game controllers
 #include "SDL.h"

gtk3/types.h

@@ -2,11 +2,11 @@
 #define types_h
 
 #include "SDL.h"
-#include "main_window.h"
-#include "console_window.h"
-#include "preferences_window.h"
-#include "vram_viewer_window.h"
-#include "printer_window.h"
+#include "widgets/console_window.h"
+#include "widgets/main_window.h"
+#include "widgets/preferences_window.h"
+#include "widgets/printer_window.h"
+#include "widgets/vram_viewer_window.h"
 
 typedef struct{
 	int16_t x, y;

gtk3/widgets/console_window.c

@@ -1,6 +1,5 @@
 #include "console_window.h"
-#include "util.h"
-#include <stdbool.h>
+#include "../util.h"
 
 struct Selection {
 	gint start;

gtk3/widgets/console_window.h

@@ -3,6 +3,7 @@
 
 #include <gtk/gtk.h>
 #include <Core/gb.h>
+#include <stdbool.h>
 
 #define CONSOLE_WINDOW_TYPE (console_window_get_type())
 G_DECLARE_FINAL_TYPE(ConsoleWindow, console_window, SAMEBOY, CONSOLE_WINDOW, GtkWindow)

gtk3/widgets/gb_screen.c

@@ -1,7 +1,6 @@
 #include "gb_screen.h"
-#include "config.h"
-#include "util.h"
-#include <stdint.h>
+#include "../config.h"
+#include "../util.h"
 
 struct _GbScreen {
 	GtkBin parent;

gtk3/widgets/gb_screen.h

@@ -5,7 +5,7 @@
 #include <stdbool.h>
 #include <gtk/gtk.h>
 #include <Core/gb.h>
-#include "shader.h"
+#include "../shader.h"
 
 #define GB_SCREEN_TYPE (gb_screen_get_type())
 G_DECLARE_FINAL_TYPE(GbScreen, gb_screen, SAMEBOY, GB_SCREEN, GtkBin)

gtk3/widgets/main_menu.c

@@ -1,8 +1,7 @@
 #include "main_menu.h"
 #include <stdbool.h>
-#include "util.h"
 #include "gb_screen.h"
-#include "check_menu_radio_group.h"
+#include "../check_menu_radio_group.h"
 
 struct _MainMenu {
 	GtkMenuBar parent_instance;

gtk3/widgets/main_menu.h

@@ -3,7 +3,6 @@
 
 #include <gtk/gtk.h>
 #include <Core/gb.h>
-#include "shader.h"
 
 #define MAIN_MENU_TYPE (main_menu_get_type())
 G_DECLARE_FINAL_TYPE(MainMenu, main_menu, SAMEBOY, MAIN_MENU, GtkMenuBar)

gtk3/widgets/main_window.c

@@ -1,9 +1,6 @@
 #include "main_window.h"
-#include <stdbool.h>
-#include "util.h"
 #include "gb_screen.h"
 #include "main_menu.h"
-#include "check_menu_radio_group.h"
 
 struct _MainWindow {
 	GtkApplicationWindowClass parent_class;

gtk3/widgets/main_window.h

@@ -1,9 +1,10 @@
 #ifndef main_window_h
 #define main_window_h
 
+#include <stdbool.h>
 #include <gtk/gtk.h>
 #include <Core/gb.h>
-#include "shader.h"
+#include "../shader.h"
 
 #define MAIN_WINDOW_TYPE (main_window_get_type())
 G_DECLARE_FINAL_TYPE(MainWindow, main_window, SAMEBOY, MAIN_WINDOW, GtkApplicationWindow)

gtk3/widgets/preferences_window.c

@@ -1,6 +1,6 @@
 #include "preferences_window.h"
-#include "config.h"
-#include "util.h"
+#include "../config.h"
+#include "../util.h"
 
 struct _PreferencesWindow {
 	GtkWindowClass parent_class;

gtk3/widgets/printer_window.c

@@ -1,6 +1,6 @@
 #include "printer_window.h"
 #include <stdbool.h>
-#include "util.h"
+#include "../util.h"
 
 struct _PrinterWindow {
 	GtkWindowClass parent_class;

gtk3/widgets/printer_window.h

@@ -3,7 +3,6 @@
 
 #include <gtk/gtk.h>
 #include <Core/gb.h>
-#include <stdint.h>
 
 struct PrinterData {
 	uint32_t *image;

gtk3/widgets/vram_viewer_window.c

@@ -1,6 +1,7 @@
 #include "vram_viewer_window.h"
 #include <stdbool.h>
-#include "util.h"
+#include "../types.h"
+#include "../util.h"
 
 #define tileset_buffer_length 256 * 192 * 4
 #define tilemap_buffer_length 256 * 256 * 4

gtk3/widgets/vram_viewer_window.h

@@ -3,7 +3,6 @@
 
 #include <gtk/gtk.h>
 #include <Core/gb.h>
-#include <stdint.h>
 
 #define VRAM_VIEWER_WINDOW_TYPE (vram_viewer_window_get_type())
 G_DECLARE_FINAL_TYPE(VramViewerWindow, vram_viewer_window, SAMEBOY, VRAM_VIEWER_WINDOW, GtkWindow)