fix merge conflicts

1 files changed, 15 insertions, 0 deletions

diff --git a/include/global.h b/include/global.h
index 433169c21..d172cfa25 100755
--- a/include/global.h
+++ b/include/global.h
@@ -4,6 +4,21 @@
 #include "gba/gba.h"
 #include "config.h"
 
+// IDE support
+#ifdef __APPLE__
+#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}
+void * 	memcpy (void *, const void *, size_t);
+void * 	memset (void *, int, size_t);
+int 	strcmp (const char *, const char *);
+#endif
+
 // Prevent cross-jump optimization.
 #define BLOCK_CROSS_JUMP asm("");