"Blank" window

Makefile

@@ -1,36 +1,29 @@
 CXXFLAGS += $(shell sdl2-config --cflags) -std=c++14 -Wall
 CFLAGS += $(shell sdl2-config --cflags)
-CPPFLAGS += -I. -Iimgui -Iimguifs -Iglm -Ipicojson \
+CPPFLAGS += -I. -Iimgui -Iglm \
 	    -DREAL_BUILD -DGLM_ENABLE_EXPERIMENTAL
 LIBS += $(shell sdl2-config --libs) -lGL -lGLEW -ldl
 
-FILEDUMPS = \
-	    fd-raymarcher.glsl.h
+FILEDUMPS =
 
-IMGUI = imgui.o imgui_demo.o imgui_draw.o imguifs.o
-EDITOR = \
-	 editor.o \
+IMGUI = imgui.o imgui_demo.o imgui_draw.o
+DEMO = \
+	 main.o \
 	 imgui_impl_sdl.o \
-	 utilities.o \
-	 project.o \
-	 \
-	 mg-none.o \
-	 mg-fragment.o \
-	 \
-	 gfx-raymarcher.o
+	 utilities.o
 
-EDITOR_DEPS = $(EDITOR:%.o=.%.d)
+DEMO_DEPS = $(DEMO:%.o=.%.d)
 
 
-editor:	$(EDITOR) $(IMGUI)
-	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -o editor \
-		$(EDITOR) $(IMGUI) $(LIBS)
+demo:	$(DEMO) $(IMGUI)
+	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -o demo \
+		$(DEMO) $(IMGUI) $(LIBS)
 
 clean:
-	rm -f $(IMGUI) $(EDITOR) $(FILEDUMPS) editor externals.hh.gch
+	rm -f $(IMGUI) $(DEMO) $(FILEDUMPS) demo externals.hh.gch
 
 fullclean: clean
-	rm -f $(EDITOR_DEPS)
+	rm -f $(DEMO_DEPS)
 
 .PHONY: clean fullclean
 
@@ -48,13 +41,9 @@ imgui_demo.o: imgui/imgui_demo.cpp
 imgui_draw.o: imgui/imgui_draw.cpp
 	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c -o $@ $<
 
-imguifs.o: imguifs/imguifilesystem.cpp imguifs/dirent_portable.h imguifs/imguifilesystem.h
-	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -include /usr/include/stdlib.h -c -o $@ $<
+-include $(DEMO_DEPS)
 
-
--include $(EDITOR_DEPS)
-
-$(EDITOR): %.o: %.cc externals.hh.gch | $(FILEDUMPS)
+$(DEMO): %.o: %.cc externals.hh.gch | $(FILEDUMPS)
 	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c -o $@ $<
 	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -M -MF $(@:%.o=.%.d) -MT $@ $<