admin/ci-libretro-fceumm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/libretro/libretro-fceumm

Browse Source
This commit is contained in:
twinaphex
2017-09-16 05:47:28 +02:00
parent 9cea8c4827 90e8e098e7
commit 5d348ecbd8
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile.libretro
View File

@@ -570,7 +570,7 @@ ifneq (,$(findstring msvc,$(platform)))
OBJOUT = -Fo OBJOUT = -Fo
LINKOUT = -out: LINKOUT = -out:
ifeq ($(STATIC_LINKING),1) ifeq ($(STATIC_LINKING),1)
LD ?= lib.exe LD = lib.exe
STATIC_LINKING=0 STATIC_LINKING=0
else else
LD = link.exe LD = link.exe
@@ -590,7 +590,11 @@ else
all: $(TARGET) all: $(TARGET)
$(TARGET): $(OBJECTS) $(TARGET): $(OBJECTS)
ifeq ($(STATIC_LINKING),1) ifeq ($(STATIC_LINKING),1)
ifneq (,$(findstring msvc,$(platform)))
$(LD) $(LINKOUT)$@ $(OBJECTS)
else
$(AR) rcs $@ $(OBJECTS) $(AR) rcs $@ $(OBJECTS)
endif
else else
$(LD) $(LINKOUT)$@ $(SHARED) $(OBJECTS) $(LDFLAGS) $(LIBS) $(LD) $(LINKOUT)$@ $(SHARED) $(OBJECTS) $(LDFLAGS) $(LIBS)
endif endif