aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortwinaphex2019-12-27 04:25:56 +0100
committertwinaphex2019-12-27 04:25:56 +0100
commit2179ab8a12c8dfad88d343f32fff5c4f3a4b0e1d (patch)
treeff3f6af78295c2b5b7bdc66f7a1f390f28273ba4
parent798e871c0170d0204b36e24babedb5eaf25d7dfb (diff)
downloadsnes9x2005-2179ab8a12c8dfad88d343f32fff5c4f3a4b0e1d.tar.gz
snes9x2005-2179ab8a12c8dfad88d343f32fff5c4f3a4b0e1d.tar.bz2
snes9x2005-2179ab8a12c8dfad88d343f32fff5c4f3a4b0e1d.zip
Update Makefile
-rw-r--r--Makefile18
1 files 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