Skip to content

Commit

Permalink
Merge branch 'features/add-x86_64-travis-ci-support' of github.com:xh…
Browse files Browse the repository at this point in the history
…airball/ioq3
  • Loading branch information
zturtleman committed May 13, 2014
2 parents 6d47ff8 + 4e67034 commit 5c4e429
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 0 deletions.
1 change: 1 addition & 0 deletions .travis.yml
Expand Up @@ -3,6 +3,7 @@ compiler:
- gcc
- clang
- i686-w64-mingw32-gcc
- x86_64-w64-mingw32-gcc

script: ./travis-ci-build.sh

Expand Down
5 changes: 5 additions & 0 deletions travis-ci-build.sh
Expand Up @@ -8,6 +8,11 @@ if [ "$CC" = "i686-w64-mingw32-gcc" ]; then
export ARCH=x86
export CC=
haveExternalLibs=0
elif [ "$CC" = "x86_64-w64-mingw32-gcc" ]; then
export PLATFORM=mingw32
export ARCH=x86_64
export CC=
haveExternalLibs=0
else
haveExternalLibs=1
fi
Expand Down

0 comments on commit 5c4e429

Please sign in to comment.