Fixed compilation for mac

Author: desertkun

debugger/commandl.l

@@ -31,7 +31,11 @@
 #include "debugger/debugger_internals.h"
 #include "mempool.h"
 
+#ifdef __APPLE__
+#include "commandy.tab.h"
+#else
 #include "commandy.h"
+#endif
 
 #define YY_INPUT(buf,result,max_size) \
 { \

ui.c

@@ -1,4 +1,4 @@
-/* ui.c: User interface routines, but those which are independent of any UI
+/* ui.c: User interface routines, but those which are independent of any UI
    Copyright (c) 2002-2017 Philip Kendall
    Copyright (c) 2016-2021 Sergio Baldoví
 
@@ -697,6 +697,7 @@ static const struct menu_item_entries menu_item_lookup[] = {
 
 };
 
+#ifndef __APPLE__
 int
 ui_menu_activate( ui_menu_item item, int active )
 {
@@ -732,6 +733,7 @@ ui_menu_activate( ui_menu_item item, int active )
   ui_error( UI_ERROR_ERROR, "ui_menu_activate: unknown item %d", item );
   return 1;
 }
+#endif			/* #ifndef __APPLE__ */
 
 void
 ui_menu_disk_update( void )
@@ -754,6 +756,7 @@ ui_menu_disk_update( void )
   ui_media_drive_update_parent_menus();
 }
 
+#ifndef __APPLE__
 int
 ui_tape_write( void )
 {
@@ -796,6 +799,7 @@ ui_mdr_write( int which, int saveas )
 
   return err;
 }
+#endif			/* #ifndef __APPLE__ */
 
 #ifdef USE_WIDGET
 int

ui/scaler/scaler.c

@@ -54,6 +54,12 @@ struct scaler_info {
 
 };
 
+#ifdef _WIN32
+#define SCALER32( name ) name##_32
+#else
+#define SCALER32( name ) NULL
+#endif
+
 /* The expander functions */
 
 /* Clip back to screen size after expansion */
@@ -76,55 +82,55 @@ static void expand_dotmatrix( int *x, int *y, int *w, int *h,
 static struct scaler_info available_scalers[] = {
 
   { "Timex Half (smoothed)", "half", SCALER_FLAGS_NONE,	  SCALE_FACTOR_HALF,
-    scaler_Half_16,       scaler_Half_32,       NULL                },
+    scaler_Half_16,       SCALER32( scaler_Half ),       NULL                },
   { "Timex Half (skipping)", "halfskip", SCALER_FLAGS_NONE, SCALE_FACTOR_HALF,
-    scaler_HalfSkip_16,   scaler_HalfSkip_32,   NULL                },
+    scaler_HalfSkip_16,   SCALER32( scaler_HalfSkip ),   NULL                },
   { "Normal",	       "normal",     SCALER_FLAGS_NONE,	  SCALE_FACTOR_ONE,
-    scaler_Normal1x_16,   scaler_Normal1x_32,   NULL                },
+    scaler_Normal1x_16,   SCALER32( scaler_Normal1x ),   NULL                },
   { "Double size",     "2x",	     SCALER_FLAGS_NONE,	  SCALE_FACTOR_TWO,
-    scaler_Normal2x_16,   scaler_Normal2x_32,   NULL                },
+    scaler_Normal2x_16,   SCALER32( scaler_Normal2x ),   NULL                },
   { "Triple size",     "3x",	     SCALER_FLAGS_NONE,	  SCALE_FACTOR_THREE,
-    scaler_Normal3x_16,   scaler_Normal3x_32,   NULL		    },
+    scaler_Normal3x_16,   SCALER32( scaler_Normal3x ),   NULL		    },
   { "Quadruple size",  "4x",	     SCALER_FLAGS_NONE,	  SCALE_FACTOR_FOUR,
-    scaler_Normal4x_16,   scaler_Normal4x_32,   NULL        },
+    scaler_Normal4x_16,   SCALER32( scaler_Normal4x ),   NULL        },
   { "2xSaI",	       "2xsai",	     SCALER_FLAGS_EXPAND, SCALE_FACTOR_TWO,
-    scaler_2xSaI_16,      scaler_2xSaI_32,      expand_sai          },
+    scaler_2xSaI_16,      SCALER32( scaler_2xSaI ),      expand_sai          },
   { "Super 2xSaI",     "super2xsai", SCALER_FLAGS_EXPAND, SCALE_FACTOR_TWO,
-    scaler_Super2xSaI_16, scaler_Super2xSaI_32, expand_sai          },
+    scaler_Super2xSaI_16, SCALER32( scaler_Super2xSaI ), expand_sai          },
   { "SuperEagle",      "supereagle", SCALER_FLAGS_EXPAND, SCALE_FACTOR_TWO,
-    scaler_SuperEagle_16, scaler_SuperEagle_32, expand_sai          },
+    scaler_SuperEagle_16, SCALER32( scaler_SuperEagle ), expand_sai          },
   { "AdvMAME 2x",      "advmame2x",  SCALER_FLAGS_EXPAND, SCALE_FACTOR_TWO,
-    scaler_AdvMame2x_16,  scaler_AdvMame2x_32,  expand_1            },
+    scaler_AdvMame2x_16,  SCALER32( scaler_AdvMame2x ),  expand_1            },
   { "AdvMAME 3x",      "advmame3x",  SCALER_FLAGS_EXPAND, SCALE_FACTOR_THREE,
-    scaler_AdvMame3x_16,  scaler_AdvMame3x_32,  expand_1            },
+    scaler_AdvMame3x_16,  SCALER32( scaler_AdvMame3x ),  expand_1            },
   { "TV 2x",	       "tv2x",	     SCALER_FLAGS_NONE,   SCALE_FACTOR_TWO,
-    scaler_TV2x_16,       scaler_TV2x_32,       NULL                },
+    scaler_TV2x_16,       SCALER32( scaler_TV2x ),       NULL                },
   { "TV 3x",	       "tv3x",	     SCALER_FLAGS_NONE,   SCALE_FACTOR_THREE,
-    scaler_TV3x_16,       scaler_TV3x_32,       NULL                },
+    scaler_TV3x_16,       SCALER32( scaler_TV3x ),       NULL                },
   { "TV 4x",	       "tv4x",	     SCALER_FLAGS_NONE,   SCALE_FACTOR_FOUR,
-    scaler_TV4x_16,       scaler_TV4x_32,       NULL                },
+    scaler_TV4x_16,       SCALER32( scaler_TV4x ),       NULL                },
   { "Timex TV",	       "timextv",    SCALER_FLAGS_NONE,   SCALE_FACTOR_ONE,
-    scaler_TimexTV_16,    scaler_TimexTV_32,    NULL                },
+    scaler_TimexTV_16,    SCALER32( scaler_TimexTV ),    NULL                },
   { "Dot Matrix",      "dotmatrix",  SCALER_FLAGS_EXPAND, SCALE_FACTOR_TWO,
-    scaler_DotMatrix_16,  scaler_DotMatrix_32,  expand_dotmatrix    },
+    scaler_DotMatrix_16,  SCALER32( scaler_DotMatrix ),  expand_dotmatrix    },
   { "Timex 1.5x",      "timex15x",   SCALER_FLAGS_NONE,   SCALE_FACTOR_ONE_HALF,
-    scaler_Timex1_5x_16,  scaler_Timex1_5x_32,  NULL                },
+    scaler_Timex1_5x_16,  SCALER32( scaler_Timex1_5x ),  NULL                },
   { "Timex 2x",        "timex2x",    SCALER_FLAGS_NONE,   SCALE_FACTOR_TWO,
-    scaler_Normal2x_16,  scaler_Normal2x_32,    NULL                },
+    scaler_Normal2x_16,  SCALER32( scaler_Normal2x ),    NULL                },
   { "PAL TV",	       "paltv",     SCALER_FLAGS_EXPAND,  SCALE_FACTOR_ONE,
-    scaler_PalTV_16,  	  scaler_PalTV_32,  expand_pal1        	    },
+    scaler_PalTV_16,  	  SCALER32( scaler_PalTV ),  expand_pal1        	    },
   { "PAL TV 2x",       "paltv2x",   SCALER_FLAGS_EXPAND,  SCALE_FACTOR_TWO,
-    scaler_PalTV2x_16,    scaler_PalTV2x_32,  expand_pal            },
+    scaler_PalTV2x_16,    SCALER32( scaler_PalTV2x ),  expand_pal            },
   { "PAL TV 3x",       "paltv3x",   SCALER_FLAGS_EXPAND,  SCALE_FACTOR_THREE,
-    scaler_PalTV3x_16,    scaler_PalTV3x_32,  expand_pal            },
+    scaler_PalTV3x_16,    SCALER32( scaler_PalTV3x ),  expand_pal            },
   { "PAL TV 4x",       "paltv4x",   SCALER_FLAGS_EXPAND,  SCALE_FACTOR_FOUR,
-    scaler_PalTV4x_16,    scaler_PalTV4x_32,    expand_pal          },
+    scaler_PalTV4x_16,    SCALER32( scaler_PalTV4x ),    expand_pal          },
   { "HQ 2x",           "hq2x",      SCALER_FLAGS_EXPAND,  SCALE_FACTOR_TWO,
-    scaler_HQ2x_16,       scaler_HQ2x_32,    expand_1            },
+    scaler_HQ2x_16,       SCALER32( scaler_HQ2x ),    expand_1            },
   { "HQ 3x",           "hq3x",      SCALER_FLAGS_EXPAND,  SCALE_FACTOR_THREE,
-    scaler_HQ3x_16,       scaler_HQ3x_32,    expand_1            },
+    scaler_HQ3x_16,       SCALER32( scaler_HQ3x ),    expand_1            },
   { "HQ 4x",           "hq4x",      SCALER_FLAGS_EXPAND,  SCALE_FACTOR_FOUR,
-    scaler_HQ4x_16,       scaler_HQ4x_32,    expand_1            },
+    scaler_HQ4x_16,       SCALER32( scaler_HQ4x ),    expand_1            },
 };
 
 scaler_type current_scaler = SCALER_NUM;