Changeset 1a616e6 in opengl-game for makefile

Timestamp:

May 7, 2018, 5:33:46 PM (6 years ago)

Author:

Dmitry Portnoy <dmitry.portnoy@…>

Branches:

feature/imgui-sdl, master, points-test

Children:

1c81bf0

Parents:

c1ca5b5

Message:

Remove the ImGui example since it has been integrated into the main project, and update the makefile to build the Linux and OSX app with the newly-added ImGui code.

File:

• makefile (modified) (2 diffs)

makefile

@@ -1 +1 @@
 OS = $(shell uname)
 CC = g++
-CFLAGS = -std=c++0x -Wall -pedantic #-Wextra
+CFLAGS = -std=c++0x -Wall -pedantic#-Wextra
 
 ifeq ($(OS),Darwin)
@@ -10 +10 @@
 endif
 
+IMGUI_FILES = IMGUI/imgui_demo.cpp IMGUI/imgui_draw.cpp IMGUI/imgui.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
 
-newgame: new-game.cpp logger.cpp stb_image.cpp
+newgame: new-game.cpp logger.cpp stb_image.cpp imgui_impl_glfw_gl3.cpp $(IMGUI_FILES)
         $(CC) $^ $(DEP) $(CFLAGS) -o $@