pmret/papermario
1
0
Fork 0
mirror of https://github.com/pmret/papermario.git synced 2024-11-08 12:02:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #92 from nanaian/warnings

Browse Source 
Updates to compiler/lint warnings
This commit is contained in:
Ethan Roseman 2020-10-21 17:19:18 -04:00 committed by GitHub
commit 66bc833880
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 26 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
.clang-tidy
View File

@ -1,2 +1,20 @@
Checks: '-*,clang-analyzer-core.*,clang-analyzer-deadcode.*,readability-*,-readability-magic-numbers,-readability-else-after-return,-readability-named-parameter,-readability-braces-around-statements,-readability-isolate-declaration,-readability-uppercase-literal-suffix,-readability-function-size,-readability-non-const-parameter'
HeaderFilterRegex: '(src|include)\/.*\.h'
Checks: '-*,clang-analyzer-core.*,clang-analyzer-deadcode.*,readability-*,-readability-magic-numbers,-readability-else-after-return,-readability-named-parameter,-readability-braces-around-statements,-readability-isolate-declaration,-readability-uppercase-literal-suffix,-readability-function-size,-readability-non-const-parameter,readability-identifier-naming'
CheckOptions:
- key: readability-identifier-naming.LocalVariableCase
value: camelBack
- key: readability-identifier-naming.ParameterCase
value: camelBack
- key: readability-identifier-naming.TypedefCase
value: CamelCase
# TODO: rename all unk_XXX members
#- key: readability-identifier-naming.MemberCase
# value: camelBack
# TODO: rename all D_XXXXXXXX symbols
#- key: readability-identifier-naming.GlobalVariableCase
# value: CamelCase
#- key: readability-identifier-naming.GlobalVariablePrefix
# value: g
HeaderFilterRegex: '(src|include)\/[^P].*\.h' # ignore inclue/PR/

5
Makefile
View File

@ -49,7 +49,7 @@ TARGET = papermario
CPPFLAGS = -Iinclude -Isrc -D _LANGUAGE_C -ffreestanding -DF3DEX_GBI_2
ASFLAGS = -EB -Iinclude -march=vr4300 -mtune=vr4300
OLDASFLAGS = -EB -Iinclude -G 0
CFLAGS = -O2 -quiet -G 0 -mcpu=vr4300 -mfix4300 -mips3 -mgp32 -mfp32
CFLAGS = -O2 -quiet -G 0 -mcpu=vr4300 -mfix4300 -mips3 -mgp32 -mfp32 -Wimplicit -Wuninitialized -Wshadow
LDFLAGS = -T undefined_syms.txt -T undefined_funcs.txt -T $(LD_SCRIPT) -Map $(BUILD_DIR)/papermario.map --no-check-sections
######################## Targets #############################
@ -65,6 +65,9 @@ all: $(TARGET).ld $(BUILD_DIR) $(TARGET).z64 verify
clean:
rm -rf $(BUILD_DIR) $(TARGET).z64
clean-code:
rm -rf $(BUILD_DIR)/src $(TARGET).z64
submodules:
git submodule update --init --recursive

1
include/macros.h
View File

@ -15,6 +15,7 @@
#define ASSERT(condition) if (!(condition)) { while (1) {} }
#define PANIC() ASSERT(0)
#define STATIC_ASSERT(condition) enum { static_assert_fail = 1/(!!(condition)) } // Causes division by zero ("not integer constant") if false
#define GAME_STATUS (*gGameStatusPtr)
#define PLAYER_STATUS (&gPlayerStatus)

2
include/script_api/common.h
View File

@ -4,7 +4,7 @@
#include "common_structs.h"
#include "si.h"
typedef Bytecode Script[];
typedef Bytecode Script[0];
ApiStatus FadeBackgroundToBlack(ScriptInstance* script, s32 isInitialCall);
ApiStatus UnfadeBackgroundFromBlack(ScriptInstance* script, s32 isInitialCall);