Skip to content

Commit

Permalink
Merge pull request vurtun#590 from mgerhardy/travis
Browse files Browse the repository at this point in the history
TravisCI changes
  • Loading branch information
vurtun authored Jan 3, 2018
2 parents 3f3091f + b17ec49 commit df96bac
Show file tree
Hide file tree
Showing 14 changed files with 15 additions and 14 deletions.
3 changes: 2 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion demo/allegro5/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
BIN = demo

# Flags
CFLAGS = -std=c99 -pedantic -O2
CFLAGS += -std=c99 -pedantic -O2

SRC = main.c
OBJ = $(SRC:.c=.o)
Expand Down
2 changes: 1 addition & 1 deletion demo/glfw_opengl2/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
BIN = demo

# Flags
CFLAGS = -std=c99 -pedantic -O2
CFLAGS += -std=c99 -pedantic -O2

SRC = main.c
OBJ = $(SRC:.c=.o)
Expand Down
2 changes: 1 addition & 1 deletion demo/glfw_opengl3/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
BIN = demo

# Flags
CFLAGS = -std=c99 -pedantic -O2
CFLAGS += -std=c99 -pedantic -O2

SRC = main.c
OBJ = $(SRC:.c=.o)
Expand Down
2 changes: 1 addition & 1 deletion demo/sdl_opengl2/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
BIN = demo

# Flags
CFLAGS = -std=c99 -pedantic -O2
CFLAGS += -std=c99 -pedantic -O2

SRC = main.c
OBJ = $(SRC:.c=.o)
Expand Down
2 changes: 1 addition & 1 deletion demo/sdl_opengl3/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
BIN = demo

# Flags
CFLAGS = -std=c99 -pedantic -O2
CFLAGS += -std=c99 -pedantic -O2

SRC = main.c
OBJ = $(SRC:.c=.o)
Expand Down
2 changes: 1 addition & 1 deletion demo/sdl_opengles2/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
BIN = demo

# Flags
CFLAGS = -std=c99 -pedantic -O2
CFLAGS += -std=c99 -pedantic -O2

SRC = main.c
OBJ = $(SRC:.c=.o)
Expand Down
2 changes: 1 addition & 1 deletion demo/sfml_opengl2/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ CC = g++
BIN = demo

# Flags
CFLAGS = -s -O2
CFLAGS += -s -O2

SRC = main.cpp
OBJ = $(SRC:.cpp=.o)
Expand Down
2 changes: 1 addition & 1 deletion demo/sfml_opengl3/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ CC = g++
BIN = demo

# Flags
CFLAGS = -s -O2
CFLAGS += -s -O2

SRC = main.cpp
OBJ = $(SRC:.cpp=.o)
Expand Down
2 changes: 1 addition & 1 deletion demo/x11/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
BIN = zahnrad

# Flags
CFLAGS = -std=c89 -pedantic -O2
CFLAGS += -std=c89 -pedantic -O2

SRC = main.c
OBJ = $(SRC:.c=.o)
Expand Down
2 changes: 1 addition & 1 deletion demo/x11_opengl2/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion demo/x11_opengl3/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion demo/x11_rawfb/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion example/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Flags
CFLAGS = -std=c99 -pedantic -O2
CFLAGS += -std=c99 -pedantic -O2
LIBS :=

ifeq ($(OS),Windows_NT)
Expand Down

0 comments on commit df96bac

Please sign in to comment.