summaryrefslogtreecommitdiff
path: root/berry_fix/payload/include/global.h
diff options
context:
space:
mode:
authorGriffinR <griffin.g.richards@gmail.com>2021-10-23 09:44:08 -0400
committerGitHub <noreply@github.com>2021-10-23 09:44:08 -0400
commit471608b56abbdf70a452896a0d895ffa5b4b06f9 (patch)
tree7135294e7beb23c3d10a5e064dbd164c00e69400 /berry_fix/payload/include/global.h
parent6eaca5f0d02164c97f30babd4f686c66af28abfe (diff)
parent1c4d5bfed09cd9275caf98db0998958876c091d0 (diff)
Merge pull request #473 from Jademalo/ide-support
Improve IDE Support
Diffstat (limited to 'berry_fix/payload/include/global.h')
-rw-r--r--berry_fix/payload/include/global.h23
1 files changed, 12 insertions, 11 deletions
diff --git a/berry_fix/payload/include/global.h b/berry_fix/payload/include/global.h
index ef161c249..4d9da7c7d 100644
--- a/berry_fix/payload/include/global.h
+++ b/berry_fix/payload/include/global.h
@@ -6,17 +6,18 @@
// global.h from pokemon ruby
// IDE support
-#if defined(__APPLE__) || defined(__CYGWIN__)
-#define _(x) x
-#define __(x) x
-#define INCBIN(x) {0}
-#define INCBIN_U8 INCBIN
-#define INCBIN_U16 INCBIN
-#define INCBIN_U32 INCBIN
-#define INCBIN_S8 INCBIN
-#define INCBIN_S16 INCBIN
-#define INCBIN_S32 INCBIN
-#endif
+#if defined(__APPLE__) || defined(__CYGWIN__) || defined(__INTELLISENSE__)
+// We define these when using certain IDEs to fool preproc
+#define _(x) (x)
+#define __(x) (x)
+#define INCBIN(...) {0}
+#define INCBIN_U8 INCBIN
+#define INCBIN_U16 INCBIN
+#define INCBIN_U32 INCBIN
+#define INCBIN_S8 INCBIN
+#define INCBIN_S16 INCBIN
+#define INCBIN_S32 INCBIN
+#endif // IDE support
// Prevent cross-jump optimization.
#define BLOCK_CROSS_JUMP asm("");