Changeset 95c657f in opengl-game


Ignore:
Timestamp:
Dec 5, 2020, 7:31:44 PM (3 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:
1 edited

Legend:

Unmodified
Added
Removed
  • makefile

    re66fd66 r95c657f  
    1717endif
    1818
    19 IMGUI_FILES = IMGUI/imgui_demo.cpp IMGUI/imgui_draw.cpp IMGUI/imgui.cpp
     19IMGUI_FILES = IMGUI/imgui.cpp IMGUI/imgui_demo.cpp IMGUI/imgui_draw.cpp IMGUI/imgui_widgets.cpp
    2020
    2121# If I were generating .o files as well, I should use $? instead of $^
    2222# as this well prevent regenerating .o files for unchanged .cpp files
    2323
    24 openglref: new-game.cpp logger.cpp utils.cpp crash-logger.cpp imgui_impl_glfw_gl3.cpp $(IMGUI_FILES)
    25         $(CC) $^ $(DEP) $(CFLAGS) -o $@
     24openglref: new-game.cpp logger.cpp utils.cpp crash-logger.cpp IMGUI/imgui_impl_glfw.cpp IMGUI/imgui_impl_opengl3.cpp $(IMGUI_FILES)
     25        $(CC) $^ $(DEP) $(CFLAGS) -o $@ -DGLEW_STATIC
    2626
    27 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)
    28         $(CC) $^ $(DEP) $(CFLAGS) -o $@ -DGLEW_STATIC
     27openglgame: 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)
     28        $(CC) $^ $(DEP) $(CFLAGS) -o $@ -DGLEW_STATIC
    2929
    3030CXX_FLAGS = -std=c++17 -Wall -pedantic# -O3 -rdynamic
Note: See TracChangeset for help on using the changeset viewer.