From 1dcb065121a9311b7dcfbbd55e6237c5ed2baf6d Mon Sep 17 00:00:00 2001
From: Sam Hocevar <sam@hocevar.net>
Date: Tue, 6 Sep 2016 12:32:48 +0200
Subject: [PATCH] build: make imgui a submodule instead of copying it

---
 .gitmodules                    | 3 +++
 build/autotools/m4/lol-conf.m4 | 2 +-
 build/lol-build                | 2 +-
 build/msbuild/lol.vars.props   | 2 +-
 external                       | 2 +-
 src/3rdparty/imgui             | 1 +
 6 files changed, 8 insertions(+), 4 deletions(-)
 create mode 160000 src/3rdparty/imgui

diff --git a/.gitmodules b/.gitmodules
index 5d5acff8..740fbdcb 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,6 @@
 [submodule "external"]
 	path = external
 	url = ../../lolengine/lol-external.git
+[submodule "src/3rdparty/imgui"]
+	path = src/3rdparty/imgui
+	url = ../../lolengine/imgui.git
diff --git a/build/autotools/m4/lol-conf.m4 b/build/autotools/m4/lol-conf.m4
index 0db0e89b..ba09e518 100644
--- a/build/autotools/m4/lol-conf.m4
+++ b/build/autotools/m4/lol-conf.m4
@@ -86,7 +86,7 @@ fi
 
 dnl  Use Imgui? Yes, always
 if true; then
-  LOL_CFLAGS="$LOL_CFLAGS -I\$(lol_srcdir)/external/imgui"
+  LOL_CFLAGS="$LOL_CFLAGS -I\$(lol_srcdir)/src/3rdparty/imgui"
 fi
 
 
diff --git a/build/lol-build b/build/lol-build
index b5f2b5e2..79183db1 100755
--- a/build/lol-build
+++ b/build/lol-build
@@ -263,7 +263,7 @@ configure()
             CPPFLAGS="$CPPFLAGS -I$PWD/external/gtk-2.22.1/include/gdk-pixbuf-2.0"
             CPPFLAGS="$CPPFLAGS -I$PWD/external/gtk-2.22.1/include/atk-1.0"
             CPPFLAGS="$CPPFLAGS -I$PWD/external/gtkglarea-2.0.1/include"
-            CPPFLAGS="$CPPFLAGS -I$PWD/external/imgui/include"
+            CPPFLAGS="$CPPFLAGS -I$PWD/src/3rdparty/imgui/include"
             CPPFLAGS="$CPPFLAGS -mms-bitfields"
             LDFLAGS="$LDFLAGS -static-libgcc -static-libstdc++"
             GTK_LIBS="$GTK_LIBS -lgtkgl-2.0 -lopengl32 -lglew32 -lgdi32"
diff --git a/build/msbuild/lol.vars.props b/build/msbuild/lol.vars.props
index 8ab55942..1f6cd103 100644
--- a/build/msbuild/lol.vars.props
+++ b/build/msbuild/lol.vars.props
@@ -9,7 +9,7 @@
     <PegtlIncludes>$(PegtlDir)\include</PegtlIncludes>
 
     <!-- imgui -->
-    <ImguiDir>$(ExternalDir)\imgui</ImguiDir>
+    <ImguiDir>$(LolDir)\src\3rdparty\imgui</ImguiDir>
     <ImguiIncludes>$(ImguiDir)</ImguiIncludes>
 
     <!-- libgcc (from mingw-w64) -->
diff --git a/external b/external
index 88ebbc99..406ad093 160000
--- a/external
+++ b/external
@@ -1 +1 @@
-Subproject commit 88ebbc99e2ed7e9f93b8e336dce7b1e08a776551
+Subproject commit 406ad09301126c1d80c08179973589fe8930162c
diff --git a/src/3rdparty/imgui b/src/3rdparty/imgui
new file mode 160000
index 00000000..0123fc8c
--- /dev/null
+++ b/src/3rdparty/imgui
@@ -0,0 +1 @@
+Subproject commit 0123fc8c0f3f9b9d55b31d7403dea32d568032fe