From b911f96a56e4f0612f14fb15c7839b1bbfa17afc Mon Sep 17 00:00:00 2001 From: ocornut Date: Fri, 27 Feb 2015 11:19:50 +0000 Subject: [PATCH] Examples: Speculative Makefile fix. I should get a Linux box instead on relying on Jenkins, this is pretty embarrassing. --- examples/opengl3_example/Makefile | 4 ++-- examples/opengl_example/Makefile | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/examples/opengl3_example/Makefile b/examples/opengl3_example/Makefile index bdd778e4..bb0a1946 100644 --- a/examples/opengl3_example/Makefile +++ b/examples/opengl3_example/Makefile @@ -24,7 +24,7 @@ ifeq ($(UNAME_S), Linux) #LINUX CXXFLAGS = -I../../ -I../opengl_example/gl3w `pkg-config --cflags glfw3` CXXFLAGS += -Wall - CFLAGS = CXXFLAGS + CFLAGS = $(CXXFLAGS) endif ifeq ($(UNAME_S), Darwin) #APPLE @@ -36,7 +36,7 @@ ifeq ($(UNAME_S), Darwin) #APPLE CXXFLAGS = -I../../ -I../opengl_example/gl3w -I/usr/local/Cellar/glew/1.10.0/include -I/usr/local/include CXXFLAGS += -Wall # CXXFLAGS += -D__APPLE__ - CFLAGS = CXXFLAGS + CFLAGS = $(CXXFLAGS) endif .cpp.o: diff --git a/examples/opengl_example/Makefile b/examples/opengl_example/Makefile index 10212d94..2563bdb8 100644 --- a/examples/opengl_example/Makefile +++ b/examples/opengl_example/Makefile @@ -23,7 +23,7 @@ ifeq ($(UNAME_S), Linux) #LINUX CXXFLAGS = -I../../ `pkg-config --cflags glfw3` CXXFLAGS += -Wall - CFLAGS = CXXFLAGS + CFLAGS = $(CXXFLAGS) endif ifeq ($(UNAME_S), Darwin) #APPLE @@ -35,7 +35,7 @@ ifeq ($(UNAME_S), Darwin) #APPLE CXXFLAGS = -I../../ -I/usr/local/include CXXFLAGS += -Wall # CXXFLAGS += -D__APPLE__ - CFLAGS = CXXFLAGS + CFLAGS = $(CXXFLAGS) endif .cpp.o: