Using _UI suffix for better understanding.

desmume/src/cli/main.c

@@ -3,6 +3,10 @@
 #include <string.h>
 #include <libgen.h>
 
+#ifndef CLI_UI
+#define CLI_UI
+#endif
+
 #include "../MMU.h"
 #include "../NDSSystem.h"
 #include "../cflash.h"

desmume/src/ctrlssdl.c

@@ -125,7 +125,7 @@ u16 process_ctrls_events(u16 keypad)
           break;
 
           /* When GTK is in use, the keyboard, mouse and quit events are handled by GTK. */
-#ifndef GTK
+#ifndef GTK_UI
         case SDL_KEYDOWN:
           switch (event.key.keysym.sym)
             {
@@ -157,7 +157,7 @@ u16 process_ctrls_events(u16 keypad)
             case '.':	        RM_KEY( keypad, 0x100); break;
             }
           break;
-#endif
+#endif // GTK_UI
         default:
           break;
         }

desmume/src/gtk-glade/globals.h

@@ -22,7 +22,9 @@
 #ifndef __GLOBALS_H__
 #define __GLOBALS_H__
 
-#define GTK
+#ifndef GTK_UI
+#define GTK_UI
+#endif
 
 #include <stdio.h>
 #include <stdlib.h>

desmume/src/gtk/globals.h

@@ -23,7 +23,9 @@
 #ifndef GLOBALS_H
 #define GLOBALS_H
 
-#define GTK
+#ifndef GTK_UI
+#define GTK_UI
+#endif
 
 #include <stdio.h>
 #include <stdlib.h>