Skip to content
Permalink
Browse files

remove .clang-format, update .travis.yml

Remove .clang-format as it causes some people's editors to do
unnecessary reformatting automatically.

Add binary `--help` check to travis build steps.

Add `-DENABLE_SDL=ON -DENABLE_OPENAL=ON` to cmake options for all travis
jobs.

Signed-off-by: Rafael Kitover <rkitover@gmail.com>
  • Loading branch information
rkitover committed Apr 13, 2019
1 parent ed16d62 commit 5dfb36ad84a85d764e6e210288e4221ef13018e2
Showing with 6 additions and 96 deletions.
  1. +0 −90 .clang-format
  2. +6 −6 .travis.yml

This file was deleted.

@@ -16,9 +16,9 @@ matrix:
script:
- mkdir build
- cd build
- cmake ..
- cmake .. -DENABLE_SDL=ON -DENABLE_OPENAL=ON
- make -j2
# - xvfb-run ./visualboyadvance-m --help
- xvfb-run ./visualboyadvance-m --help
cache:
directories:
- "$HOME/.ccache"
@@ -31,7 +31,7 @@ matrix:
script:
- mkdir build
- cd build
- /usr/lib/mxe/usr/bin/x86_64-w64-mingw32.static-cmake ..
- /usr/lib/mxe/usr/bin/x86_64-w64-mingw32.static-cmake .. -DENABLE_SDL=ON -DENABLE_OPENAL=ON
- make -j2
cache:
directories:
@@ -45,7 +45,7 @@ matrix:
script:
- mkdir build
- cd build
- /usr/lib/mxe/usr/bin/i686-w64-mingw32.static-cmake ..
- /usr/lib/mxe/usr/bin/i686-w64-mingw32.static-cmake .. -DENABLE_SDL=ON -DENABLE_OPENAL=ON
- make -j2
cache:
directories:
@@ -71,9 +71,9 @@ matrix:
script:
- mkdir build
- cd build
- cmake ..
- cmake .. -DENABLE_SDL=ON -DENABLE_OPENAL=ON
- make -j2
# - ./visualboyadvance-m.app/Contents/MacOS/visualboyadvance-m --help
- ./visualboyadvance-m.app/Contents/MacOS/visualboyadvance-m --help
cache:
directories:
- "$HOME/.ccache"

0 comments on commit 5dfb36a

Please sign in to comment.
You can’t perform that action at this time.