From 4bed91d9199c477a3d2db6ed9254225bffab3042 Mon Sep 17 00:00:00 2001 From: Brad Parker Date: Tue, 12 Sep 2017 01:42:50 -0400 Subject: [PATCH] griffin msvc: remove unneeded exports, remove any trailing slashes from local directx sdk dirs --- Makefile.griffin | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/Makefile.griffin b/Makefile.griffin index 2e938dfbeb..5f20d7c3d0 100644 --- a/Makefile.griffin +++ b/Makefile.griffin @@ -344,7 +344,6 @@ else ifeq ($(platform), windows_msvc6_x86) export INCLUDE := $(INCLUDE);$(INETSDK)\Include;libretro-common\include;libretro-common\include\compat\msvc export LIB := $(LIB);$(INETSDK)\Lib - export INETSDK := $(INETSDK) else ifeq ($(platform), windows_msvc2003_x86) HAVE_RPNG := 1 HAVE_RJPEG := 1 @@ -383,11 +382,9 @@ else ifeq ($(platform), windows_msvc2003_x86) INCLUDE := $(shell IFS=$$'\n'; cygpath -w "$(VS71COMNTOOLS)../../Vc7/include") LIB := $(shell IFS=$$'\n'; cygpath -w "$(VS71COMNTOOLS)../../Vc7/lib") - export INETSDK := $(INETSDK) - ifeq ($(HAVE_DIRECTX), 1) PLATCFLAGS += -DHAVE_DINPUT -DHAVE_DSOUND - export DXSDK_DIR := $(DXSDK_DIR) + DXSDK_DIR := $(DXSDK_DIR:\=) export INCLUDE := $(INCLUDE);$(INETSDK)\Include;$(DXSDK_DIR)\Include;libretro-common\include;libretro-common\include\compat\msvc export LIB := $(LIB);$(INETSDK)\Lib;$(DXSDK_DIR)\Lib\x86 else @@ -433,11 +430,9 @@ else ifeq ($(platform), windows_msvc2005_x86) INCLUDE := $(shell IFS=$$'\n'; cygpath -w "$(VS80COMNTOOLS)../../VC/include") LIB := $(shell IFS=$$'\n'; cygpath -w "$(VS80COMNTOOLS)../../VC/lib") - export INETSDK := $(INETSDK) - ifeq ($(HAVE_DIRECTX), 1) PLATCFLAGS += -DHAVE_DINPUT -DHAVE_DSOUND - export DXSDK_DIR := $(DXSDK_DIR) + DXSDK_DIR := $(DXSDK_DIR:\=) export INCLUDE := $(INCLUDE);$(INETSDK)\Include;$(DXSDK_DIR)\Include;libretro-common\include;libretro-common\include\compat\msvc export LIB := $(LIB);$(INETSDK)\Lib;$(DXSDK_DIR)\Lib\x86 else @@ -579,11 +574,9 @@ else ifneq (,$(findstring windows_msvc2012,$(platform))) PATH := $(PATH):$(shell IFS=$$'\n'; cygpath "$(VS110COMNTOOLS)../IDE") INCLUDE := $(shell IFS=$$'\n'; cygpath -w "$(VS110COMNTOOLS)../../VC/include") - export INETSDK := $(INETSDK) - ifeq ($(HAVE_DIRECTX), 1) PLATCFLAGS += -DHAVE_DINPUT -DHAVE_DSOUND -DHAVE_D3D -DHAVE_D3D9 -DHAVE_XAUDIO -DHAVE_XINPUT - export DXSDK_DIR := $(DXSDK_DIR) + DXSDK_DIR := $(DXSDK_DIR:\=) export INCLUDE := $(INCLUDE);$(INETSDK)\Include\um;$(INETSDK)\Include\shared;$(DXSDK_DIR)\Include;libretro-common\include;libretro-common\include\compat\msvc;gfx\include export LIB := $(LIB);$(INETSDK)\$(PlatLib);$(DXSDK_DIR)\Lib\$(WinArch) else @@ -653,11 +646,9 @@ else ifneq (,$(findstring windows_msvc2013,$(platform))) PATH := $(PATH):$(shell IFS=$$'\n'; cygpath "$(VS120COMNTOOLS)../IDE") INCLUDE := $(shell IFS=$$'\n'; cygpath -w "$(VS120COMNTOOLS)../../VC/include") - export INETSDK := $(INETSDK) - ifeq ($(HAVE_DIRECTX), 1) PLATCFLAGS += -DHAVE_DINPUT -DHAVE_DSOUND -DHAVE_D3D -DHAVE_D3D9 -DHAVE_XAUDIO -DHAVE_XINPUT - export DXSDK_DIR := $(DXSDK_DIR) + DXSDK_DIR := $(DXSDK_DIR:\=) export INCLUDE := $(INCLUDE);$(INETSDK)\Include\um;$(INETSDK)\Include\shared;$(DXSDK_DIR)\Include;libretro-common\include;libretro-common\include\compat\msvc;gfx\include export LIB := $(LIB);$(INETSDK)\$(PlatLib);$(DXSDK_DIR)\Lib\$(WinArch) else