Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-04-15 21:16:28 +03:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fix travis

Browse Source
This commit is contained in:
Vas Crabb 2016-06-10 01:08:12 +10:00
parent 21aee1a27f
commit 89466e4937
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.travis.yml
View File

@ -23,8 +23,8 @@ env:
script: script:
- if [ $TRAVIS_OS_NAME == 'linux' ]; then - if [ $TRAVIS_OS_NAME == 'linux' ]; then
if [ $CC == 'clang' ]; then if [ $CC == 'clang' ]; then
make -j2 OVERRIDE_CXX="clang++-3.6" OVERRIDE_CC="clang-3.6" && ./$MAME -validate; make -j2 IGNORE_GIT=1 OVERRIDE_CXX="clang++-3.6" OVERRIDE_CC="clang-3.6" && ./$MAME -validate;
else make -j4 OPTIMIZE=0 OVERRIDE_CC="gcc-5" OVERRIDE_CXX="g++-5" && ./$MAME -validate; else make -j4 IGNORE_GIT=1 OPTIMIZE=0 OVERRIDE_CC="gcc-5" OVERRIDE_CXX="g++-5" && ./$MAME -validate;
fi fi
elif [ $TRAVIS_OS_NAME == 'osx' ]; then elif [ $TRAVIS_OS_NAME == 'osx' ]; then
unset LDOPTS && make -j2 OPTIMIZE=0 USE_LIBSDL=1 && ./$MAME -validate; unset LDOPTS && make -j2 OPTIMIZE=0 USE_LIBSDL=1 && ./$MAME -validate;
@ -43,4 +43,4 @@ branches:
- master - master
notifications: notifications:
email: false email: false

3
makefile
View File

@ -906,6 +906,9 @@ NEW_GIT_VERSION := $(shell git describe --dirty)
else else
NEW_GIT_VERSION := unknown NEW_GIT_VERSION := unknown
endif endif
ifeq ($(NEW_GIT_VERSION),)
NEW_GIT_VERSION := unknown
endif
GENIE := 3rdparty/genie/bin/$(GENIEOS)/genie$(EXE) GENIE := 3rdparty/genie/bin/$(GENIEOS)/genie$(EXE)