mirror of
https://github.com/zenorogue/hyperrogue.git
synced 2024-12-19 15:20:27 +00:00
Merge branch 'master' of https://github.com/zenorogue/hyperrogue
This commit is contained in:
commit
b3a394c266
1
.github/workflows/build.sh
vendored
1
.github/workflows/build.sh
vendored
@ -17,6 +17,7 @@ fi
|
||||
|
||||
export CC=$GH_COMPILER
|
||||
export CXX=${CC%cc}++
|
||||
export CXXFLAGS_EARLY=-Werror
|
||||
|
||||
if [[ "$GH_BUILDSYS" == "makefile" ]]; then
|
||||
make
|
||||
|
@ -162,6 +162,7 @@ script:
|
||||
fi
|
||||
- |-
|
||||
# Build hyperrogue.
|
||||
export CXXFLAGS_EARLY=-Werror
|
||||
if [[ "$TRAVIS_BUILD_SYSTEM" == "Makefile" ]]; then
|
||||
make
|
||||
elif [[ "$TRAVIS_BUILD_SYSTEM" == "mymake" ]]; then
|
||||
|
11
Makefile
11
Makefile
@ -81,24 +81,23 @@ endif
|
||||
|
||||
ifeq (${TOOLCHAIN},clang)
|
||||
CXXFLAGS_STD = -std=c++11
|
||||
CXXFLAGS_EARLY += -march=native -fPIC
|
||||
CXXFLAGS_EARLY += -W -Wall -Wextra -Wsuggest-override -Werror -pedantic
|
||||
CXXFLAGS_EARLY += -fPIC
|
||||
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-invalid-offsetof
|
||||
endif
|
||||
|
||||
ifeq (${TOOLCHAIN},gcc)
|
||||
CXXFLAGS_STD = -std=c++11
|
||||
CXXFLAGS_EARLY += -march=native -fPIC
|
||||
CXXFLAGS_EARLY += -W -Wall -Wextra -Werror -pedantic
|
||||
CXXFLAGS_EARLY += -fPIC
|
||||
CXXFLAGS_EARLY += -W -Wall -Wextra -pedantic
|
||||
CXXFLAGS_EARLY += -Wno-unused-parameter -Wno-implicit-fallthrough -Wno-maybe-uninitialized
|
||||
CXXFLAGS_EARLY += -Wno-invalid-offsetof
|
||||
endif
|
||||
|
||||
ifeq (${TOOLCHAIN},mingw)
|
||||
CXXFLAGS_STD = -std=c++11
|
||||
CXXFLAGS_EARLY += -march=native
|
||||
CXXFLAGS_EARLY += -W -Wall -Wextra -Werror
|
||||
CXXFLAGS_EARLY += -W -Wall -Wextra
|
||||
CXXFLAGS_EARLY += -Wno-unused-parameter -Wno-implicit-fallthrough -Wno-maybe-uninitialized
|
||||
CXXFLAGS_EARLY += -Wno-invalid-offsetof
|
||||
endif
|
||||
|
Loading…
Reference in New Issue
Block a user