From 3f86554457befcb7e3f8fee92c168cc5b57b3f97 Mon Sep 17 00:00:00 2001 From: ocornut Date: Mon, 9 Mar 2015 13:22:32 +0000 Subject: [PATCH] Examples: Makefile fixes. --- examples/opengl3_example/Makefile | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/examples/opengl3_example/Makefile b/examples/opengl3_example/Makefile index c67ff83b..208d279f 100644 --- a/examples/opengl3_example/Makefile +++ b/examples/opengl3_example/Makefile @@ -10,9 +10,8 @@ #CXX = g++ -OBJS = main.o imgui_impl_glfw_gl3.o +OBJS = main.o imgui_impl_glfw_gl3.o gl3w/GL/gl3w.o OBJS += ../../imgui.o -OBJS += ../opengl_example/gl3w/GL/gl3w.o UNAME_S := $(shell uname -s) @@ -21,7 +20,7 @@ ifeq ($(UNAME_S), Linux) #LINUX ECHO_MESSAGE = "Linux" LIBS = `pkg-config --static --libs glfw3` - CXXFLAGS = -I../../ -I../opengl_example/gl3w `pkg-config --cflags glfw3` + CXXFLAGS = -I../../ -Igl3w `pkg-config --cflags glfw3` CXXFLAGS += -Wall CFLAGS = $(CXXFLAGS) endif @@ -32,7 +31,7 @@ ifeq ($(UNAME_S), Darwin) #APPLE LIBS += -L/usr/local/lib LIBS += -lglfw3 - CXXFLAGS = -I../../ -I../opengl_example/gl3w -I/usr/local/Cellar/glew/1.10.0/include -I/usr/local/include + CXXFLAGS = -I../../ -Igl3w -I/usr/local/Cellar/glew/1.10.0/include -I/usr/local/include CXXFLAGS += -Wall # CXXFLAGS += -D__APPLE__ CFLAGS = $(CXXFLAGS)