From 8d4ba8d8c89a77cee345a53726a82183dc84f6de Mon Sep 17 00:00:00 2001 From: Brad Parker Date: Tue, 14 Nov 2017 10:26:39 -0500 Subject: [PATCH] griffin: fix rest of msvc platforms --- Makefile.griffin | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/Makefile.griffin b/Makefile.griffin index d79351e89d..fccba281b4 100644 --- a/Makefile.griffin +++ b/Makefile.griffin @@ -341,7 +341,7 @@ else ifeq ($(platform), windows_msvc6_x86) INCLUDE := $(shell IFS=$$'\n'; cygpath -w "$(VCDIR)/Include") LIB := $(shell IFS=$$'\n'; cygpath -w "$(VCDIR)/Lib") - export INCLUDE := $(INCLUDE);$(INETSDK)\Include;libretro-common\include;libretro-common\include\compat\msvc + export INCLUDE := $(INCLUDE);$(INETSDK)\Include;libretro-common\include;libretro-common\include\compat\msvc;gfx\include;deps;deps\stb export LIB := $(LIB);$(INETSDK)\Lib else ifeq ($(platform), windows_msvc2003_x86) HAVE_RPNG := 1 @@ -383,10 +383,10 @@ else ifeq ($(platform), windows_msvc2003_x86) ifeq ($(HAVE_DIRECTX), 1) PLATCFLAGS += -DHAVE_DINPUT -DHAVE_DSOUND DXSDK_DIR := $(DXSDK_DIR:\=) - export INCLUDE := $(INCLUDE);$(INETSDK)\Include;$(DXSDK_DIR)\Include;libretro-common\include;libretro-common\include\compat\msvc + export INCLUDE := $(INCLUDE);$(INETSDK)\Include;$(DXSDK_DIR)\Include;libretro-common\include;libretro-common\include\compat\msvc;gfx\include;deps;deps\stb export LIB := $(LIB);$(INETSDK)\Lib;$(DXSDK_DIR)\Lib\x86 else - export INCLUDE := $(INCLUDE);$(INETSDK)\Include;libretro-common\include;libretro-common\include\compat\msvc + export INCLUDE := $(INCLUDE);$(INETSDK)\Include;libretro-common\include;libretro-common\include\compat\msvc;gfx\include;deps;deps\stb export LIB := $(LIB);$(INETSDK)\Lib endif else ifeq ($(platform), windows_msvc2005_x86) @@ -430,10 +430,10 @@ else ifeq ($(platform), windows_msvc2005_x86) ifeq ($(HAVE_DIRECTX), 1) PLATCFLAGS += -DHAVE_DINPUT -DHAVE_DSOUND DXSDK_DIR := $(DXSDK_DIR:\=) - export INCLUDE := $(INCLUDE);$(INETSDK)\Include;$(DXSDK_DIR)\Include;libretro-common\include;libretro-common\include\compat\msvc + export INCLUDE := $(INCLUDE);$(INETSDK)\Include;$(DXSDK_DIR)\Include;libretro-common\include;libretro-common\include\compat\msvc;gfx\include;deps;deps\stb export LIB := $(LIB);$(INETSDK)\Lib;$(DXSDK_DIR)\Lib\x86 else - export INCLUDE := $(INCLUDE);$(INETSDK)\Include;libretro-common\include;libretro-common\include\compat\msvc + export INCLUDE := $(INCLUDE);$(INETSDK)\Include;libretro-common\include;libretro-common\include\compat\msvc;gfx\include;deps;deps\stb export LIB := $(LIB);$(INETSDK)\Lib endif else ifneq (,$(findstring windows_msvc2010,$(platform))) @@ -500,10 +500,10 @@ else ifneq (,$(findstring windows_msvc2010,$(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;$(DXSDK_DIR)\Include;libretro-common\include;libretro-common\include\compat\msvc;gfx\include + export INCLUDE := $(INCLUDE);$(WindowsSdkDir)\Include;$(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;libretro-common\include;libretro-common\include\compat\msvc;gfx\include + export INCLUDE := $(INCLUDE);$(WindowsSdkDir)\Include;libretro-common\include;libretro-common\include\compat\msvc;gfx\include;deps;deps\stb export LIB := $(LIB);$(WindowsSdkDir)\$(PlatLib) endif else ifneq (,$(findstring windows_msvc2012,$(platform))) @@ -574,10 +574,10 @@ else ifneq (,$(findstring windows_msvc2012,$(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 else ifneq (,$(findstring windows_msvc2013,$(platform))) @@ -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;deps;deps/stb + 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;deps;deps/stb + 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