From 1225e1b8a71a025be9b5f453d135b59604bd30f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emmanuel=20Beno=C3=AEt?= <tseeker@nocternity.net>
Date: Wed, 22 Nov 2017 08:59:06 +0100
Subject: [PATCH] Build - Moved all 3rd party stuff to a subdirectory

---
 .gitmodules                                      | 10 +++++-----
 .vim.local/ycm_extra_conf.py                     |  8 ++++----
 ebcl => 3rdparty/ebcl                            |  0
 font-awesome => 3rdparty/font-awesome            |  0
 glm => 3rdparty/glm                              |  0
 IconFontCppHeaders => 3rdparty/icon-font-headers |  0
 imgui => 3rdparty/imgui                          |  0
 Makefile                                         | 14 ++++++++------
 ebcl-config                                      |  2 +-
 9 files changed, 18 insertions(+), 16 deletions(-)
 rename ebcl => 3rdparty/ebcl (100%)
 rename font-awesome => 3rdparty/font-awesome (100%)
 rename glm => 3rdparty/glm (100%)
 rename IconFontCppHeaders => 3rdparty/icon-font-headers (100%)
 rename imgui => 3rdparty/imgui (100%)

diff --git a/.gitmodules b/.gitmodules
index 2ba0046..1e6274b 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,15 +1,15 @@
 [submodule "imgui"]
-	path = imgui
+	path = 3rdparty/imgui
 	url = https://github.com/ocornut/imgui.git
 [submodule "glm"]
-	path = glm
+	path = 3rdparty/glm
 	url = https://github.com/g-truc/glm.git
 [submodule "ebcl"]
-	path = ebcl
+	path = 3rdparty/ebcl
 	url = ssh://git@git.nocternity.net:44/u/tseeker/libs/corelib
 [submodule "font-awesome"]
-	path = font-awesome
+	path = 3rdparty/font-awesome
 	url = https://github.com/FortAwesome/Font-Awesome.git
 [submodule "IconFontCppHeaders"]
-	path = IconFontCppHeaders
+	path = 3rdparty/icon-font-headers
 	url = https://github.com/juliettef/IconFontCppHeaders.git
diff --git a/.vim.local/ycm_extra_conf.py b/.vim.local/ycm_extra_conf.py
index ed26144..06f5a83 100644
--- a/.vim.local/ycm_extra_conf.py
+++ b/.vim.local/ycm_extra_conf.py
@@ -46,10 +46,10 @@ flags = [
     'c++',
     '-I','.',
     '-I','build',
-    '-I','IconFontCppHeaders',
-    '-I','imgui',
-    '-I','glm',
-    '-I','ebcl/include',
+    '-I','3rdparty/icon-font-headers',
+    '-I','3rdparty/imgui',
+    '-I','3rdparty/glm',
+    '-I','3rdparty/ebcl/include',
     '-I','/usr/include/SDL2' ,
     '-D','GLM_ENABLE_EXPERIMENTAL',
 ]
diff --git a/ebcl b/3rdparty/ebcl
similarity index 100%
rename from ebcl
rename to 3rdparty/ebcl
diff --git a/font-awesome b/3rdparty/font-awesome
similarity index 100%
rename from font-awesome
rename to 3rdparty/font-awesome
diff --git a/glm b/3rdparty/glm
similarity index 100%
rename from glm
rename to 3rdparty/glm
diff --git a/IconFontCppHeaders b/3rdparty/icon-font-headers
similarity index 100%
rename from IconFontCppHeaders
rename to 3rdparty/icon-font-headers
diff --git a/imgui b/3rdparty/imgui
similarity index 100%
rename from imgui
rename to 3rdparty/imgui
diff --git a/Makefile b/Makefile
index 13a3e3b..1d2b9b1 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,9 @@ OUTDIR = build
 CXXFLAGS += $(shell sdl2-config --cflags) -std=c++14 -Wall -g
 CFLAGS += $(shell sdl2-config --cflags)
 CPPFLAGS += -I. -I$(OUTDIR) \
-	    -Iimgui -Iglm -IIconFontCppHeaders -Iebcl/include \
+	    -I3rdparty/imgui -I3rdparty/glm \
+	    -I3rdparty/icon-font-headers \
+	    -I3rdparty/ebcl/include \
 	    -DREAL_BUILD -DGLM_ENABLE_EXPERIMENTAL
 LIBS += $(shell sdl2-config --libs) -lGL -lGLEW -ldl \
 	$(LIBEBCL) -latomic
@@ -99,7 +101,7 @@ outdir:
 
 #-------------------------------------------------------------------------------
 
-$(IMGUI_OBJS): $(OUTDIR)/%.o: imgui/%.cpp | outdir
+$(IMGUI_OBJS): $(OUTDIR)/%.o: 3rdparty/imgui/%.cpp | outdir
 	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c -o $@ $<
 
 #-------------------------------------------------------------------------------
@@ -126,7 +128,7 @@ $(PARSERCHECK_OBJS): $(OUTDIR)/%.o: %.cc $(PCH) | outdir $(FILEDUMPS)
 #-------------------------------------------------------------------------------
 
 $(LIBEBCL):	ebcl-config
-	+make -C ebcl CONFIG=../ebcl-config
+	+make -C 3rdparty/ebcl CONFIG=../../ebcl-config
 
 $(PCH): externals.hh
 	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c -o $@ $<
@@ -135,9 +137,9 @@ $(PCH): externals.hh
 
 $(OUTDIR)/window.o: window.cc $(OUTDIR)/font-awesome.inl
 
-$(OUTDIR)/font-awesome.inl: font-awesome/fonts/fontawesome-webfont.ttf $(OUTDIR)/font-to-c
-	$(OUTDIR)/font-to-c -base85 font-awesome/fonts/fontawesome-webfont.ttf \
+$(OUTDIR)/font-awesome.inl: 3rdparty/font-awesome/fonts/fontawesome-webfont.ttf $(OUTDIR)/font-to-c
+	$(OUTDIR)/font-to-c -base85 3rdparty/font-awesome/fonts/fontawesome-webfont.ttf \
 		FontAwesome_ >$@
 
-$(OUTDIR)/font-to-c: imgui/extra_fonts/binary_to_compressed_c.cpp
+$(OUTDIR)/font-to-c: 3rdparty/imgui/extra_fonts/binary_to_compressed_c.cpp
 	$(CXX) -o $@ $<
diff --git a/ebcl-config b/ebcl-config
index 99fd163..e258018 100644
--- a/ebcl-config
+++ b/ebcl-config
@@ -6,7 +6,7 @@ DEBUG = n
 OPTIMIZE = y
 BUILD_TESTS = n
 
-OUTDIR = ../build/ebcl
+OUTDIR = ../../build/ebcl
 
 export BUILD_STATIC_LIB BUILD_DYNAMIC_LIB DEBUG OPTIMIZE BUILD_TESTS
 export OUTDIR