mirror of
https://github.com/zenorogue/hyperrogue.git
synced 2024-06-25 22:53:19 +00:00
Merge pull request #104 from Quuxplusone/red
Get the build green again. Fix a bug in the Travis config.
This commit is contained in:
commit
c5e6c26fb4
50
.travis.yml
50
.travis.yml
|
@ -3,20 +3,6 @@ services:
|
||||||
- docker
|
- docker
|
||||||
matrix:
|
matrix:
|
||||||
include:
|
include:
|
||||||
- os: linux
|
|
||||||
addons:
|
|
||||||
apt:
|
|
||||||
sources:
|
|
||||||
- ubuntu-toolchain-r-test
|
|
||||||
packages:
|
|
||||||
- gcc-5
|
|
||||||
- g++-5
|
|
||||||
env: >-
|
|
||||||
TRAVIS_OS_NAME=linux
|
|
||||||
TRAVIS_BUILD_SYSTEM=Makefile
|
|
||||||
HYPERROGUE_CXX=g++-5
|
|
||||||
HYPERROGUE_USE_GLEW=1
|
|
||||||
HYPERROGUE_USE_PNG=1
|
|
||||||
- os: linux
|
- os: linux
|
||||||
compiler: gcc
|
compiler: gcc
|
||||||
env: >-
|
env: >-
|
||||||
|
@ -34,6 +20,23 @@ matrix:
|
||||||
HYPERROGUE_USE_GLEW=1
|
HYPERROGUE_USE_GLEW=1
|
||||||
HYPERROGUE_USE_PNG=1
|
HYPERROGUE_USE_PNG=1
|
||||||
- os: linux
|
- os: linux
|
||||||
|
compiler: gcc
|
||||||
|
env: >-
|
||||||
|
TRAVIS_OS_NAME=linux
|
||||||
|
TRAVIS_COMPILER_NAME=gcc
|
||||||
|
TRAVIS_BUILD_SYSTEM=Makefile
|
||||||
|
HYPERROGUE_USE_GLEW=1
|
||||||
|
HYPERROGUE_USE_PNG=1
|
||||||
|
- os: linux
|
||||||
|
compiler: clang
|
||||||
|
env: >-
|
||||||
|
TRAVIS_OS_NAME=linux
|
||||||
|
TRAVIS_COMPILER_NAME=clang
|
||||||
|
TRAVIS_BUILD_SYSTEM=Makefile
|
||||||
|
HYPERROGUE_USE_GLEW=1
|
||||||
|
HYPERROGUE_USE_PNG=1
|
||||||
|
- os: linux
|
||||||
|
dist: bionic
|
||||||
compiler: gcc
|
compiler: gcc
|
||||||
env: >-
|
env: >-
|
||||||
TRAVIS_OS_NAME=linux
|
TRAVIS_OS_NAME=linux
|
||||||
|
@ -51,6 +54,14 @@ matrix:
|
||||||
HYPERROGUE_USE_GLEW=1
|
HYPERROGUE_USE_GLEW=1
|
||||||
HYPERROGUE_USE_PNG=1
|
HYPERROGUE_USE_PNG=1
|
||||||
HYPERROGUE_USE_ROGUEVIZ=1
|
HYPERROGUE_USE_ROGUEVIZ=1
|
||||||
|
- os: osx
|
||||||
|
compiler: clang
|
||||||
|
env: >-
|
||||||
|
TRAVIS_OS_NAME=osx
|
||||||
|
TRAVIS_COMPILER_NAME=clang
|
||||||
|
TRAVIS_BUILD_SYSTEM=Makefile
|
||||||
|
HYPERROGUE_USE_GLEW=1
|
||||||
|
HYPERROGUE_USE_PNG=1
|
||||||
- os: osx
|
- os: osx
|
||||||
compiler: gcc
|
compiler: gcc
|
||||||
env: >-
|
env: >-
|
||||||
|
@ -69,15 +80,6 @@ matrix:
|
||||||
HYPERROGUE_USE_GLEW=1
|
HYPERROGUE_USE_GLEW=1
|
||||||
HYPERROGUE_USE_PNG=1
|
HYPERROGUE_USE_PNG=1
|
||||||
HYPERROGUE_USE_ROGUEVIZ=1
|
HYPERROGUE_USE_ROGUEVIZ=1
|
||||||
- os: osx
|
|
||||||
compiler: clang
|
|
||||||
env: >-
|
|
||||||
TRAVIS_OS_NAME=osx
|
|
||||||
TRAVIS_COMPILER_NAME=clang
|
|
||||||
TRAVIS_BUILD_SYSTEM=Makefile
|
|
||||||
HYPERROGUE_USE_GLEW=0
|
|
||||||
HYPERROGUE_USE_PNG=0
|
|
||||||
HYPERROGUE_USE_ROGUEVIZ=0
|
|
||||||
- os: linux
|
- os: linux
|
||||||
env: >-
|
env: >-
|
||||||
TRAVIS_OS_NAME=linux
|
TRAVIS_OS_NAME=linux
|
||||||
|
@ -140,7 +142,7 @@ script:
|
||||||
./configure CXXFLAGS="-W -Wall -Wextra -Werror -Wno-unused-parameter -Wno-maybe-uninitialized -Wno-unknown-warning-option"
|
./configure CXXFLAGS="-W -Wall -Wextra -Werror -Wno-unused-parameter -Wno-maybe-uninitialized -Wno-unknown-warning-option"
|
||||||
make
|
make
|
||||||
elif [[ "$TRAVIS_BUILD_SYSTEM" == "Makefile" ]]; then
|
elif [[ "$TRAVIS_BUILD_SYSTEM" == "Makefile" ]]; then
|
||||||
make -f Makefile.simple CXX="${HYPERROGUE_CXX-g++}"
|
make -f Makefile.simple
|
||||||
elif [[ "$TRAVIS_BUILD_SYSTEM" == "emscripten" ]]; then
|
elif [[ "$TRAVIS_BUILD_SYSTEM" == "emscripten" ]]; then
|
||||||
docker run --rm -v $(pwd):/src trzeci/emscripten make -f Makefile.simple emscripten
|
docker run --rm -v $(pwd):/src trzeci/emscripten make -f Makefile.simple emscripten
|
||||||
else
|
else
|
||||||
|
|
|
@ -80,19 +80,22 @@ ifeq (${OS},osx)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifeq (${TOOLCHAIN},clang)
|
ifeq (${TOOLCHAIN},clang)
|
||||||
CXXFLAGS_EARLY += -std=c++11 -march=native
|
CXXFLAGS_STD = -std=c++11
|
||||||
|
CXXFLAGS_EARLY += -march=native
|
||||||
CXXFLAGS_EARLY += -W -Wall -Wextra -Werror -pedantic
|
CXXFLAGS_EARLY += -W -Wall -Wextra -Werror -pedantic
|
||||||
CXXFLAGS_EARLY += -Wno-unused-parameter -Wno-implicit-fallthrough -Wno-maybe-uninitialized -Wno-unknown-warning-option
|
CXXFLAGS_EARLY += -Wno-unused-parameter -Wno-implicit-fallthrough -Wno-maybe-uninitialized -Wno-unknown-warning-option
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifeq (${TOOLCHAIN},gcc)
|
ifeq (${TOOLCHAIN},gcc)
|
||||||
CXXFLAGS_EARLY += -std=c++11 -march=native
|
CXXFLAGS_STD = -std=c++11
|
||||||
|
CXXFLAGS_EARLY += -march=native
|
||||||
CXXFLAGS_EARLY += -W -Wall -Wextra -Werror -pedantic
|
CXXFLAGS_EARLY += -W -Wall -Wextra -Werror -pedantic
|
||||||
CXXFLAGS_EARLY += -Wno-unused-parameter -Wno-implicit-fallthrough -Wno-maybe-uninitialized
|
CXXFLAGS_EARLY += -Wno-unused-parameter -Wno-implicit-fallthrough -Wno-maybe-uninitialized
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifeq (${TOOLCHAIN},mingw)
|
ifeq (${TOOLCHAIN},mingw)
|
||||||
CXXFLAGS_EARLY += -std=c++11 -march=native
|
CXXFLAGS_STD = -std=c++11
|
||||||
|
CXXFLAGS_EARLY += -march=native
|
||||||
CXXFLAGS_EARLY += -W -Wall -Wextra -Werror
|
CXXFLAGS_EARLY += -W -Wall -Wextra -Werror
|
||||||
CXXFLAGS_EARLY += -Wno-unused-parameter -Wno-implicit-fallthrough -Wno-maybe-uninitialized
|
CXXFLAGS_EARLY += -Wno-unused-parameter -Wno-implicit-fallthrough -Wno-maybe-uninitialized
|
||||||
endif
|
endif
|
||||||
|
@ -121,7 +124,8 @@ else
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifeq (${HYPERROGUE_USE_ROGUEVIZ},1)
|
ifeq (${HYPERROGUE_USE_ROGUEVIZ},1)
|
||||||
# Enable RogueViz.
|
# Enable RogueViz. RogueViz requires C++17.
|
||||||
|
CXXFLAGS_STD = -std=c++17
|
||||||
CXXFLAGS_EARLY += -DCAP_ROGUEVIZ=1
|
CXXFLAGS_EARLY += -DCAP_ROGUEVIZ=1
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
@ -130,7 +134,7 @@ endif
|
||||||
## Begin the Makefile proper.
|
## Begin the Makefile proper.
|
||||||
|
|
||||||
|
|
||||||
override CXXFLAGS := $(CXXFLAGS_EARLY) $(CXXFLAGS) ${EXTRA_CXXFLAGS}
|
override CXXFLAGS := $(CXXFLAGS_STD) $(CXXFLAGS_EARLY) $(CXXFLAGS) ${EXTRA_CXXFLAGS}
|
||||||
override LDFLAGS := $(LDFLAGS_EARLY) $(LDFLAGS) ${EXTRA_LDFLAGS}
|
override LDFLAGS := $(LDFLAGS_EARLY) $(LDFLAGS) ${EXTRA_LDFLAGS}
|
||||||
|
|
||||||
hyperrogue$(EXE_EXTENSION): $(hyper_OBJS) $(hyper_RES)
|
hyperrogue$(EXE_EXTENSION): $(hyper_OBJS) $(hyper_RES)
|
||||||
|
|
Loading…
Reference in New Issue
Block a user