diff --git a/Makefile.common b/Makefile.common index d37e3ce..e3ea972 100644 --- a/Makefile.common +++ b/Makefile.common @@ -1,5 +1,11 @@ INCFLAGS := -I$(CORE_DIR)/drivers/libretro -I$(CORE_DIR) -I$(CORE_DIR)/input -I$(CORE_DIR)/boards -I$(CORE_DIR)/mappers -COREDEFINES = -D__LIBRETRO__ -DSOUND_QUALITY=0 -DPATH_MAX=1024 -DINLINE=inline -DFCEU_VERSION_NUMERIC=9813 -DFRONTEND_SUPPORTS_RGB565 +COREDEFINES = -D__LIBRETRO__ -DSOUND_QUALITY=0 -DPATH_MAX=1024 -DFCEU_VERSION_NUMERIC=9813 -DFRONTEND_SUPPORTS_RGB565 + +ifneq (,$(findstring msvc,$(platform))) +COREDEFINES += -DINLINE=_inline +else +COREDEFINES += -DINLINE=inline +endif ifeq ($(PSS_STYLE),2) COREDEFINES += -DPSS_STYLE=2 diff --git a/Makefile.libretro b/Makefile.libretro index 905fa25..f3ddfcb 100644 --- a/Makefile.libretro +++ b/Makefile.libretro @@ -351,11 +351,13 @@ endif ifeq ($(platform), sncps3) WARNING_DEFINES = +else ifneq (,$(findstring msvc,$(platform))) +WARNING_DEFINES = else WARNING_DEFINES = -Wno-write-strings endif -CFLAGS += $(CODE_DEFINES) $(fpic) $(WARNING_DEFINES) $(DEFINES) $(ENDIANNESS_DEFINES) +CFLAGS += $(COREDEFINES) $(fpic) $(WARNING_DEFINES) $(DEFINES) $(ENDIANNESS_DEFINES) LDFLAGS += $(LIBM) LIBS :=