From 41d76ee543d67f603b1d38e47d2fe16dbf6a73cd Mon Sep 17 00:00:00 2001
From: cinnaboot <cinnaboot@protonmail.com>
Date: Sun, 16 Sep 2018 23:12:00 -0400
Subject: [PATCH] update makefile for new imgui version

---
 Makefile  | 18 +++++++++++++-----
 ext/imgui |  2 +-
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index 5d1c3df..44771ae 100644
--- a/Makefile
+++ b/Makefile
@@ -22,13 +22,15 @@ LDFLAGS += $(shell pkg-config --libs SDL2_image)
 
 # IMGUI
 IMGUI_DIR = ext/imgui
-CXXFLAGS += -I$(IMGUI_DIR)\
-			-I$(IMGUI_DIR)/examples/sdl_opengl3_example\
+CXXFLAGS += -I$(IMGUI_DIR) \
+			-I$(IMGUI_DIR)/examples/ \
 			-I$(IMGUI_DIR)/examples/libs/gl3w
 IMGUI_SOURCES = $(IMGUI_DIR)/imgui.cpp \
 		  $(IMGUI_DIR)/imgui_demo.cpp \
 		  $(IMGUI_DIR)/imgui_draw.cpp \
-		  $(IMGUI_DIR)/examples/sdl_opengl3_example/imgui_impl_sdl_gl3.cpp \
+		  $(IMGUI_DIR)/imgui_widgets.cpp \
+		  $(IMGUI_DIR)/examples/imgui_impl_opengl3.cpp \
+		  $(IMGUI_DIR)/examplex/imgui_impl_sdl.cpp \
 
 IMGUI_OBJECTS := $(patsubst %.cpp, $(OBJ_DIR)/%.o, $(notdir $(IMGUI_SOURCES)))
 
@@ -65,8 +67,14 @@ $(OBJ_DIR)/imgui_demo.o:
 $(OBJ_DIR)/imgui_draw.o:
 	$(CXX) -c $(CXXFLAGS) $(IMGUI_DIR)/imgui_draw.cpp -o $@
 
-$(OBJ_DIR)/imgui_impl_sdl_gl3.o:
-	$(CXX) -c $(CXXFLAGS) $(IMGUI_DIR)/examples/sdl_opengl3_example/imgui_impl_sdl_gl3.cpp -o $@
+$(OBJ_DIR)/imgui_widgets.o:
+	$(CXX) -c $(CXXFLAGS) $(IMGUI_DIR)/imgui_widgets.cpp -o $@
+
+$(OBJ_DIR)/imgui_impl_opengl3.o:
+	$(CXX) -c $(CXXFLAGS) $(IMGUI_DIR)/examples/imgui_impl_opengl3.cpp -o $@
+
+$(OBJ_DIR)/imgui_impl_sdl.o:
+	$(CXX) -c $(CXXFLAGS) $(IMGUI_DIR)/examples/imgui_impl_sdl.cpp -o $@
 
 $(OBJ_DIR)/gl3w.o:
 	$(CC) -c $(GL3W_CFLAGS) $(IMGUI_DIR)/examples/libs/gl3w/GL/gl3w.c -o $@
diff --git a/ext/imgui b/ext/imgui
index 062b1f0..e0cab56 160000
--- a/ext/imgui
+++ b/ext/imgui
@@ -1 +1 @@
-Subproject commit 062b1f0463f6689f55e1599f5ea0f16a5edd99a9
+Subproject commit e0cab5664adf02c030f9cf2a05d2c334638a85f8