소스 검색

Setup Travis CI integration with Clang + -Wall in Makefiles

ocornut 10 년 전
부모
커밋
71e20680db
2개의 변경된 파일5개의 추가작업 그리고 4개의 파일을 삭제
  1. 1 0
      .travis.yml
  2. 4 4
      examples/opengl_example/Makefile

+ 1 - 0
.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

+ 4 - 4
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: