Changeset 95c657f in opengl-game

Timestamp:

Dec 5, 2020, 7:31:44 PM (4 years ago)

Author:

Dmitry Portnoy <dportnoy@…>

Branches:

feature/imgui-sdl, master

Children:

670c09a

Parents:

e66fd66

Message:

Update the makefile recipes for openglref and openglgame to work with the new IMGUI version

File:

• makefile (modified) (1 diff)

makefile

@@ -17 +17 @@
 endif
 
-IMGUI_FILES = IMGUI/imgui_demo.cpp IMGUI/imgui_draw.cpp IMGUI/imgui.cpp
+IMGUI_FILES = IMGUI/imgui.cpp IMGUI/imgui_demo.cpp IMGUI/imgui_draw.cpp IMGUI/imgui_widgets.cpp
 
 # If I were generating .o files as well, I should use $? instead of $^
 # as this well prevent regenerating .o files for unchanged .cpp files
 
-openglref: new-game.cpp logger.cpp utils.cpp crash-logger.cpp imgui_impl_glfw_gl3.cpp $(IMGUI_FILES)
-        $(CC) $^ $(DEP) $(CFLAGS) -o $@
+openglref: new-game.cpp logger.cpp utils.cpp crash-logger.cpp IMGUI/imgui_impl_glfw.cpp IMGUI/imgui_impl_opengl3.cpp $(IMGUI_FILES)
+        $(CC) $^ $(DEP) $(CFLAGS) -o $@ -DGLEW_STATIC
 
-openglgame: main-opengl.cpp opengl-game.cpp crash-logger.cpp logger.cpp game-gui-glfw.cpp imgui_impl_glfw_gl3.cpp graphics-pipeline_opengl.cpp $(IMGUI_FILES)
-        $(CC) $^ $(DEP) $(CFLAGS) -o $@ -DGLEW_STATIC
+openglgame: main-opengl.cpp opengl-game.cpp crash-logger.cpp logger.cpp game-gui-glfw.cpp graphics-pipeline_opengl.cpp IMGUI/imgui_impl_glfw.cpp IMGUI/imgui_impl_opengl3.cpp $(IMGUI_FILES)
+        $(CC) $^ $(DEP) $(CFLAGS) -o $@ -DGLEW_STATIC
 
 CXX_FLAGS = -std=c++17 -Wall -pedantic# -O3 -rdynamic