mirror of
https://github.com/AquariaOSE/Aquaria.git
synced 2025-01-26 02:07:26 +00:00
Merge branch 'controllerfixup' of github.com:AquariaOSE/Aquaria into controllerfixup
This commit is contained in:
commit
64150bcb5b
1 changed files with 13 additions and 2 deletions
15
.travis.yml
15
.travis.yml
|
@ -21,20 +21,31 @@ addons:
|
||||||
apt:
|
apt:
|
||||||
packages:
|
packages:
|
||||||
- libopenal-dev
|
- libopenal-dev
|
||||||
|
- libsdl2-dev
|
||||||
- libsdl-dev
|
- libsdl-dev
|
||||||
|
|
||||||
before_install:
|
before_install:
|
||||||
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update ; fi
|
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update ; fi
|
||||||
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install sdl openal-soft; fi
|
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install sdl sdl2 openal-soft; fi
|
||||||
|
|
||||||
script:
|
script:
|
||||||
# ALL THE BUILD COMMANDS HERE
|
# ALL THE BUILD COMMANDS HERE
|
||||||
- export CMAKE_PREFIX_PATH="$CMAKE_PREFIX_PATH;/usr/lib/x86_64-linux-gnu/"
|
- export CMAKE_PREFIX_PATH="$CMAKE_PREFIX_PATH;/usr/lib/x86_64-linux-gnu/"
|
||||||
- CMAKE_OPTIONS='-DCMAKE_PREFIX_PATH='"$CMAKE_PREFIX_PATH"' -DCMAKE_BUILD_TYPE=RelWithDebInfo -DAQUARIA_INTERNAL_FREETYPE=OFF -DAQUARIA_INTERNAL_LUA=OFF -DAQUARIA_INTERNAL_OGGVORBIS=OFF -DAQUARIA_INTERNAL_OPENAL=OFF -DAQUARIA_INTERNAL_PNG=OFF -DAQUARIA_INTERNAL_SDL=OFF -DAQUARIA_INTERNAL_TINYXML2=OFF -DAQUARIA_INTERNAL_ZLIB=OFF'
|
- CMAKE_OPTIONS='-DCMAKE_PREFIX_PATH='"$CMAKE_PREFIX_PATH"' -DCMAKE_BUILD_TYPE=RelWithDebInfo -DAQUARIA_INTERNAL_FREETYPE=OFF -DAQUARIA_INTERNAL_LUA=OFF -DAQUARIA_INTERNAL_OGGVORBIS=OFF -DAQUARIA_INTERNAL_OPENAL=OFF -DAQUARIA_INTERNAL_PNG=OFF -DAQUARIA_INTERNAL_SDL=OFF -DAQUARIA_INTERNAL_TINYXML2=OFF -DAQUARIA_INTERNAL_ZLIB=OFF'
|
||||||
|
# Build SDL 2
|
||||||
|
- echo "----------------------------------------------BUILD SDL2----------------------------------------------"
|
||||||
- rm -rf cmake-build
|
- rm -rf cmake-build
|
||||||
- mkdir cmake-build
|
- mkdir cmake-build
|
||||||
- cd cmake-build
|
- cd cmake-build
|
||||||
- cmake $CMAKE_OPTIONS ..
|
- cmake $CMAKE_OPTIONS -DAQUARIA_USE_SDL2=ON ..
|
||||||
|
- make -j 2
|
||||||
|
# Build SDL 1.2
|
||||||
|
- echo "----------------------------------------------BUILD SDL 1.2----------------------------------------------"
|
||||||
|
- cd ..
|
||||||
|
- rm -rf cmake-build
|
||||||
|
- mkdir cmake-build
|
||||||
|
- cd cmake-build
|
||||||
|
- cmake $CMAKE_OPTIONS -DAQUARIA_USE_SDL2=OFF ..
|
||||||
- make -j 2
|
- make -j 2
|
||||||
|
|
||||||
notifications:
|
notifications:
|
||||||
|
|
Loading…
Reference in a new issue