Skip to content

Commit c841672

Browse files
committed
Don't use tabs for alignment
1 parent 75b6057 commit c841672

File tree

2 files changed

+23
-24
lines changed

2 files changed

+23
-24
lines changed

CMakeLists.txt

+1-2
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,7 @@ else()
5959
add_compile_options(-Werror -Wextra
6060
-Walloc-zero -Wcast-align -Wcast-qual -Wduplicated-branches -Wduplicated-cond
6161
-Wfloat-equal -Wlogical-op -Wnull-dereference -Wold-style-cast -Wshift-overflow=2
62-
-Wstringop-overflow=4 -Wundef -Wuninitialized -Wunused
63-
-Wshadow # TODO: -Wshadow=compatible-local?
62+
-Wstringop-overflow=4 -Wtrampolines -Wundef -Wuninitialized -Wunused -Wshadow
6463
-Wformat=2 -Wformat-overflow=2 -Wformat-truncation=1
6564
-Wno-format-nonliteral -Wno-strict-overflow
6665
-Wno-unused-but-set-variable # bison's `yynerrs_` is incremented but unused

Makefile

+22-22
Original file line numberDiff line numberDiff line change
@@ -7,43 +7,43 @@
77

88
# User-defined variables
99

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
1818

1919
# Other variables
2020

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`
2525

2626
# 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`
2828

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
3030

3131
# Overridable CXXFLAGS
32-
CXXFLAGS ?= -O3 -flto -DNDEBUG
32+
CXXFLAGS ?= -O3 -flto -DNDEBUG
3333
# 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
3535
# Overridable LDFLAGS
36-
LDFLAGS ?=
36+
LDFLAGS ?=
3737
# Non-overridable LDFLAGS
38-
REALLDFLAGS := ${LDFLAGS} ${WARNFLAGS} -DBUILD_VERSION_STRING=\"${VERSION_STRING}\"
38+
REALLDFLAGS := ${LDFLAGS} ${WARNFLAGS} -DBUILD_VERSION_STRING=\"${VERSION_STRING}\"
3939

4040
# Wrapper around bison that passes flags depending on what the version supports
41-
BISON := src/bison.sh
41+
BISON := src/bison.sh
4242

43-
RM := rm -rf
43+
RM := rm -rf
4444

4545
# Used for checking pull requests
46-
BASE_REF := origin/master
46+
BASE_REF := origin/master
4747

4848
# Rules to build the RGBDS binaries
4949

@@ -202,7 +202,7 @@ develop:
202202
$Q${MAKE} WARNFLAGS="${WARNFLAGS} -Werror -Wextra \
203203
-Walloc-zero -Wcast-align -Wcast-qual -Wduplicated-branches -Wduplicated-cond \
204204
-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 \
206206
-Wformat=2 -Wformat-overflow=2 -Wformat-truncation=1 \
207207
-Wno-format-nonliteral -Wno-strict-overflow -Wno-unused-but-set-variable \
208208
-Wno-type-limits -Wno-tautological-constant-out-of-range-compare -Wvla \

0 commit comments

Comments
 (0)