From 90e8e098e7691981adee2c2ea233a6494fa3adab Mon Sep 17 00:00:00 2001 From: Brad Parker Date: Fri, 15 Sep 2017 22:45:30 -0400 Subject: [PATCH] fix lib.exe invocation for msvc --- Makefile.libretro | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Makefile.libretro b/Makefile.libretro index 14b5fed..ea59969 100644 --- a/Makefile.libretro +++ b/Makefile.libretro @@ -570,7 +570,7 @@ ifneq (,$(findstring msvc,$(platform))) OBJOUT = -Fo LINKOUT = -out: ifeq ($(STATIC_LINKING),1) - LD ?= lib.exe + LD = lib.exe STATIC_LINKING=0 else LD = link.exe @@ -590,7 +590,11 @@ else all: $(TARGET) $(TARGET): $(OBJECTS) ifeq ($(STATIC_LINKING),1) +ifneq (,$(findstring msvc,$(platform))) + $(LD) $(LINKOUT)$@ $(OBJECTS) +else $(AR) rcs $@ $(OBJECTS) +endif else $(LD) $(LINKOUT)$@ $(SHARED) $(OBJECTS) $(LDFLAGS) $(LIBS) endif