Examples: Speculative fix for OSX Makefile to make Travis happy (re #812

)
ocornut · Dec 21, 2016 · 1396659 · 1396659
1 parent 081aec4
commit 1396659
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git 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
@@ -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