Merge branch 'master' of https://github.com/ekeeke/Genesis-Plus-GX

core/input_hw/input.c

@@ -480,4 +480,4 @@ void input_end_frame(unsigned int cycles)
       }
     }
   }
-}
+}

sdl/Makefile.sdl2

@@ -41,6 +41,14 @@ ifneq ($(OS),Windows_NT)
 DEFINES += -DHAVE_ALLOCA_H
 endif
 
+ifneq ($(findstring Darwin,$(shell uname -a)),)
+	platform = osx
+endif
+
+ifeq ($(platform), osx)
+	CFLAGS   += -Winvalid-utf8 -Wstrict-prototypes
+endif
+
 SRCDIR    = ../core
 INCLUDES  = -I$(SRCDIR) -I$(SRCDIR)/z80 -I$(SRCDIR)/m68k -I$(SRCDIR)/sound -I$(SRCDIR)/input_hw -I$(SRCDIR)/cart_hw -I$(SRCDIR)/cart_hw/svp -I$(SRCDIR)/cd_hw -I$(SRCDIR)/ntsc -I$(SRCDIR)/tremor -I$(SRCDIR)/../sdl -I$(SRCDIR)/../sdl/sdl2
 LIBS	  = `sdl2-config --libs` -lz -lm

sdl/config.h

@@ -2,7 +2,7 @@
 #ifndef _CONFIG_H_
 #define _CONFIG_H_
 
-#include "shared.h"
+#include "types.h"
 
 /****************************************************************************
  * Config Option