mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2024-12-19 15:20:27 +00:00
Code Issues Releases Wiki Activity

Merge branch 'master' of https://github.com/zenorogue/hyperrogue

Browse Source
This commit is contained in:
Zeno Rogue 2022-07-05 02:59:33 +02:00
commit b3a394c266
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.github/workflows/build.sh vendored
View File

@ -17,6 +17,7 @@ fi
export CC=$GH_COMPILER export CC=$GH_COMPILER
export CXX=${CC%cc}++ export CXX=${CC%cc}++
export CXXFLAGS_EARLY=-Werror
if [[ "$GH_BUILDSYS" == "makefile" ]]; then if [[ "$GH_BUILDSYS" == "makefile" ]]; then
make make

1
.travis.yml
View File

@ -162,6 +162,7 @@ script:
fi fi
- |- - |-
# Build hyperrogue. # Build hyperrogue.
export CXXFLAGS_EARLY=-Werror
if [[ "$TRAVIS_BUILD_SYSTEM" == "Makefile" ]]; then if [[ "$TRAVIS_BUILD_SYSTEM" == "Makefile" ]]; then
make make
elif [[ "$TRAVIS_BUILD_SYSTEM" == "mymake" ]]; then elif [[ "$TRAVIS_BUILD_SYSTEM" == "mymake" ]]; then

11
Makefile
View File

@ -81,24 +81,23 @@ endif
ifeq (${TOOLCHAIN},clang) ifeq (${TOOLCHAIN},clang)
CXXFLAGS_STD = -std=c++11 CXXFLAGS_STD = -std=c++11
CXXFLAGS_EARLY += -march=native -fPIC CXXFLAGS_EARLY += -fPIC
CXXFLAGS_EARLY += -W -Wall -Wextra -Wsuggest-override -Werror -pedantic CXXFLAGS_EARLY += -W -Wall -Wextra -Wsuggest-override -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
CXXFLAGS_EARLY += -Wno-invalid-offsetof CXXFLAGS_EARLY += -Wno-invalid-offsetof
endif endif
ifeq (${TOOLCHAIN},gcc) ifeq (${TOOLCHAIN},gcc)
CXXFLAGS_STD = -std=c++11 CXXFLAGS_STD = -std=c++11
CXXFLAGS_EARLY += -march=native -fPIC CXXFLAGS_EARLY += -fPIC
CXXFLAGS_EARLY += -W -Wall -Wextra -Werror -pedantic CXXFLAGS_EARLY += -W -Wall -Wextra -pedantic
CXXFLAGS_EARLY += -Wno-unused-parameter -Wno-implicit-fallthrough -Wno-maybe-uninitialized CXXFLAGS_EARLY += -Wno-unused-parameter -Wno-implicit-fallthrough -Wno-maybe-uninitialized
CXXFLAGS_EARLY += -Wno-invalid-offsetof CXXFLAGS_EARLY += -Wno-invalid-offsetof
endif endif
ifeq (${TOOLCHAIN},mingw) ifeq (${TOOLCHAIN},mingw)
CXXFLAGS_STD = -std=c++11 CXXFLAGS_STD = -std=c++11
CXXFLAGS_EARLY += -march=native CXXFLAGS_EARLY += -W -Wall -Wextra
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
CXXFLAGS_EARLY += -Wno-invalid-offsetof CXXFLAGS_EARLY += -Wno-invalid-offsetof
endif endif