diff options
| author | Devin <easyaspi314@users.noreply.github.com> | 2018-01-21 15:22:49 -0500 |
|---|---|---|
| committer | Devin <easyaspi314@users.noreply.github.com> | 2018-01-21 15:22:49 -0500 |
| commit | 26624e24143f24dcc342e78dd1aaaf1a068e4c9e (patch) | |
| tree | fcf30dfee0451784d2a0ac2485f05587e98d83f4 | |
| parent | 35cc20c9aa5a37f03bc0bf46bc31398aecda7bf6 (diff) | |
| parent | eec225e983a62ff2241f84ae7077650233a197c8 (diff) | |
Merge branch 'master' of https://github.com/pret/pokeemerald into fix_perms
| -rw-r--r-- | Makefile | 5 | ||||
| -rw-r--r-- | include/global.h | 14 |
2 files changed, 12 insertions, 7 deletions
@@ -30,8 +30,7 @@ LDFLAGS = -Map ../../$(MAP) OBJCOPY := $(DEVKITARM)/bin/arm-none-eabi-objcopy -LIBGCC := tools/agbcc/lib/libgcc.a -LIBC := tools/agbcc/lib/libc.a +LIB := -L ../../tools/agbcc/lib -lgcc -lc SHA1 := sha1sum -c @@ -163,7 +162,7 @@ $(OBJ_DIR)/ld_script.ld: ld_script.txt $(OBJ_DIR)/sym_bss.ld $(OBJ_DIR)/sym_comm cd $(OBJ_DIR) && sed -f ../../ld_script.sed ../../$< | sed "s#tools/#../../tools/#g" > ld_script.ld $(ELF): $(OBJ_DIR)/ld_script.ld $(OBJS) - cd $(OBJ_DIR) && $(LD) $(LDFLAGS) -T ld_script.ld -o ../../$@ $(OBJS_REL) ../../$(LIBGCC) ../../$(LIBC) + cd $(OBJ_DIR) && $(LD) $(LDFLAGS) -T ld_script.ld -o ../../$@ $(OBJS_REL) $(LIB) $(ROM): $(ELF) $(OBJCOPY) -O binary --gap-fill 0xFF --pad-to 0x9000000 $< $@ diff --git a/include/global.h b/include/global.h index 3e260fd2a..9f6c45df1 100644 --- a/include/global.h +++ b/include/global.h @@ -1,6 +1,7 @@ #ifndef GUARD_GLOBAL_H #define GUARD_GLOBAL_H +#include <string.h> #include "config.h" // we need to define config before gba headers as print stuff needs the functions nulled before defines. #include "gba/gba.h" @@ -11,11 +12,16 @@ #define asm_comment(x) asm volatile("@ -- " x " -- ") #define asm_unified(x) asm(".syntax unified\n" x "\n.syntax divided") +// IDE support #if defined (__APPLE__) || defined (__CYGWIN__) -void *memset(void *, int, size_t); -void *memcpy(void *, const void *, size_t); -int strcmp(const char *s1, const char *s2); -char* strcpy(char *dst0, const char *src0); +#define _(x) x +#define __(x) x +#define INCBIN_U8 {0} +#define INCBIN_U16 {0} +#define INCBIN_U32 {0} +#define INCBIN_S8 {0} +#define INCBIN_S16 {0} +#define INCBIN_S32 {0} #endif // __APPLE__ #define ARRAY_COUNT(array) (sizeof(array) / sizeof((array)[0])) |