From e40d39260529d510aa4e5f808dbbeb2f68821c6b Mon Sep 17 00:00:00 2001 From: twinaphex Date: Tue, 14 Nov 2017 14:28:26 +0100 Subject: [PATCH] Should hopefully work with MSVC this way --- Makefile.griffin | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile.griffin b/Makefile.griffin index 915e2520a5..d79351e89d 100644 --- a/Makefile.griffin +++ b/Makefile.griffin @@ -648,10 +648,10 @@ else ifneq (,$(findstring windows_msvc2013,$(platform))) ifeq ($(HAVE_DIRECTX), 1) PLATCFLAGS += -DHAVE_DINPUT -DHAVE_DSOUND -DHAVE_D3D -DHAVE_D3D9 -DHAVE_XAUDIO -DHAVE_XINPUT DXSDK_DIR := $(DXSDK_DIR:\=) - export INCLUDE := $(INCLUDE);$(WindowsSdkDir)\Include\um;$(WindowsSdkDir)\Include\shared;$(DXSDK_DIR)\Include;libretro-common\include;libretro-common\include\compat\msvc;gfx\include + export INCLUDE := $(INCLUDE);$(WindowsSdkDir)\Include\um;$(WindowsSdkDir)\Include\shared;$(DXSDK_DIR)\Include;libretro-common\include;libretro-common\include\compat\msvc;gfx\include;deps;deps/stb export LIB := $(LIB);$(WindowsSdkDir)\$(PlatLib);$(DXSDK_DIR)\Lib\$(WinArch) else - export INCLUDE := $(INCLUDE);$(WindowsSdkDir)\Include\um;$(WindowsSdkDir)\Include\shared;libretro-common\include;libretro-common\include\compat\msvc;gfx\include + export INCLUDE := $(INCLUDE);$(WindowsSdkDir)\Include\um;$(WindowsSdkDir)\Include\shared;libretro-common\include;libretro-common\include\compat\msvc;gfx\include;deps;deps/stb export LIB := $(LIB);$(WindowsSdkDir)\$(PlatLib) endif endif @@ -660,11 +660,11 @@ ifneq (,$(findstring msvc,$(platform))) CFLAGS += -W2 $(MACHDEP) $(PLATCFLAGS) else CFLAGS += -Wall -std=gnu99 $(MACHDEP) $(PLATCFLAGS) $(INCLUDE) - INCLUDE += -I./libretro-common/include + INCLUDE += -I./libretro-common/include \ + -Ideps \ + -Ideps/stb endif -INCLUDE += -Ideps -Ideps/stb - OBJ = griffin/griffin.o $(PLATOBJS) ifeq ($(HAVE_GRIFFIN_CPP), 1)