From bbd3b7e5507477dca6105bf5f0960a46088889fe Mon Sep 17 00:00:00 2001
From: Lior Halphon <LIJI32@gmail.com>
Date: Fri, 13 Oct 2017 00:02:02 +0300
Subject: [PATCH] Got rid of -ICore

---
 Cocoa/AppDelegate.m           | 2 +-
 Cocoa/Document.m              | 2 +-
 Cocoa/GBAudioClient.h         | 2 +-
 Cocoa/GBView.h                | 2 +-
 Makefile                      | 2 +-
 QuickLook/get_image_for_rom.c | 2 +-
 SDL/main.c                    | 2 +-
 Tester/main.c                 | 4 +---
 libretro/Makefile.common      | 3 +--
 libretro/libretro.c           | 4 +---
 10 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/Cocoa/AppDelegate.m b/Cocoa/AppDelegate.m
index cda30bc..dce9a70 100644
--- a/Cocoa/AppDelegate.m
+++ b/Cocoa/AppDelegate.m
@@ -1,6 +1,6 @@
 #import "AppDelegate.h"
 #include "GBButtons.h"
-#include "gb.h"
+#include <Core/gb.h>
 #import <Carbon/Carbon.h>
 
 @implementation AppDelegate
diff --git a/Cocoa/Document.m b/Cocoa/Document.m
index bc3acc5..89e3145 100644
--- a/Cocoa/Document.m
+++ b/Cocoa/Document.m
@@ -1,12 +1,12 @@
 #include <AVFoundation/AVFoundation.h>
 #include <CoreAudio/CoreAudio.h>
+#include <Core/gb.h>
 #include "GBAudioClient.h"
 #include "Document.h"
 #include "AppDelegate.h"
 #include "HexFiend/HexFiend.h"
 #include "GBMemoryByteArray.h"
 #include "GBWarningPopover.h"
-#include "gb.h"
 
 /* Todo: The general Objective-C coding style conflicts with SameBoy's. This file needs a cleanup. */
 /* Todo: Split into category files! This is so messy!!! */
diff --git a/Cocoa/GBAudioClient.h b/Cocoa/GBAudioClient.h
index 19b0b84..aa7be8c 100644
--- a/Cocoa/GBAudioClient.h
+++ b/Cocoa/GBAudioClient.h
@@ -1,5 +1,5 @@
 #import <Foundation/Foundation.h>
-#import "apu.h"
+#import <Core/gb.h>
 
 @interface GBAudioClient : NSObject
 @property (strong) void (^renderBlock)(UInt32 sampleRate, UInt32 nFrames, GB_sample_t *buffer);
diff --git a/Cocoa/GBView.h b/Cocoa/GBView.h
index f8763ac..a1d4f55 100644
--- a/Cocoa/GBView.h
+++ b/Cocoa/GBView.h
@@ -1,6 +1,6 @@
 #import <Cocoa/Cocoa.h>
+#include <Core/gb.h>
 #import "GBShader.h"
-#include "gb.h"
 
 @interface GBView : NSOpenGLView
 - (void) flip;
diff --git a/Makefile b/Makefile
index d280297..3d0a9c6 100755
--- a/Makefile
+++ b/Makefile
@@ -42,7 +42,7 @@ endif
 
 # Set compilation and linkage flags based on target, platform and configuration
 
-CFLAGS += -Werror -Wall -std=gnu11 -ICore -D_GNU_SOURCE -DVERSION="$(VERSION)" -I. -D_USE_MATH_DEFINES
+CFLAGS += -Werror -Wall -std=gnu11 -D_GNU_SOURCE -DVERSION="$(VERSION)" -I. -D_USE_MATH_DEFINES
 SDL_LDFLAGS := -lSDL2
 ifeq ($(PLATFORM),windows32)
 CFLAGS += -IWindows
diff --git a/QuickLook/get_image_for_rom.c b/QuickLook/get_image_for_rom.c
index 3dfbe9b..25f8e2b 100755
--- a/QuickLook/get_image_for_rom.c
+++ b/QuickLook/get_image_for_rom.c
@@ -2,9 +2,9 @@
 #include <stdbool.h>
 #include <unistd.h>
 #include <assert.h>
+#include <Core/gb.h>
 
 #include "get_image_for_rom.h"
-#include "gb.h"
 
 #define LENGTH 60 * 10
 
diff --git a/SDL/main.c b/SDL/main.c
index e1fd764..5bad3c1 100755
--- a/SDL/main.c
+++ b/SDL/main.c
@@ -1,7 +1,7 @@
 #include <stdbool.h>
 #include <signal.h>
 #include <SDL2/SDL.h>
-#include "gb.h"
+#include <Core/gb.h>
 
 #include "utils.h"
 
diff --git a/Tester/main.c b/Tester/main.c
index c718140..8c33e04 100755
--- a/Tester/main.c
+++ b/Tester/main.c
@@ -13,9 +13,7 @@
 #define snprintf _snprintf
 #endif
 
-#include "gb.h"
-#include "debugger.h"
-#include "memory.h"
+#include <Core/gb.h>
 
 static bool running = false;
 static char *filename;
diff --git a/libretro/Makefile.common b/libretro/Makefile.common
index 2049800..4ba7482 100644
--- a/libretro/Makefile.common
+++ b/libretro/Makefile.common
@@ -1,5 +1,4 @@
-INCFLAGS    := -I$(CORE_DIR) \
-               -I$(CORE_DIR)/Core
+INCFLAGS    := -I$(CORE_DIR)
 
 SOURCES_C   := $(CORE_DIR)/Core/gb.c \
                $(CORE_DIR)/Core/apu.c \
diff --git a/libretro/libretro.c b/libretro/libretro.c
index a084502..4e52d6c 100644
--- a/libretro/libretro.c
+++ b/libretro/libretro.c
@@ -14,9 +14,7 @@
 #define snprintf _snprintf
 #endif
 
-#define GB_INTERNAL
-
-#include "gb.h"
+#include <Core/gb.h>
 #include "libretro.h"
 
 #ifdef _WIN32