Merge pull request #590 from mgerhardy/travis

TravisCI changes
This commit is contained in:
Micha Mettke 2018-01-03 12:27:14 -08:00 committed by GitHub
commit df96bac317
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
14 changed files with 15 additions and 14 deletions

View File

@ -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

View File

@ -2,7 +2,7 @@
BIN = demo
# Flags
CFLAGS = -std=c99 -pedantic -O2
CFLAGS += -std=c99 -pedantic -O2
SRC = main.c
OBJ = $(SRC:.c=.o)

View File

@ -2,7 +2,7 @@
BIN = demo
# Flags
CFLAGS = -std=c99 -pedantic -O2
CFLAGS += -std=c99 -pedantic -O2
SRC = main.c
OBJ = $(SRC:.c=.o)

View File

@ -2,7 +2,7 @@
BIN = demo
# Flags
CFLAGS = -std=c99 -pedantic -O2
CFLAGS += -std=c99 -pedantic -O2
SRC = main.c
OBJ = $(SRC:.c=.o)

View File

@ -2,7 +2,7 @@
BIN = demo
# Flags
CFLAGS = -std=c99 -pedantic -O2
CFLAGS += -std=c99 -pedantic -O2
SRC = main.c
OBJ = $(SRC:.c=.o)

View File

@ -2,7 +2,7 @@
BIN = demo
# Flags
CFLAGS = -std=c99 -pedantic -O2
CFLAGS += -std=c99 -pedantic -O2
SRC = main.c
OBJ = $(SRC:.c=.o)

View File

@ -2,7 +2,7 @@
BIN = demo
# Flags
CFLAGS = -std=c99 -pedantic -O2
CFLAGS += -std=c99 -pedantic -O2
SRC = main.c
OBJ = $(SRC:.c=.o)

View File

@ -3,7 +3,7 @@ CC = g++
BIN = demo
# Flags
CFLAGS = -s -O2
CFLAGS += -s -O2
SRC = main.cpp
OBJ = $(SRC:.cpp=.o)

View File

@ -3,7 +3,7 @@ CC = g++
BIN = demo
# Flags
CFLAGS = -s -O2
CFLAGS += -s -O2
SRC = main.cpp
OBJ = $(SRC:.cpp=.o)

View File

@ -2,7 +2,7 @@
BIN = zahnrad
# Flags
CFLAGS = -std=c89 -pedantic -O2
CFLAGS += -std=c89 -pedantic -O2
SRC = main.c
OBJ = $(SRC:.c=.o)

View File

@ -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)

View File

@ -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)

View File

@ -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)

View File

@ -1,5 +1,5 @@
# Flags
CFLAGS = -std=c99 -pedantic -O2
CFLAGS += -std=c99 -pedantic -O2
LIBS :=
ifeq ($(OS),Windows_NT)