diff --git a/.travis.yml b/.travis.yml index 17031b45..f4791b10 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,11 +3,11 @@ compiler: - gcc - clang -script: make +script: ./build-test.sh before_install: - sudo apt-get update -qq - - sudo apt-get install -qq libgl1-mesa-dev libsdl1.2-dev libsdl-image1.2-dev libsdl-ttf2.0-dev + - sudo apt-get install -qq libgl1-mesa-dev libsdl1.2-dev libvorbis-dev libfreetype6-dev mingw32 notifications: - irc: "irc.freenode.org#ioquake3" \ No newline at end of file + irc: "irc.freenode.org#ioquake3" diff --git a/build-test.sh b/build-test.sh new file mode 100755 index 00000000..9b984e72 --- /dev/null +++ b/build-test.sh @@ -0,0 +1,28 @@ +#!/bin/sh + +failed=0; + +# Default Build +(make clean release) || failed=1; + +# Test additional options +(make clean release USE_CODEC_VORBIS=1 USE_FREETYPE=1 CFLAGS=-DRAVENMD4) || failed=1; + +# Test mingw +if [ "$CC" = "clang" ]; then + # skip mingw if travis-ci clang build + echo "Skipping mingw build because there is no mingw clang compiler available."; +else + # clear CC so cross-make-mingw script will set it. + export CC= + (exec ./cross-make-mingw.sh clean release) || failed=1; +fi + +if [ $failed -eq 1 ]; then + echo "Build failure."; +else + echo "All builds successful."; +fi + +exit $failed; + diff --git a/code/renderergl2/tr_model.c b/code/renderergl2/tr_model.c index 5aeab8ef..69b5095e 100644 --- a/code/renderergl2/tr_model.c +++ b/code/renderergl2/tr_model.c @@ -1403,7 +1403,7 @@ static mdvTag_t *R_GetTag( mdvModel_t *mod, int frame, const char *_tagName ) { } #ifdef RAVENMD4 -void R_GetAnimTag( mdrHeader_t *mod, int framenum, const char *tagName, md3Tag_t * dest) +void R_GetAnimTag( mdrHeader_t *mod, int framenum, const char *tagName, mdvTag_t * dest) { int i, j, k; int frameSize; @@ -1421,8 +1421,6 @@ void R_GetAnimTag( mdrHeader_t *mod, int framenum, const char *tagName, md3Tag_t { if ( !strcmp( tag->name, tagName ) ) { - Q_strncpyz(dest->name, tag->name, sizeof(dest->name)); - // uncompressed model... // frameSize = (intptr_t)( &((mdrFrame_t *)0)->bones[ mod->numBones ] ); @@ -1444,7 +1442,6 @@ void R_GetAnimTag( mdrHeader_t *mod, int framenum, const char *tagName, md3Tag_t AxisClear( dest->axis ); VectorClear( dest->origin ); - strcpy(dest->name,""); } #endif @@ -1457,7 +1454,7 @@ int R_LerpTag( orientation_t *tag, qhandle_t handle, int startFrame, int endFram float frac, const char *tagName ) { mdvTag_t *start, *end; #ifdef RAVENMD4 - md3Tag_t start_space, end_space; + mdvTag_t start_space, end_space; #endif int i; float frontLerp, backLerp;