summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJademalo <386846+Jademalo@users.noreply.github.com>2021-10-22 04:30:33 +0100
committerJademalo <386846+Jademalo@users.noreply.github.com>2021-10-22 04:30:33 +0100
commiteb860a368e974860db6b3e56b57e2eff186e4470 (patch)
treeb680f59f4c36d9d822007777a3f5992d121e6cc6
parent0fbf5f59b3e142ccfae0cb193f475ecd704c8746 (diff)
Improve IDE support
-rw-r--r--berry_fix/payload/include/global.h4
-rw-r--r--include/global.h4
2 files changed, 3 insertions, 5 deletions
diff --git a/berry_fix/payload/include/global.h b/berry_fix/payload/include/global.h
index c218b5f4e..46828630d 100644
--- a/berry_fix/payload/include/global.h
+++ b/berry_fix/payload/include/global.h
@@ -6,7 +6,7 @@
// global.h from pokemon ruby
// IDE support
-#if defined(__APPLE__) || defined(__CYGWIN__)
+#if defined (__APPLE__) || defined (__CYGWIN__) || defined (__INTELLISENSE__)
#define _(x) x
#define __(x) x
#define INCBIN(x) {0}
@@ -16,7 +16,7 @@
#define INCBIN_S8 INCBIN
#define INCBIN_S16 INCBIN
#define INCBIN_S32 INCBIN
-#endif
+#endif // IDE support
// Prevent cross-jump optimization.
#define BLOCK_CROSS_JUMP asm("");
diff --git a/include/global.h b/include/global.h
index d14aa60f4..bcd037cb2 100644
--- a/include/global.h
+++ b/include/global.h
@@ -20,11 +20,9 @@
#define NAKED __attribute__((naked))
// IDE support
-#if defined (__APPLE__) || defined (__CYGWIN__) || defined (_MSC_VER)
+#if defined (__APPLE__) || defined (__CYGWIN__) || defined (__INTELLISENSE__)
#define _(x) x
#define __(x) x
-
-// Fool CLion IDE
#define INCBIN(x) {0}
#define INCBIN_U8 INCBIN
#define INCBIN_U16 INCBIN