Merge branch 'experimental' of centralserv.gotgeeks.com:dbrock/gsplus into experimental

This commit is contained in:
Dagen Brock 2017-01-21 16:33:23 -06:00
commit f7cc4d1c62

View File

@ -1,4 +1,3 @@
stages: stages:
- build - build
- package - package
@ -131,6 +130,8 @@ package-win32:
- cp /bin/cygstdc++-6.dll . - cp /bin/cygstdc++-6.dll .
- cp /bin/cygwin1.dll . - cp /bin/cygwin1.dll .
- cp /bin/cygfreetype-6.dll . - cp /bin/cygfreetype-6.dll .
- cp /bin/cygbz2-1.dll .
- cp /bin/cygpng16-16.dll .
artifacts: artifacts:
paths: paths:
@ -143,8 +144,9 @@ package-win32:
- cyggcc_s-1.dll - cyggcc_s-1.dll
- cygstdc++-6.dll - cygstdc++-6.dll
- cygwin1.dll - cygwin1.dll
- cygfreetype-6.dll . - cygfreetype-6.dll
- cygbz2-1.dll
- cygpng16-16.dll
build-win-sdl: build-win-sdl:
tags: tags:
@ -171,6 +173,8 @@ package-win-sdl:
- cp /bin/cygstdc++-6.dll . - cp /bin/cygstdc++-6.dll .
- cp /bin/cygwin1.dll . - cp /bin/cygwin1.dll .
- cp /bin/cygfreetype-6.dll . - cp /bin/cygfreetype-6.dll .
- cp /bin/cygbz2-1.dll .
- cp /bin/cygpng16-16.dll .
artifacts: artifacts:
paths: paths:
@ -184,3 +188,5 @@ package-win-sdl:
- cygstdc++-6.dll - cygstdc++-6.dll
- cygwin1.dll - cygwin1.dll
- cygfreetype-6.dll - cygfreetype-6.dll
- cygbz2-1.dll
- cygpng16-16.dll