From b17ec490ef7011f29aabd0569031400e822f676c Mon Sep 17 00:00:00 2001 From: Martin Gerhardy Date: Sun, 31 Dec 2017 17:12:41 +0100 Subject: [PATCH] TRAVIS: include demo windows and activate warnings --- .travis.yml | 3 ++- demo/allegro5/Makefile | 2 +- demo/glfw_opengl2/Makefile | 2 +- demo/glfw_opengl3/Makefile | 2 +- demo/sdl_opengl2/Makefile | 2 +- demo/sdl_opengl3/Makefile | 2 +- demo/sdl_opengles2/Makefile | 2 +- demo/sfml_opengl2/Makefile | 2 +- demo/sfml_opengl3/Makefile | 2 +- demo/x11/Makefile | 2 +- demo/x11_opengl2/Makefile | 2 +- demo/x11_opengl3/Makefile | 2 +- demo/x11_rawfb/Makefile | 2 +- example/Makefile | 2 +- 14 files changed, 15 insertions(+), 14 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6d13e55..80a5ad5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,5 +11,6 @@ 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 libglfw3-dev libglew-dev; fi script: - - make -C demo/glfw_opengl3 + - make -C demo/glfw_opengl3 CFLAGS="-Wall -DINCLUDE_ALL" - make -C demo/glfw_opengl2 + - make -C example diff --git a/demo/allegro5/Makefile b/demo/allegro5/Makefile index 8e9e7d4..090a126 100644 --- a/demo/allegro5/Makefile +++ b/demo/allegro5/Makefile @@ -2,7 +2,7 @@ BIN = demo # Flags -CFLAGS = -std=c99 -pedantic -O2 +CFLAGS += -std=c99 -pedantic -O2 SRC = main.c OBJ = $(SRC:.c=.o) diff --git a/demo/glfw_opengl2/Makefile b/demo/glfw_opengl2/Makefile index 62a8952..c08d65f 100644 --- a/demo/glfw_opengl2/Makefile +++ b/demo/glfw_opengl2/Makefile @@ -2,7 +2,7 @@ BIN = demo # Flags -CFLAGS = -std=c99 -pedantic -O2 +CFLAGS += -std=c99 -pedantic -O2 SRC = main.c OBJ = $(SRC:.c=.o) diff --git a/demo/glfw_opengl3/Makefile b/demo/glfw_opengl3/Makefile index d7e68fa..da95261 100644 --- a/demo/glfw_opengl3/Makefile +++ b/demo/glfw_opengl3/Makefile @@ -2,7 +2,7 @@ BIN = demo # Flags -CFLAGS = -std=c99 -pedantic -O2 +CFLAGS += -std=c99 -pedantic -O2 SRC = main.c OBJ = $(SRC:.c=.o) diff --git a/demo/sdl_opengl2/Makefile b/demo/sdl_opengl2/Makefile index 2c85a6e..b73174a 100644 --- a/demo/sdl_opengl2/Makefile +++ b/demo/sdl_opengl2/Makefile @@ -2,7 +2,7 @@ BIN = demo # Flags -CFLAGS = -std=c99 -pedantic -O2 +CFLAGS += -std=c99 -pedantic -O2 SRC = main.c OBJ = $(SRC:.c=.o) diff --git a/demo/sdl_opengl3/Makefile b/demo/sdl_opengl3/Makefile index 4b8ccf4..c6fcb45 100644 --- a/demo/sdl_opengl3/Makefile +++ b/demo/sdl_opengl3/Makefile @@ -2,7 +2,7 @@ BIN = demo # Flags -CFLAGS = -std=c99 -pedantic -O2 +CFLAGS += -std=c99 -pedantic -O2 SRC = main.c OBJ = $(SRC:.c=.o) diff --git a/demo/sdl_opengles2/Makefile b/demo/sdl_opengles2/Makefile index abd3f53..7385305 100644 --- a/demo/sdl_opengles2/Makefile +++ b/demo/sdl_opengles2/Makefile @@ -2,7 +2,7 @@ BIN = demo # Flags -CFLAGS = -std=c99 -pedantic -O2 +CFLAGS += -std=c99 -pedantic -O2 SRC = main.c OBJ = $(SRC:.c=.o) diff --git a/demo/sfml_opengl2/Makefile b/demo/sfml_opengl2/Makefile index f69a8ca..28848a4 100644 --- a/demo/sfml_opengl2/Makefile +++ b/demo/sfml_opengl2/Makefile @@ -3,7 +3,7 @@ CC = g++ BIN = demo # Flags -CFLAGS = -s -O2 +CFLAGS += -s -O2 SRC = main.cpp OBJ = $(SRC:.cpp=.o) diff --git a/demo/sfml_opengl3/Makefile b/demo/sfml_opengl3/Makefile index f6dd4bc..b30bf28 100644 --- a/demo/sfml_opengl3/Makefile +++ b/demo/sfml_opengl3/Makefile @@ -3,7 +3,7 @@ CC = g++ BIN = demo # Flags -CFLAGS = -s -O2 +CFLAGS += -s -O2 SRC = main.cpp OBJ = $(SRC:.cpp=.o) diff --git a/demo/x11/Makefile b/demo/x11/Makefile index 0570089..9057c7b 100644 --- a/demo/x11/Makefile +++ b/demo/x11/Makefile @@ -2,7 +2,7 @@ BIN = zahnrad # Flags -CFLAGS = -std=c89 -pedantic -O2 +CFLAGS += -std=c89 -pedantic -O2 SRC = main.c OBJ = $(SRC:.c=.o) diff --git a/demo/x11_opengl2/Makefile b/demo/x11_opengl2/Makefile index 1173b6c..a3d6d32 100644 --- a/demo/x11_opengl2/Makefile +++ b/demo/x11_opengl2/Makefile @@ -6,7 +6,7 @@ CC = clang DCC = gcc # Flags -CFLAGS = -std=c99 -pedantic -O2 +CFLAGS += -std=c99 -pedantic -O2 SRC = main.c OBJ = $(SRC:.c=.o) diff --git a/demo/x11_opengl3/Makefile b/demo/x11_opengl3/Makefile index 1173b6c..a3d6d32 100644 --- a/demo/x11_opengl3/Makefile +++ b/demo/x11_opengl3/Makefile @@ -6,7 +6,7 @@ CC = clang DCC = gcc # Flags -CFLAGS = -std=c99 -pedantic -O2 +CFLAGS += -std=c99 -pedantic -O2 SRC = main.c OBJ = $(SRC:.c=.o) diff --git a/demo/x11_rawfb/Makefile b/demo/x11_rawfb/Makefile index 56e228e..c1a178a 100644 --- a/demo/x11_rawfb/Makefile +++ b/demo/x11_rawfb/Makefile @@ -2,7 +2,7 @@ BIN = zahnrad # Flags -CFLAGS = -std=c89 -pedantic -O2 -Wunused -DRAWFB_XRGB_8888 +CFLAGS += -std=c89 -pedantic -O2 -Wunused -DRAWFB_XRGB_8888 SRC = main.c OBJ = $(SRC:.c=.o) diff --git a/example/Makefile b/example/Makefile index 8efa6cd..a3ae6f0 100644 --- a/example/Makefile +++ b/example/Makefile @@ -1,5 +1,5 @@ # Flags -CFLAGS = -std=c99 -pedantic -O2 +CFLAGS += -std=c99 -pedantic -O2 LIBS := ifeq ($(OS),Windows_NT)