From 1396659b7282c11edbe126bf36202c18661fd399 Mon Sep 17 00:00:00 2001 From: ocornut Date: Wed, 21 Dec 2016 20:12:43 +0100 Subject: [PATCH] Examples: Speculative fix for OSX Makefile to make Travis happy (re #812) --- examples/opengl2_example/Makefile | 4 ++-- examples/opengl3_example/Makefile | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/examples/opengl2_example/Makefile b/examples/opengl2_example/Makefile index bd79d1ba..631abe4b 100644 --- a/examples/opengl2_example/Makefile +++ b/examples/opengl2_example/Makefile @@ -29,11 +29,11 @@ endif ifeq ($(UNAME_S), Darwin) #APPLE ECHO_MESSAGE = "Mac OS X" LIBS = -framework OpenGL -framework Cocoa -framework IOKit -framework CoreVideo - LIBS += -L/usr/local/lib -lglfw3 + #LIBS += -L/usr/local/lib -lglfw3 + LIBS += -L/usr/local/lib -lglfw CXXFLAGS = -I../../ -I/usr/local/include CXXFLAGS += -Wall -Wformat -# CXXFLAGS += -D__APPLE__ CFLAGS = $(CXXFLAGS) endif diff --git a/examples/opengl3_example/Makefile b/examples/opengl3_example/Makefile index c824f99a..5d91708a 100644 --- a/examples/opengl3_example/Makefile +++ b/examples/opengl3_example/Makefile @@ -31,12 +31,11 @@ endif ifeq ($(UNAME_S), Darwin) #APPLE ECHO_MESSAGE = "Mac OS X" LIBS = -framework OpenGL -framework Cocoa -framework IOKit -framework CoreVideo - LIBS += -L/usr/local/lib -lglfw3 - #LIBS += -L/usr/local/lib -lglfw + #LIBS += -L/usr/local/lib -lglfw3 + LIBS += -L/usr/local/lib -lglfw CXXFLAGS = -I../../ -I../libs/gl3w -I/usr/local/include CXXFLAGS += -Wall -Wformat -# CXXFLAGS += -D__APPLE__ CFLAGS = $(CXXFLAGS) endif