Browse Source

Examples: Makefile fixes.

ocornut 10 years ago
parent
commit
3f86554457
1 changed files with 3 additions and 4 deletions
  1. 3 4
      examples/opengl3_example/Makefile

+ 3 - 4
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)