Permalink
Browse files

Fix travis

  • Loading branch information...
1 parent 21aee1a commit 89466e4937ef83c97f21800d48e7b5d3d7c4276e @cuavas cuavas committed Jun 9, 2016
Showing with 6 additions and 3 deletions.
  1. +3 −3 .travis.yml
  2. +3 −0 makefile
View
@@ -23,8 +23,8 @@ env:
script:
- if [ $TRAVIS_OS_NAME == 'linux' ]; then
if [ $CC == 'clang' ]; then
- make -j2 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;
+ make -j2 IGNORE_GIT=1 OVERRIDE_CXX="clang++-3.6" OVERRIDE_CC="clang-3.6" && ./$MAME -validate;
+ else make -j4 IGNORE_GIT=1 OPTIMIZE=0 OVERRIDE_CC="gcc-5" OVERRIDE_CXX="g++-5" && ./$MAME -validate;
fi
elif [ $TRAVIS_OS_NAME == 'osx' ]; then
unset LDOPTS && make -j2 OPTIMIZE=0 USE_LIBSDL=1 && ./$MAME -validate;
@@ -43,4 +43,4 @@ branches:
- master
notifications:
email: false
-
+
View
@@ -906,6 +906,9 @@ NEW_GIT_VERSION := $(shell git describe --dirty)
else
NEW_GIT_VERSION := unknown
endif
+ifeq ($(NEW_GIT_VERSION),)
+NEW_GIT_VERSION := unknown
+endif
GENIE := 3rdparty/genie/bin/$(GENIEOS)/genie$(EXE)

0 comments on commit 89466e4

Please sign in to comment.