diff --git a/Makefile b/Makefile index 7e0d5ac..1b64127 100644 --- a/Makefile +++ b/Makefile @@ -35,7 +35,7 @@ TEST_BIN := $(BINDIR)/test_orbit IMGUI_DIR := ext/imgui CXXFLAGS += -I$(IMGUI_DIR) IMGUI_IMPL_DIR := $(IMGUI_DIR)/backends -IMGUI_IMPL_SOURCES := $(IMGUI_IMPL_DIR)/imgui_impl_opengl3.cpp $(IMGUI_IMPL_DIR)/imgui_impl_sdl.cpp +IMGUI_IMPL_SOURCES := $(IMGUI_IMPL_DIR)/imgui_impl_opengl3.cpp $(IMGUI_IMPL_DIR)/imgui_impl_sdl2.cpp IMGUI_SOURCES := $(filter-out $(IMGUI_DIR)/imgui_demo.cpp, $(wildcard $(IMGUI_DIR)/*.cpp)) IMGUI_OBJECTS := $(patsubst $(IMGUI_DIR)/%.cpp, $(OBJDIR)/%.o, $(IMGUI_SOURCES)) IMGUI_IMP_OBJECTS += $(patsubst $(IMGUI_IMPL_DIR)/%.cpp, $(OBJDIR)/%.o, $(IMGUI_IMPL_SOURCES)) @@ -45,9 +45,9 @@ OBJECTS := $(patsubst $(SRCDIR)/%.cpp, $(OBJDIR)/%.o, $(SOURCES)) BIN := $(BINDIR)/orbital_shipping -all: mkdirs $(BIN) tests tags +all: mkdirs $(BIN) tags @# automatically run tests when (re-)compiling - @${TEST_BIN} + @#${TEST_BIN} .PHONY: all tests: $(TEST_BIN) diff --git a/ext/imgui b/ext/imgui index c71a50d..97428e8 160000 --- a/ext/imgui +++ b/ext/imgui @@ -1 +1 @@ -Subproject commit c71a50deb5ddf1ea386b91e60fa2e4a26d080074 +Subproject commit 97428e8ac99e339ce05eee531cf55b77b29ea709 diff --git a/src/gooey.cpp b/src/gooey.cpp index 5126d25..901af82 100644 --- a/src/gooey.cpp +++ b/src/gooey.cpp @@ -3,7 +3,7 @@ #include #include -#include +#include using namespace ImGui; #include "gooey.h" @@ -66,7 +66,7 @@ void gooDraw(SDL_Window* window, GameState* gs, RenderState* rs) { ImGui_ImplOpenGL3_NewFrame(); - ImGui_ImplSDL2_NewFrame(window); + ImGui_ImplSDL2_NewFrame(); NewFrame(); int x = 0, y = 0;