From 2179ab8a12c8dfad88d343f32fff5c4f3a4b0e1d Mon Sep 17 00:00:00 2001
From: twinaphex
Date: Fri, 27 Dec 2019 04:25:56 +0100
Subject: Update Makefile

---
 Makefile | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/Makefile b/Makefile
index be367d4..e59d74b 100644
--- a/Makefile
+++ b/Makefile
@@ -120,6 +120,7 @@ ifndef ($(NOUNIVERSAL))
 	FLAGS += $(ARCHFLAGS)
 	LDFLAGS += $(ARCHFLAGS)
 endif
+
 # iOS
 else ifneq (,$(findstring ios,$(platform)))
 	TARGET := $(TARGET_NAME)_libretro_ios.dylib
@@ -539,21 +540,22 @@ endif
 
 OBJECTS := $(SOURCES_C:.c=.o)
 
-LDFLAGS += $(fpic)
-
-FLAGS += $(fpic)
-
 CXXFLAGS += $(FLAGS)
 CFLAGS += $(FLAGS)
 
+OBJOUT   = -o
+LINKOUT  = -o
+
 ifneq (,$(findstring msvc,$(platform)))
-	LIBM =
 	OBJOUT = -Fo
 	LINKOUT = -out:
-	LD = link.exe
+ifeq ($(STATIC_LINKING),1)
+	LD ?= lib.exe
+	STATIC_LINKING=0
 else
-	OBJOUT   = -o
-	LINKOUT  = -o
+	LD = link.exe
+endif
+else ifneq ($(platform),genode)
 	LD = $(CC)
 endif
 
-- 
cgit v1.2.3