dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #473 from Jademalo/ide-support

Browse Source 
Improve IDE Support
This commit is contained in:
GriffinR
2021-10-23 09:44:08 -04:00
committed by GitHub
parent 6eaca5f0d0 1c4d5bfed0
commit 471608b56a
2 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
berry_fix/payload/include/global.h
+12 -11
View File
@@ -6,17 +6,18 @@
// global.h from pokemon ruby // global.h from pokemon ruby
// IDE support // IDE support
#if defined(__APPLE__) || defined(__CYGWIN__) #if defined(__APPLE__) || defined(__CYGWIN__) || defined(__INTELLISENSE__)
#define _(x) x // We define these when using certain IDEs to fool preproc
#define __(x) x #define _(x) (x)
#define INCBIN(x) {0} #define __(x) (x)
#define INCBIN_U8 INCBIN #define INCBIN(...) {0}
#define INCBIN_U16 INCBIN #define INCBIN_U8 INCBIN
#define INCBIN_U32 INCBIN #define INCBIN_U16 INCBIN
#define INCBIN_S8 INCBIN #define INCBIN_U32 INCBIN
#define INCBIN_S16 INCBIN #define INCBIN_S8 INCBIN
#define INCBIN_S32 INCBIN #define INCBIN_S16 INCBIN
#endif #define INCBIN_S32 INCBIN
#endif // IDE support
// Prevent cross-jump optimization. // Prevent cross-jump optimization.
#define BLOCK_CROSS_JUMP asm(""); #define BLOCK_CROSS_JUMP asm("");
include/global.h
+12 -13
View File
@@ -16,20 +16,19 @@
#define asm_comment(x) asm volatile("@ -- " x " -- ") #define asm_comment(x) asm volatile("@ -- " x " -- ")
#define asm_unified(x) asm(".syntax unified\n" x "\n.syntax divided") #define asm_unified(x) asm(".syntax unified\n" x "\n.syntax divided")
#if defined (__APPLE__) || defined (__CYGWIN__) || defined(__CLION_IDE__) // IDE support
// Get the IDE to stfu #if defined(__APPLE__) || defined(__CYGWIN__) || defined(__INTELLISENSE__)
// We define these when using certain IDEs to fool preproc
// We define it this way to fool preproc. #define _(x) (x)
#define __(x) (x)
#define INCBIN(...) {0} #define INCBIN(...) {0}
#define INCBIN_U8 INCBIN #define INCBIN_U8 INCBIN
#define INCBIN_U16 INCBIN #define INCBIN_U16 INCBIN
#define INCBIN_U32 INCBIN #define INCBIN_U32 INCBIN
#define INCBIN_S8 INCBIN #define INCBIN_S8 INCBIN
#define INCBIN_S16 INCBIN #define INCBIN_S16 INCBIN
#define INCBIN_S32 INCBIN #define INCBIN_S32 INCBIN
#define _(x) (x) #endif // IDE support
#define __(x) (x)
#endif // __APPLE__
#define NELEMS(array) (sizeof(array) / sizeof((array)[0])) #define NELEMS(array) (sizeof(array) / sizeof((array)[0]))