summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile2
-rw-r--r--include/party_menu.h6
-rw-r--r--src/battle_anim_80A7E7C.c117
-rw-r--r--src/fldeff_softboiled.c31
-rw-r--r--src/strings.c4
-rw-r--r--tools/aif2pcm/Makefile2
-rw-r--r--tools/bin2c/Makefile2
-rw-r--r--tools/gbagfx/Makefile2
-rw-r--r--tools/gbagfx/main.c7
-rw-r--r--tools/mid2agb/Makefile2
-rw-r--r--tools/preproc/Makefile2
-rw-r--r--tools/ramscrgen/Makefile2
-rw-r--r--tools/rsfont/Makefile2
-rw-r--r--tools/scaninc/Makefile2
14 files changed, 84 insertions, 99 deletions
diff --git a/Makefile b/Makefile
index 68fa2ddbc..c8482e7c7 100644
--- a/Makefile
+++ b/Makefile
@@ -7,7 +7,7 @@ CC1 := tools/agbcc/bin/agbcc
override CFLAGS += -mthumb-interwork -Wimplicit -Wparentheses -Wunused -Werror -O2 -fhex-asm
CPP := $(DEVKITARM)/bin/arm-none-eabi-cpp
-CPPFLAGS := -I tools/agbcc/include -iquote include -nostdinc -undef
+CPPFLAGS := -I tools/agbcc/include -iquote include -nostdinc -undef -Werror
LD := $(DEVKITARM)/bin/arm-none-eabi-ld
diff --git a/include/party_menu.h b/include/party_menu.h
index 58292081f..9ce476869 100644
--- a/include/party_menu.h
+++ b/include/party_menu.h
@@ -43,10 +43,14 @@ struct Struct201B000
u8 unk259;
u8 filler25A[6];
u8 unk260;
- u8 filler261[1];
+ u8 unk261;
u8 unk262;
s16 unk264;
s16 unk266;
+ u8 filler268[10];
+ u16 unk272;
+ u8 filler274[14];
+ u16 unk282;
};
extern u8 ewram[];
diff --git a/src/battle_anim_80A7E7C.c b/src/battle_anim_80A7E7C.c
index 34c11a352..31984977f 100644
--- a/src/battle_anim_80A7E7C.c
+++ b/src/battle_anim_80A7E7C.c
@@ -5,7 +5,6 @@
#include "task.h"
#include "trig.h"
-#define TASK gTasks[task]
#define SPRITE gSprites[TASK.data[0]]
extern s16 gBattleAnimArgs[8];
@@ -16,29 +15,29 @@ extern u16 gMovePowerMoveAnim;
extern u8 gBattleAnimPlayerMonIndex;
extern u8 gBattleAnimEnemyMonIndex;
-static void sub_80A7EF0(u8 task);
-static void sub_80A808C(u8 task);
-static void sub_80A81D8(u8 task);
-static void sub_80A8374(u8 task);
-static void sub_80A8488(u8 task);
+static void sub_80A7EF0(u8 taskId);
+static void sub_80A808C(u8 taskId);
+static void sub_80A81D8(u8 taskId);
+static void sub_80A8374(u8 taskId);
+static void sub_80A8488(u8 taskId);
static void sub_80A85A4(struct Sprite *sprite);
void sub_80A8614(struct Sprite* sprite);
static void sub_80A86F4(struct Sprite *sprite);
static void sub_80A88F0(struct Sprite *sprite);
-static void sub_80A89B4(u8 task);
-static void sub_80A8A18(u8 task);
-static void sub_80A8C0C(u8 task);
-static void sub_80A8D8C(u8 task);
-void sub_80A8FD8(u8 task);
+static void sub_80A89B4(u8 taskId);
+static void sub_80A8A18(u8 taskId);
+static void sub_80A8C0C(u8 taskId);
+static void sub_80A8D8C(u8 taskId);
+void sub_80A8FD8(u8 taskId);
static void sub_80A913C(u8 taskId);
-void sub_80A7E7C(u8 task)
+void sub_80A7E7C(u8 taskId)
{
u8 sprite;
sprite = obj_id_for_side_relative_to_move(gBattleAnimArgs[0]);
if (sprite == 0xff)
{
- DestroyAnimVisualTask(task);
+ DestroyAnimVisualTask(taskId);
return;
}
gSprites[sprite].pos2.x = gBattleAnimArgs[1];
@@ -50,10 +49,10 @@ void sub_80A7E7C(u8 task)
TASK.data[4] = gBattleAnimArgs[1];
TASK.data[5] = gBattleAnimArgs[2];
TASK.func = sub_80A7EF0;
- sub_80A7EF0(task);
+ sub_80A7EF0(taskId);
}
-static void sub_80A7EF0(u8 task)
+static void sub_80A7EF0(u8 taskId)
{
if (TASK.data[3] == 0)
{
@@ -78,7 +77,7 @@ static void sub_80A7EF0(u8 task)
{
SPRITE.pos2.x = 0;
SPRITE.pos2.y = 0;
- DestroyAnimVisualTask(task);
+ DestroyAnimVisualTask(taskId);
return;
}
}
@@ -89,7 +88,7 @@ static void sub_80A7EF0(u8 task)
}
-void sub_80A7FA0(u8 task)
+void sub_80A7FA0(u8 taskId)
{
u8 sprite;
bool8 r6;
@@ -100,7 +99,7 @@ void sub_80A7FA0(u8 task)
sprite = obj_id_for_side_relative_to_move(gBattleAnimArgs[0]);
if (sprite == 0xff)
{
- DestroyAnimVisualTask(task);
+ DestroyAnimVisualTask(taskId);
return;
}
}
@@ -134,7 +133,7 @@ void sub_80A7FA0(u8 task)
}
if (r6)
{
- DestroyAnimVisualTask(task);
+ DestroyAnimVisualTask(taskId);
return;
}
gSprites[sprite].pos2.x = gBattleAnimArgs[1];
@@ -146,10 +145,10 @@ void sub_80A7FA0(u8 task)
TASK.data[4] = gBattleAnimArgs[1];
TASK.data[5] = gBattleAnimArgs[2];
TASK.func = sub_80A808C;
- sub_80A808C(task);
+ sub_80A808C(taskId);
}
-static void sub_80A808C(u8 task)
+static void sub_80A808C(u8 taskId)
{
if (TASK.data[3] == 0)
{
@@ -174,7 +173,7 @@ static void sub_80A808C(u8 task)
{
SPRITE.pos2.x = 0;
SPRITE.pos2.y = 0;
- DestroyAnimVisualTask(task);
+ DestroyAnimVisualTask(taskId);
return;
}
}
@@ -184,13 +183,13 @@ static void sub_80A808C(u8 task)
}
}
-void sub_80A8154(u8 task)
+void sub_80A8154(u8 taskId)
{
u8 sprite;
sprite = obj_id_for_side_relative_to_move(gBattleAnimArgs[0]);
if (sprite == 0xff)
{
- DestroyAnimVisualTask(task);
+ DestroyAnimVisualTask(taskId);
return;
}
gSprites[sprite].pos2.x += gBattleAnimArgs[1];
@@ -203,10 +202,10 @@ void sub_80A8154(u8 task)
TASK.data[5] = gBattleAnimArgs[1] * 2;
TASK.data[6] = gBattleAnimArgs[2] * 2;
TASK.func = sub_80A81D8;
- sub_80A81D8(task);
+ sub_80A81D8(taskId);
}
-static void sub_80A81D8(u8 task)
+static void sub_80A81D8(u8 taskId)
{
if (TASK.data[3] == 0)
{
@@ -233,7 +232,7 @@ static void sub_80A81D8(u8 task)
SPRITE.pos2.x -= TASK.data[5] / 2;
SPRITE.pos2.y -= TASK.data[6] / 2;
}
- DestroyAnimVisualTask(task);
+ DestroyAnimVisualTask(taskId);
return;
}
}
@@ -243,7 +242,7 @@ static void sub_80A81D8(u8 task)
}
}
-void sub_80A8314(u8 task)
+void sub_80A8314(u8 taskId)
{
u8 sprite = obj_id_for_side_relative_to_move(gBattleAnimArgs[0]);
gSprites[sprite].pos2.x = gBattleAnimArgs[1];
@@ -253,10 +252,10 @@ void sub_80A8314(u8 task)
TASK.data[3] = gBattleAnimArgs[3];
TASK.data[4] = gBattleAnimArgs[4];
TASK.func = sub_80A8374;
- sub_80A8374(task);
+ sub_80A8374(taskId);
}
-static void sub_80A8374(u8 task)
+static void sub_80A8374(u8 taskId)
{
s16 x;
u8 sprite;
@@ -276,12 +275,12 @@ static void sub_80A8374(u8 task)
gSprites[sprite].pos2.y = TASK.data[9] >> 8;
if (--TASK.data[4] == 0)
{
- DestroyAnimVisualTask(task);
+ DestroyAnimVisualTask(taskId);
return;
}
}
-void sub_80A8408(u8 task)
+void sub_80A8408(u8 taskId)
{
u8 i;
u8 sprite;
@@ -302,10 +301,10 @@ void sub_80A8408(u8 task)
TASK.data[3] = gBattleAnimArgs[3];
TASK.data[4] = v1;
TASK.func = sub_80A8488;
- sub_80A8488(task);
+ sub_80A8488(taskId);
}
-static void sub_80A8488(u8 task)
+static void sub_80A8488(u8 taskId)
{
u8 sprite;
sprite = TASK.data[0];
@@ -322,18 +321,18 @@ static void sub_80A8488(u8 task)
{
gSprites[sprite].pos2.x = 0;
gSprites[sprite].pos2.y = 0;
- DestroyAnimVisualTask(task);
+ DestroyAnimVisualTask(taskId);
return;
}
}
-void sub_80A8500(u8 task)
+void sub_80A8500(u8 taskId)
{
if (GetBankSide(gBattleAnimPlayerMonIndex))
{
gBattleAnimArgs[1] = -gBattleAnimArgs[1];
}
- sub_80A8408(task);
+ sub_80A8408(taskId);
}
void sub_80A8530(struct Sprite *sprite)
@@ -538,7 +537,7 @@ static void sub_80A88F0(struct Sprite *sprite)
move_anim_8072740(sprite);
}
-void sub_80A8920(u8 task)
+void sub_80A8920(u8 taskId)
{
s16 r7;
r7 = 0x8000 / gBattleAnimArgs[3];
@@ -558,7 +557,7 @@ void sub_80A8920(u8 task)
TASK.func = sub_80A89B4;
}
-static void sub_80A89B4(u8 task)
+static void sub_80A89B4(u8 taskId)
{
u8 spriteId;
spriteId = TASK.data[0];
@@ -572,7 +571,7 @@ static void sub_80A89B4(u8 task)
}
}
-static void sub_80A8A18(u8 task)
+static void sub_80A8A18(u8 taskId)
{
u8 spriteId;
if (TASK.data[4] > 0)
@@ -586,15 +585,15 @@ static void sub_80A8A18(u8 task)
gSprites[spriteId].pos2.x = (TASK.data[12] >> 8) + (TASK.data[11] >> 8);
if (--TASK.data[6] == 0)
{
- DestroyAnimVisualTask(task);
+ DestroyAnimVisualTask(taskId);
return;
}
}
}
-static void sub_80A8B3C(u8 task);
+static void sub_80A8B3C(u8 taskId);
-void sub_80A8A80(u8 task)
+void sub_80A8A80(u8 taskId)
{
u8 spriteId;
switch (gBattleAnimArgs[0])
@@ -606,7 +605,7 @@ void sub_80A8A80(u8 task)
case 2:
if (!b_side_obj__get_some_boolean(gBattleAnimPlayerMonIndex ^ 2))
{
- DestroyAnimVisualTask(task);
+ DestroyAnimVisualTask(taskId);
return;
}
spriteId = gObjectBankIDs[gBattleAnimPlayerMonIndex ^ 2];
@@ -614,13 +613,13 @@ void sub_80A8A80(u8 task)
case 3:
if (!b_side_obj__get_some_boolean(gBattleAnimEnemyMonIndex ^ 2))
{
- DestroyAnimVisualTask(task);
+ DestroyAnimVisualTask(taskId);
return;
}
spriteId = gObjectBankIDs[gBattleAnimEnemyMonIndex ^ 2];
break;
default:
- DestroyAnimVisualTask(task);
+ DestroyAnimVisualTask(taskId);
return;
}
TASK.data[0] = spriteId;
@@ -635,18 +634,18 @@ void sub_80A8A80(u8 task)
TASK.func = sub_80A8B3C;
}
-static void sub_80A8B3C(u8 task)
+static void sub_80A8B3C(u8 taskId)
{
u8 spriteId = TASK.data[0];
gSprites[spriteId].pos2.x += TASK.data[1];
if (gSprites[spriteId].pos2.x + gSprites[spriteId].pos1.x + 0x20 > 0x130u)
{
- DestroyAnimVisualTask(task);
+ DestroyAnimVisualTask(taskId);
return;
}
}
-void sub_80A8B88(u8 task)
+void sub_80A8B88(u8 taskId)
{
u8 spriteId;
if (GetBankSide(gBattleAnimPlayerMonIndex))
@@ -671,7 +670,7 @@ void sub_80A8B88(u8 task)
TASK.func = sub_80A8C0C;
}
-static void sub_80A8C0C(u8 task)
+static void sub_80A8C0C(u8 taskId)
{
s16 y;
u8 spriteId;
@@ -706,13 +705,13 @@ static void sub_80A8C0C(u8 task)
{
gSprites[spriteId].pos2.x = 0;
gSprites[spriteId].pos2.y = 0;
- DestroyAnimVisualTask(task);
+ DestroyAnimVisualTask(taskId);
return;
}
}
}
-void sub_80A8D34(u8 task)
+void sub_80A8D34(u8 taskId)
{
u8 spriteId;
spriteId = obj_id_for_side_relative_to_move(gBattleAnimArgs[3]);
@@ -727,7 +726,7 @@ void sub_80A8D34(u8 task)
TASK.func = sub_80A8D8C;
}
-static void sub_80A8D8C(u8 task)
+static void sub_80A8D8C(u8 taskId)
{
u8 spriteId;
TASK.data[10] += TASK.data[0];
@@ -746,13 +745,13 @@ static void sub_80A8D8C(u8 task)
else
{
sub_8078F40(spriteId);
- DestroyAnimVisualTask(task);
+ DestroyAnimVisualTask(taskId);
return;
}
}
}
-void sub_80A8E04(u8 task)
+void sub_80A8E04(u8 taskId)
{
u8 spriteId;
spriteId = obj_id_for_side_relative_to_move(gBattleAnimArgs[2]);
@@ -796,7 +795,7 @@ void sub_80A8E04(u8 task)
TASK.func = sub_80A8FD8;
}
-void sub_80A8EFC(u8 task)
+void sub_80A8EFC(u8 taskId)
{
u8 spriteId;
spriteId = obj_id_for_side_relative_to_move(gBattleAnimArgs[2]);
@@ -834,7 +833,7 @@ void sub_80A8EFC(u8 task)
TASK.func = sub_80A8FD8;
}
-void sub_80A8FD8(u8 task)
+void sub_80A8FD8(u8 taskId)
{
TASK.data[3] += TASK.data[4];
obj_id_set_rotscale(TASK.data[5], 0x100, 0x100, TASK.data[3]);
@@ -850,7 +849,7 @@ void sub_80A8FD8(u8 task)
sub_8078F40(TASK.data[5]);
case 0:
default:
- DestroyAnimVisualTask(task);
+ DestroyAnimVisualTask(taskId);
return;
case 2:
TASK.data[1] = 0;
@@ -861,7 +860,7 @@ void sub_80A8FD8(u8 task)
}
}
-void sub_80A9058(u8 task)
+void sub_80A9058(u8 taskId)
{
if (!gBattleAnimArgs[0])
{
diff --git a/src/fldeff_softboiled.c b/src/fldeff_softboiled.c
index 45f319c62..cb26d9966 100644
--- a/src/fldeff_softboiled.c
+++ b/src/fldeff_softboiled.c
@@ -10,22 +10,7 @@
#include "strings.h"
#include "task.h"
-struct UnknownStruct1 {
- u8 filler0[0x259];
- u8 unk259;
- u8 filler25A[6];
- u8 unk260;
- u8 unk261;
- u8 unk262;
- s16 unk264;
- s16 unk266;
- u8 filler268[10];
- u16 unk272;
- u8 filler274[14];
- u16 unk282;
-};
-
-struct UnknownStruct2 {
+struct Struct2001000 {
u8 unk0;
u8 unk1;
u8 unk2;
@@ -33,7 +18,7 @@ struct UnknownStruct2 {
void *unkC;
};
-struct UnknownStruct3 {
+struct Struct201C000 {
struct Pokemon *unk0;
u8 filler4[1];
u8 unk5;
@@ -53,9 +38,9 @@ struct UnknownStruct3 {
#define WINDOW_RIGHT 29
#endif
-#define EWRAM_1000 (*(struct UnknownStruct2 *)(unk_2000000 + 0x1000))
-#define EWRAM_1B000 (*(struct UnknownStruct1 *)(unk_2000000 + 0x1B000))
-#define EWRAM_1C000 (*(struct UnknownStruct3 *)(unk_2000000 + 0x1C000))
+#define EWRAM_1000 (*(struct Struct2001000 *)(unk_2000000 + 0x1000))
+#define EWRAM_1B000_2 (*(struct Struct201B000 *)(unk_2000000 + 0x1B000))
+#define EWRAM_1C000 (*(struct Struct201C000 *)(unk_2000000 + 0x1C000))
// extern
extern u8 gUnknown_0202E8F6;
@@ -89,7 +74,7 @@ bool8 SetUpFieldMove_SoftBoiled(void) {
void sub_8133D28(u8 taskid) {
EWRAM_1000.unkC = sub_8133D50;
- EWRAM_1B000.unk272 = 3;
+ EWRAM_1B000_2.unk272 = 3;
sub_808A004(taskid);
}
@@ -137,7 +122,7 @@ static void sub_8133D50(u8 taskId) {
sub_806D5A4();
gTasks[taskId].func = sub_806FA18;
- EWRAM_1B000.unk282 = gTasks[taskId].data[11];
+ EWRAM_1B000_2.unk282 = gTasks[taskId].data[11];
}
static void sub_8133E74(u8 taskId) {
@@ -160,7 +145,7 @@ static void sub_8133EB8(u8 taskId) {
static void sub_8133EF8(void) {
sub_806CCE4();
- EWRAM_1B000.unk261 = 2;
+ EWRAM_1B000_2.unk261 = 2;
DestroySprite(&gSprites[EWRAM_1000.unk1]);
MenuZeroFillWindowRect(WINDOW_LEFT, 14, WINDOW_RIGHT, 19);
sub_806D538(0, 0);
diff --git a/src/strings.c b/src/strings.c
index 6c605b075..219c5bec1 100644
--- a/src/strings.c
+++ b/src/strings.c
@@ -976,7 +976,7 @@ const u8 gBirchText_Girl[] = _("MÄDEL");
const u8 gBirchText_NewName[] = _("NEUER NAME");
#ifdef SAPPHIRE
-const u8 gDefaultBoyName1[] = _("SEAN");
+const u8 gDefaultBoyName1[] = _("SEBOLD");
#else
const u8 gDefaultBoyName1[] = _("ROLAND");
#endif
@@ -985,7 +985,7 @@ const u8 gDefaultBoyName3[] = _("HELGE");
const u8 gDefaultBoyName4[] = _("JAN");
#ifdef SAPPHIRE
-const u8 gDefaultGirlName1[] = _("MARINA");
+const u8 gDefaultGirlName1[] = _("MARTINA");
#else
const u8 gDefaultGirlName1[] = _("PETRA");
#endif
diff --git a/tools/aif2pcm/Makefile b/tools/aif2pcm/Makefile
index 611c0e2df..967930c59 100644
--- a/tools/aif2pcm/Makefile
+++ b/tools/aif2pcm/Makefile
@@ -1,6 +1,6 @@
CC = gcc
-CFLAGS = -Wall -Wextra -Wno-switch -std=c11 -O2 -s
+CFLAGS = -Wall -Wextra -Wno-switch -Werror -std=c11 -O2 -s
LIBS = -lm
diff --git a/tools/bin2c/Makefile b/tools/bin2c/Makefile
index bd5f60490..4cc23a25a 100644
--- a/tools/bin2c/Makefile
+++ b/tools/bin2c/Makefile
@@ -1,6 +1,6 @@
CC = gcc
-CFLAGS = -Wall -Wextra -std=c11 -O2 -s
+CFLAGS = -Wall -Wextra -Werror -std=c11 -O2 -s
.PHONY: clean
diff --git a/tools/gbagfx/Makefile b/tools/gbagfx/Makefile
index 9a5dee1cc..d791dabb5 100644
--- a/tools/gbagfx/Makefile
+++ b/tools/gbagfx/Makefile
@@ -1,6 +1,6 @@
CC = gcc
-CFLAGS = -Wall -Wextra -std=c11 -O2 -s -DPNG_SKIP_SETJMP_CHECK
+CFLAGS = -Wall -Wextra -Werror -std=c11 -O2 -s -DPNG_SKIP_SETJMP_CHECK
LIBS = -lpng -lz
diff --git a/tools/gbagfx/main.c b/tools/gbagfx/main.c
index 0624201df..37d3441fe 100644
--- a/tools/gbagfx/main.c
+++ b/tools/gbagfx/main.c
@@ -59,8 +59,7 @@ void HandleGbaToPngCommand(char *inputPath, char *outputPath, int argc, char **a
{
char *inputFileExtension = GetFileExtension(inputPath);
int bitDepth = inputFileExtension[0] - '0';
- char *paletteFilePath;
- bool hasPalette = false;
+ char *paletteFilePath = NULL;
bool hasTransparency = false;
int width = 1;
@@ -76,8 +75,6 @@ void HandleGbaToPngCommand(char *inputPath, char *outputPath, int argc, char **a
i++;
paletteFilePath = argv[i];
-
- hasPalette = true;
}
else if (strcmp(option, "-object") == 0)
{
@@ -102,7 +99,7 @@ void HandleGbaToPngCommand(char *inputPath, char *outputPath, int argc, char **a
}
}
- ConvertGbaToPng(inputPath, outputPath, width, bitDepth, hasPalette ? paletteFilePath : NULL, hasTransparency);
+ ConvertGbaToPng(inputPath, outputPath, width, bitDepth, paletteFilePath, hasTransparency);
}
void HandlePngToGbaCommand(char *inputPath, char *outputPath, int argc, char **argv)
diff --git a/tools/mid2agb/Makefile b/tools/mid2agb/Makefile
index accd81882..f27f2cad4 100644
--- a/tools/mid2agb/Makefile
+++ b/tools/mid2agb/Makefile
@@ -1,6 +1,6 @@
CXX := g++
-CXXFLAGS := -std=c++11 -O2 -s -Wall -Wno-switch
+CXXFLAGS := -std=c++11 -O2 -s -Wall -Wno-switch -Werror
SRCS := agb.cpp error.cpp main.cpp midi.cpp tables.cpp
diff --git a/tools/preproc/Makefile b/tools/preproc/Makefile
index 1f4c58e21..ec4a5f365 100644
--- a/tools/preproc/Makefile
+++ b/tools/preproc/Makefile
@@ -1,6 +1,6 @@
CXX := g++
-CXXFLAGS := -std=c++11 -O2 -s -Wall -Wno-switch
+CXXFLAGS := -std=c++11 -O2 -s -Wall -Wno-switch -Werror
SRCS := asm_file.cpp c_file.cpp charmap.cpp preproc.cpp string_parser.cpp \
utf8.cpp
diff --git a/tools/ramscrgen/Makefile b/tools/ramscrgen/Makefile
index 6c4ca28b6..cc6d458ba 100644
--- a/tools/ramscrgen/Makefile
+++ b/tools/ramscrgen/Makefile
@@ -1,6 +1,6 @@
CXX := g++
-CXXFLAGS := -std=c++11 -O2 -s -Wall -Wno-switch
+CXXFLAGS := -std=c++11 -O2 -s -Wall -Wno-switch -Werror
SRCS := main.cpp sym_file.cpp elf.cpp
diff --git a/tools/rsfont/Makefile b/tools/rsfont/Makefile
index 544954bfc..a78beca50 100644
--- a/tools/rsfont/Makefile
+++ b/tools/rsfont/Makefile
@@ -1,6 +1,6 @@
CC = gcc
-CFLAGS = -Wall -Wextra -std=c11 -O2 -s -DPNG_SKIP_SETJMP_CHECK
+CFLAGS = -Wall -Wextra -Werror -std=c11 -O2 -s -DPNG_SKIP_SETJMP_CHECK
LIBS = -lpng -lz
diff --git a/tools/scaninc/Makefile b/tools/scaninc/Makefile
index d33dee6d2..3e1c031a8 100644
--- a/tools/scaninc/Makefile
+++ b/tools/scaninc/Makefile
@@ -1,6 +1,6 @@
CXX = g++
-CXXFLAGS = -Wall -std=c++11 -O2 -s
+CXXFLAGS = -Wall -Werror -std=c++11 -O2 -s
SRCS = scaninc.cpp c_file.cpp asm_file.cpp