Merge branch 'master' of https://github.com/indigoparadox/maug

indigoparadox · Feb 18, 2024 · 7360db5 · 7360db5
2 parents 0501b19 + 4c9a909
commit 7360db5
Show file tree

Hide file tree

Showing 10 changed files with 54 additions and 35 deletions.
diff --git a/dosstubs/mfmt.c b/dosstubs/mfmt.c
@@ -1,4 +1,6 @@
 
-#define MFMT_C
-#include <maug.h>
+#ifndef MAUG_NO_MFMT
+#  define MFMT_C
+#  include <maug.h>
+#endif /* !MAUG_NO_MFMT */
 
diff --git a/dosstubs/mhtml.c b/dosstubs/mhtml.c
@@ -1,5 +1,7 @@
 
-#define MHTML_C
-#include <maug.h>
-#include <mhtml.h>
+#ifndef MAUG_NO_MHTML
+#  define MHTML_C
+#  include <maug.h>
+#  include <mhtml.h>
+#endif /* !MAUG_NO_MHTML */
 
diff --git a/dosstubs/mhtmr.c b/dosstubs/mhtmr.c
@@ -1,6 +1,8 @@
 
-#define MHTMR_C
-#include <maug.h>
-#include <mhtml.h>
-#include <mhtmr.h>
+#ifndef MAUG_NO_MHTML
+#  define MHTMR_C
+#  include <maug.h>
+#  include <mhtml.h>
+#  include <mhtmr.h>
+#endif /* !MAUG_NO_MHTML */
 
diff --git a/dosstubs/mjson.c b/dosstubs/mjson.c
@@ -1,5 +1,7 @@
 
-#define MJSON_C
-#include <maug.h>
-#include <mjson.h>
+#ifndef MAUG_NO_MJSON
+#  define MJSON_C
+#  include <maug.h>
+#  include <mjson.h>
+#endif /* !MAUG_NO_MJSON */
 
diff --git a/dosstubs/mplug.c b/dosstubs/mplug.c
@@ -1,4 +1,6 @@
 
-#define MPLUG_C
-#include <maug.h>
+#ifndef MAUG_NO_MPLUG
+#  define MPLUG_C
+#  include <maug.h>
+#endif /* !MAUG_NO_MPLUG */
 
diff --git a/dosstubs/retrogui.c b/dosstubs/retrogui.c
@@ -1,7 +1,9 @@
 
-#define MAUG_NO_RETRO
-#include <maug.h>
-#include <retroflt.h>
-#define RETROGUI_C
-#include <retrogui.h>
+#ifndef RETROFLAT_NO_RETROGUI
+#  define MAUG_NO_RETRO
+#  include <maug.h>
+#  include <retroflt.h>
+#  define RETROGUI_C
+#  include <retrogui.h>
+#endif /* !RETROFLAT_NO_RETROGUI */
 
diff --git a/dosstubs/retrogxc.c b/dosstubs/retrogxc.c
@@ -1,8 +1,9 @@
 
-#define MAUG_NO_RETRO
-#include <maug.h>
-#include <mjson.h>
-#include <retroflt.h>
-#define RETROGXC_C
-#include <retrogxc.h>
+#ifndef RETROFLAT_NO_RETROGXC
+#  define MAUG_NO_RETRO
+#  include <maug.h>
+#  include <retroflt.h>
+#  define RETROGXC_C
+#  include <retrogxc.h>
+#endif /* !RETROFLAT_NO_RETROGXC */
 
diff --git a/dosstubs/retrotil.c b/dosstubs/retrotil.c
@@ -1,9 +1,11 @@
 
-#define MAUG_NO_RETRO
-#include <maug.h>
-#include <mjson.h>
-#include <retroflt.h>
-#define RETROTIL_C
-#include <retrotil.h>
-#include <retropth.h>
+#ifndef RETROFLAT_NO_RETROTILE
+#  define MAUG_NO_RETRO
+#  include <maug.h>
+#  include <mjson.h>
+#  include <retroflt.h>
+#  define RETROTIL_C
+#  include <retrotil.h>
+#  include <retropth.h>
+#endif /*! RETROFLAT_NO_RETROTILE */
 
diff --git a/src/retroflt.h b/src/retroflt.h
@@ -1294,7 +1294,6 @@ struct RETROFLAT_BITMAP {
 };
 
 LPSTR* retroflat_win_cli( LPSTR cmd_line, int* argc_out );
-char retroflat_vk_to_ascii( RETROFLAT_IN_KEY k, uint8_t flags );
 
 #  ifdef RETROFLAT_OPENGL
 
@@ -2328,6 +2327,10 @@ retroflat_ms_t retroflat_get_ms();
 
 uint32_t retroflat_get_rand();
 
+#  if !defined( RETROFLAT_NO_KEYBOARD )
+char retroflat_vk_to_ascii( RETROFLAT_IN_KEY k, uint8_t flags );
+#  endif /* !RETROFLAT_NO_KEYBOARD */
+
 /**
  * \addtogroup maug_retroflt_bitmap
  * \{

diff --git a/src/retrosnd.h b/src/retrosnd.h
@@ -136,7 +136,7 @@ void retrosnd_shutdown();
 
 #ifdef RETROSND_C
 
-MAUG_CONST uint8_t adlib_ch[] = {0, 1, 2, 8, 9, 10, 16, 17, 18};
+MAUG_CONST uint8_t SEG_MCONST adlib_ch[] = {0, 1, 2, 8, 9, 10, 16, 17, 18};
 
 struct RETROSND_STATE g_retrosnd_state;
 
@@ -555,7 +555,8 @@ void retrosnd_midi_set_voice( uint8_t channel, uint8_t voice ) {
       }
 
       debug_printf(
-         RETROSND_TRACE_LVL, "channel: %d, reg: %d", channel, adlib_ch[channel] );
+         RETROSND_TRACE_LVL, "channel: %d, reg: %d", channel,
+         adlib_ch[channel] );
 
       /* TODO: Decouple voices so we can have 10/12 channels? */