diff options
| author | martmists <mail@martmists.com> | 2020-04-21 20:52:34 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-21 20:52:34 +0200 |
| commit | 158e3c19b27a31ca11c1bd158fe74f2a45967dc1 (patch) | |
| tree | a915dde98654f569e22dc4504122f472d35aa1a8 | |
| parent | e75843a08471a1212bee05e8df9a6c804fbf248b (diff) | |
| parent | 60afa5c0b4ec79efa583540f078ccd3fbd09f155 (diff) | |
Merge pull request #18 from red031000/master
simplify includes
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | src/script.c | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -79,7 +79,7 @@ OBJCOPY := $(CROSS)objcopy # ./tools/mwccarm/2.0/base/mwasmarm.exe -proc arm5te asm/arm9_thumb.s -o arm9.o ASFLAGS = -proc arm5te -CFLAGS = -O4,p -proc v5te -thumb -fp soft -lang c99 -Cpp_exceptions off -i nitro -ir include +CFLAGS = -O4,p -proc v5te -thumb -fp soft -lang c99 -Cpp_exceptions off -ir include LDFLAGS = -map -nodead -w off -proc v5te -interworking -map -symtab -m Entry ####################### Other Tools ######################### diff --git a/src/script.c b/src/script.c index 0a9a85cf..7a7ae894 100644 --- a/src/script.c +++ b/src/script.c @@ -1,4 +1,4 @@ -#include "nitro.h"
+#include "global.h"
#include "script.h"
u16 ScriptReadHalfword(struct ScriptContext *ctx);
|