From 863991a391522a878d08ab7f067a288b7d3e06e2 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sun, 2 Jul 2017 20:34:52 +0200 Subject: [PATCH] Updates --- Makefile.libretro | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Makefile.libretro b/Makefile.libretro index 4093f19..252d294 100644 --- a/Makefile.libretro +++ b/Makefile.libretro @@ -292,8 +292,6 @@ INCLUDE := $(shell IFS=$$'\n'; cygpath "$(VS100COMNTOOLS)../../VC/include") LIB := $(shell IFS=$$'\n'; cygpath "$(VS100COMNTOOLS)../../VC/lib/amd64") BIN := $(shell IFS=$$'\n'; cygpath "$(VS100COMNTOOLS)../../VC/bin") -LD = $(BIN)/link.exe - WindowsSdkDir := $(shell reg query "HKLM\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v7.0A" -v "InstallationFolder" | grep -o '[A-Z]:\\.*')lib/x64 WindowsSdkDir ?= $(shell reg query "HKLM\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v7.1A" -v "InstallationFolder" | grep -o '[A-Z]:\\.*')lib/x64 @@ -313,7 +311,6 @@ INCLUDE := $(shell IFS=$$'\n'; cygpath "$(VS100COMNTOOLS)../../VC/include") LIB := $(shell IFS=$$'\n'; cygpath -w "$(VS100COMNTOOLS)../../VC/lib") BIN := $(shell IFS=$$'\n'; cygpath "$(VS100COMNTOOLS)../../VC/bin") -LD = $(BIN)/link.exe WindowsSdkDir := $(shell reg query "HKLM\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v7.0A" -v "InstallationFolder" | grep -o '[A-Z]:\\.*')lib WindowsSdkDir ?= $(shell reg query "HKLM\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v7.1A" -v "InstallationFolder" | grep -o '[A-Z]:\\.*')lib @@ -377,6 +374,7 @@ endif ifneq (,$(findstring msvc,$(platform))) OBJOUT = -Fo LINKOUT = -out: + LD = link.exe else OBJOUT = -o LINKOUT = -o