Got rid of -ICore

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

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!!! */

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);

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;

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

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
 

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"
 

Tester/main.c

@@ -13,9 +13,7 @@
 #define snprintf _snprintf
 #endif
 
-#include "gb.h"
+#include <Core/gb.h>
-#include "debugger.h"
-#include "memory.h"
 
 static bool running = false;
 static char *filename;

libretro/Makefile.common

@@ -1,5 +1,4 @@
-INCFLAGS    := -I$(CORE_DIR) \
+INCFLAGS    := -I$(CORE_DIR)
-               -I$(CORE_DIR)/Core
 
 SOURCES_C   := $(CORE_DIR)/Core/gb.c \
                $(CORE_DIR)/Core/apu.c \

libretro/libretro.c

@@ -14,9 +14,7 @@
 #define snprintf _snprintf
 #endif
 
-#define GB_INTERNAL
+#include <Core/gb.h>
-
-#include "gb.h"
 #include "libretro.h"
 
 #ifdef _WIN32