diff --git a/.travis.yml b/.travis.yml index d13ae7d..a805a8c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,10 +7,10 @@ addons: packages: - g++-4.9 - build-essential - - libsdl2-dev - - libsdl2-image-dev - - libsdl2-mixer-dev - - libsdl2-ttf-dev + - libsdl1.2-dev + - libsdl-image1.2-dev + - libsdl-mixer1.2-dev + - libsdl-ttf1.2-dev - libenet-dev - libphysfs-dev diff --git a/Makefile b/Makefile index 418b994..a8825c4 100644 --- a/Makefile +++ b/Makefile @@ -7,9 +7,7 @@ standard: @echo "Now compiling..." - export CC=gcc - export CPP=g++ - @CC=gcc CPP=g++ make -C source/code -f Makefile + @make -C source/code -f Makefile @echo "Everything has been compiled!" clean: diff --git a/travis_build.script b/travis_build.script index c082b11..4fe59dc 100755 --- a/travis_build.script +++ b/travis_build.script @@ -1,2 +1,2 @@ #! /bin/bash -make +make -C source/code -f Makefile