From d0b20316de2c972c0a0f7b798928df9b325e8eb1 Mon Sep 17 00:00:00 2001
From: Clownacy <Clownacy@users.noreply.github.com>
Date: Tue, 31 Mar 2020 14:26:24 +0100
Subject: [PATCH] Don't do -Iexternal

It pollutes the #include space.
---
 CMakeLists.txt                        | 4 ----
 Makefile                              | 6 ++----
 external/glad/src/glad.c              | 2 +-
 src/Backends/Audio/miniaudio.cpp      | 2 +-
 src/Backends/Rendering/OpenGL3.cpp    | 4 ++--
 src/Backends/Rendering/SDLTexture.cpp | 2 +-
 src/Bitmap.cpp                        | 2 +-
 7 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2ced95c2..dbeb2665 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -354,9 +354,6 @@ set_target_properties(CSE2 PROPERTIES
 	CXX_EXTENSIONS OFF
 )
 
-# Include directory for third-party software
-target_include_directories(CSE2 PRIVATE "external")
-
 # Name debug builds "CSE2_debug", to distinguish them
 set_target_properties(CSE2 PROPERTIES DEBUG_OUTPUT_NAME "CSE2_debug")
 
@@ -425,7 +422,6 @@ endif()
 
 if(BACKEND_RENDERER MATCHES "OpenGL3")
 	target_sources(CSE2 PRIVATE "external/glad/src/glad.c" "external/glad/include/glad/glad.h" "external/glad/include/KHR/khrplatform.h")
-	target_include_directories(CSE2 PRIVATE "external/glad/include")
 
 	find_package(OpenGL REQUIRED)
 	target_link_libraries(CSE2 PRIVATE OpenGL::GL ${CMAKE_DL_LIBS})
diff --git a/Makefile b/Makefile
index 30aa0315..83889cf2 100644
--- a/Makefile
+++ b/Makefile
@@ -51,10 +51,10 @@ ifeq ($(DEBUG_SAVE), 1)
 endif
 
 ALL_CFLAGS += -std=c99 -MMD -MP -MF $@.d
-CSE2_CFLAGS += $(shell $(PKGCONFIG) sdl2 --cflags) $(shell $(PKGCONFIG) freetype2 --cflags) -Iexternal
+CSE2_CFLAGS += $(shell $(PKGCONFIG) sdl2 --cflags) $(shell $(PKGCONFIG) freetype2 --cflags)
 
 ALL_CXXFLAGS += -std=c++98 -MMD -MP -MF $@.d
-CSE2_CXXFLAGS += $(shell $(PKGCONFIG) sdl2 --cflags) $(shell $(PKGCONFIG) freetype2 --cflags) -Iexternal
+CSE2_CXXFLAGS += $(shell $(PKGCONFIG) sdl2 --cflags) $(shell $(PKGCONFIG) freetype2 --cflags)
 
 ifeq ($(STATIC), 1)
   ALL_LDFLAGS += -static
@@ -216,8 +216,6 @@ endif
 
 ifeq ($(BACKEND_RENDERER), OpenGL3)
   SOURCES += src/Backends/Rendering/OpenGL3.cpp external/glad/src/glad.c
-  CSE2_CFLAGS += -Iexternal/glad/include
-  CSE2_CXXFLAGS += -Iexternal/glad/include
 
   ifeq ($(WINDOWS), 1)
     CSE2_LIBS += -lopengl32
diff --git a/external/glad/src/glad.c b/external/glad/src/glad.c
index 6e1f11d9..dfeaf6fc 100644
--- a/external/glad/src/glad.c
+++ b/external/glad/src/glad.c
@@ -22,7 +22,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <glad/glad.h>
+#include "../include/glad/glad.h"
 
 static void* get_proc(const char *namez);
 
diff --git a/src/Backends/Audio/miniaudio.cpp b/src/Backends/Audio/miniaudio.cpp
index 7b374819..84849a32 100644
--- a/src/Backends/Audio/miniaudio.cpp
+++ b/src/Backends/Audio/miniaudio.cpp
@@ -3,7 +3,7 @@
 #define MINIAUDIO_IMPLEMENTATION
 #define MA_NO_DECODING
 #define MA_API static
-#include "miniaudio.h"
+#include "../../../external/miniaudio.h"
 
 #include "../../Organya.h"
 #include "../../WindowsWrapper.h"
diff --git a/src/Backends/Rendering/OpenGL3.cpp b/src/Backends/Rendering/OpenGL3.cpp
index b4c1611b..53d07fa8 100644
--- a/src/Backends/Rendering/OpenGL3.cpp
+++ b/src/Backends/Rendering/OpenGL3.cpp
@@ -10,13 +10,13 @@
 #ifdef USE_OPENGLES2
 #include <GLES2/gl2.h>
 #else
-#include <glad/glad.h>
+#include "../../../external/glad/include/glad/glad.h"
 #endif
 
 #include "SDL.h"
 
 #define SPRITEBATCH_IMPLEMENTATION
-#include "cute_spritebatch.h"
+#include "../../../external/cute_spritebatch.h"
 
 #include "../../WindowsWrapper.h"
 
diff --git a/src/Backends/Rendering/SDLTexture.cpp b/src/Backends/Rendering/SDLTexture.cpp
index 5d3ab84b..add26dc6 100644
--- a/src/Backends/Rendering/SDLTexture.cpp
+++ b/src/Backends/Rendering/SDLTexture.cpp
@@ -7,7 +7,7 @@
 #include "SDL.h"
 
 #define SPRITEBATCH_IMPLEMENTATION
-#include "cute_spritebatch.h"
+#include "../../../external/cute_spritebatch.h"
 
 #include "../../WindowsWrapper.h"
 
diff --git a/src/Bitmap.cpp b/src/Bitmap.cpp
index ec5609b5..f38ded4c 100644
--- a/src/Bitmap.cpp
+++ b/src/Bitmap.cpp
@@ -6,7 +6,7 @@
 #define STB_IMAGE_STATIC
 #define STBI_ONLY_BMP
 #define STBI_NO_LINEAR
-#include "stb_image.h"
+#include "../external/stb_image.h"
 
 unsigned char* DecodeBitmap(const unsigned char *in_buffer, size_t in_buffer_size, unsigned int *width, unsigned int *height)
 {