From c007afe6fd51827fade7aa15a0a798be8bd97839 Mon Sep 17 00:00:00 2001
From: twinaphex
Date: Fri, 28 Dec 2018 00:32:13 +0100
Subject: Start significantly refactoring this codebase so we can get it to
 work with MSVC

---
 Makefile.common | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

(limited to 'Makefile.common')

diff --git a/Makefile.common b/Makefile.common
index 6f810c5..5316a49 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -90,15 +90,32 @@ DEFINES += -D__OLD_RASTER_FX__
 endif
 
 INCLUDES   = -I. -I$(LIBRETRO_DIR) -I$(LIBRETRO_COMM_DIR)/include -I$(CORE_DIR)
-DEFINES    += -DHAVE_STRINGS_H -DHAVE_STDINT_H -DHAVE_INTTYPES_H -D__LIBRETRO__ -DINLINE=inline
+
+ifneq (,$(findstring msvc200,$(platform)))
+INCLUDES += -I$(LIBRETRO_COMM_DIR)/include/compat/msvc
+endif
+DEFINES    += -DHAVE_STRINGS_H -DHAVE_STDINT_H -DHAVE_INTTYPES_H -D__LIBRETRO__
 DEFINES    += -DUSE_SA1
 
 ifeq ($(platform), sncps3)
 WARNINGS_DEFINES =
 CODE_DEFINES =
 else
-WARNINGS_DEFINES = -Wall -W -Wno-unused-parameter -Wno-parentheses -Wno-write-strings -Wno-comment
+ifeq ($(OLD_GCC), 1)
+WARNINGS_DEFINES = -Wall 
+CODE_DEFINES     =
+else ifeq ($(NO_GCC), 1)
+WARNINGS_DEFINES =
+CODE_DEFINES     =
+else
+WARNINGS_DEFINES = -Wall \
+						 -W \
+						 -Wno-unused-parameter \
+						 -Wno-parentheses \
+						 -Wno-write-strings \
+						 -Wno-comment
 CODE_DEFINES = -fomit-frame-pointer
 endif
+endif
 
 COMMON_DEFINES += $(CODE_DEFINES) $(WARNINGS_DEFINES) $(fpic)
-- 
cgit v1.2.3