Commit a8b96e16 authored by Thomas Eppers's avatar Thomas Eppers
Browse files

Merge branch 'develop' of gitlab.fsi.hochschule-trier.de:GameDevWeek/gdw_ss15_cpp into develop

parents 1efcd78d 3b3bbd5a
......@@ -6,7 +6,7 @@ linux:
stage: build
script:
- ./build_deps.sh linux
- premake5 --cc=clang gmake
- premake5 --cc=gcc gmake
- make clean
- make -j 7
tags:
......@@ -19,7 +19,7 @@ release:
stage: deploy
script:
- ./build_deps.sh linux
- premake5 --cc=clang gmake
- premake5 --cc=gcc gmake
- make clean
- make -j 7
- tar -caf linux.tar.xz assets build
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment