|
7 | 7 |
|
8 | 8 | # User-defined variables
|
9 | 9 |
|
10 |
| -Q := @ |
11 |
| -PREFIX := /usr/local |
12 |
| -bindir := ${PREFIX}/bin |
13 |
| -mandir := ${PREFIX}/share/man |
14 |
| -SUFFIX := |
15 |
| -STRIP := -s |
16 |
| -BINMODE := 755 |
17 |
| -MANMODE := 644 |
| 10 | +Q := @ |
| 11 | +PREFIX := /usr/local |
| 12 | +bindir := ${PREFIX}/bin |
| 13 | +mandir := ${PREFIX}/share/man |
| 14 | +SUFFIX := |
| 15 | +STRIP := -s |
| 16 | +BINMODE := 755 |
| 17 | +MANMODE := 644 |
18 | 18 |
|
19 | 19 | # Other variables
|
20 | 20 |
|
21 |
| -PKG_CONFIG := pkg-config |
22 |
| -PNGCFLAGS := `${PKG_CONFIG} --cflags libpng` |
23 |
| -PNGLDFLAGS := `${PKG_CONFIG} --libs-only-L libpng` |
24 |
| -PNGLDLIBS := `${PKG_CONFIG} --libs-only-l libpng` |
| 21 | +PKG_CONFIG := pkg-config |
| 22 | +PNGCFLAGS := `${PKG_CONFIG} --cflags libpng` |
| 23 | +PNGLDFLAGS := `${PKG_CONFIG} --libs-only-L libpng` |
| 24 | +PNGLDLIBS := `${PKG_CONFIG} --libs-only-l libpng` |
25 | 25 |
|
26 | 26 | # Note: if this comes up empty, `version.cpp` will automatically fall back to last release number
|
27 |
| -VERSION_STRING := `git --git-dir=.git -c safe.directory='*' describe --tags --dirty --always 2>/dev/null` |
| 27 | +VERSION_STRING := `git --git-dir=.git -c safe.directory='*' describe --tags --dirty --always 2>/dev/null` |
28 | 28 |
|
29 |
| -WARNFLAGS := -Wall -pedantic -Wno-unknown-warning-option -Wno-gnu-zero-variadic-macro-arguments |
| 29 | +WARNFLAGS := -Wall -pedantic -Wno-unknown-warning-option -Wno-gnu-zero-variadic-macro-arguments |
30 | 30 |
|
31 | 31 | # Overridable CXXFLAGS
|
32 |
| -CXXFLAGS ?= -O3 -flto -DNDEBUG |
| 32 | +CXXFLAGS ?= -O3 -flto -DNDEBUG |
33 | 33 | # Non-overridable CXXFLAGS
|
34 |
| -REALCXXFLAGS := ${CXXFLAGS} ${WARNFLAGS} -std=c++2a -I include -fno-exceptions -fno-rtti |
| 34 | +REALCXXFLAGS := ${CXXFLAGS} ${WARNFLAGS} -std=c++2a -I include -fno-exceptions -fno-rtti |
35 | 35 | # Overridable LDFLAGS
|
36 |
| -LDFLAGS ?= |
| 36 | +LDFLAGS ?= |
37 | 37 | # Non-overridable LDFLAGS
|
38 |
| -REALLDFLAGS := ${LDFLAGS} ${WARNFLAGS} -DBUILD_VERSION_STRING=\"${VERSION_STRING}\" |
| 38 | +REALLDFLAGS := ${LDFLAGS} ${WARNFLAGS} -DBUILD_VERSION_STRING=\"${VERSION_STRING}\" |
39 | 39 |
|
40 | 40 | # Wrapper around bison that passes flags depending on what the version supports
|
41 |
| -BISON := src/bison.sh |
| 41 | +BISON := src/bison.sh |
42 | 42 |
|
43 |
| -RM := rm -rf |
| 43 | +RM := rm -rf |
44 | 44 |
|
45 | 45 | # Used for checking pull requests
|
46 |
| -BASE_REF := origin/master |
| 46 | +BASE_REF := origin/master |
47 | 47 |
|
48 | 48 | # Rules to build the RGBDS binaries
|
49 | 49 |
|
@@ -202,7 +202,7 @@ develop:
|
202 | 202 | $Q${MAKE} WARNFLAGS="${WARNFLAGS} -Werror -Wextra \
|
203 | 203 | -Walloc-zero -Wcast-align -Wcast-qual -Wduplicated-branches -Wduplicated-cond \
|
204 | 204 | -Wfloat-equal -Wlogical-op -Wnull-dereference -Wold-style-cast -Wshift-overflow=2 \
|
205 |
| - -Wstringop-overflow=4 -Wundef -Wuninitialized -Wunused -Wshadow \ |
| 205 | + -Wstringop-overflow=4 -Wtrampolines -Wundef -Wuninitialized -Wunused -Wshadow \ |
206 | 206 | -Wformat=2 -Wformat-overflow=2 -Wformat-truncation=1 \
|
207 | 207 | -Wno-format-nonliteral -Wno-strict-overflow -Wno-unused-but-set-variable \
|
208 | 208 | -Wno-type-limits -Wno-tautological-constant-out-of-range-compare -Wvla \
|
|
0 commit comments