From 71e20680dbe7686c9bb306399c50d73def316c1f Mon Sep 17 00:00:00 2001 From: ocornut Date: Sun, 7 Dec 2014 09:48:01 +0000 Subject: [PATCH] Setup Travis CI integration with Clang + -Wall in Makefiles --- .travis.yml | 1 + examples/opengl_example/Makefile | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index eea77555..cb1aba20 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,6 +5,7 @@ os: compiler: - gcc + - clang before_install: - if [ $TRAVIS_OS_NAME == linux ]; then sudo add-apt-repository -y ppa:pyglfw/pyglfw && sudo apt-get update -qq && sudo apt-get install -y --no-install-recommends libglfw3-dev libglew-dev libxrandr-dev libxi-dev libxxf86vm-dev; fi diff --git a/examples/opengl_example/Makefile b/examples/opengl_example/Makefile index 027fc151..df0e4ece 100644 --- a/examples/opengl_example/Makefile +++ b/examples/opengl_example/Makefile @@ -11,7 +11,7 @@ # http://www.glfw.org # -CXX = g++ +#CXX = g++ OBJS = main.o OBJS += ../../imgui.o @@ -22,6 +22,7 @@ UNAME_S := $(shell uname -s) ifeq ($(UNAME_S), Linux) #LINUX ECHO_MESSAGE = "Linux" CXXFLAGS = -I../../ `pkg-config --cflags glfw3` + CXXFLAGS += -Wall LIBS = `pkg-config --static --libs glfw3` -lGLEW endif @@ -32,11 +33,10 @@ ifeq ($(UNAME_S), Darwin) #APPLE LIBS += -L/usr/local/Cellar/glew/1.10.0/lib -L/usr/local/lib LIBS += -lglew -lglfw3 - CXXFLAGS = -I/usr/local/Cellar/glew/1.10.0/include -I/usr/local/include - CXXFLAGS += -I../../ + CXXFLAGS = -I../../ -I/usr/local/Cellar/glew/1.10.0/include -I/usr/local/include + CXXFLAGS += -Wall # CXXFLAGS += -D__APPLE__ - endif .cpp.o: