From f9da660f2ebbde449481f8a2296199a18661fed6 Mon Sep 17 00:00:00 2001
From: twinaphex
Date: Thu, 17 Aug 2017 03:02:29 +0200
Subject: Updates to Makefile

---
 Makefile | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 72f1f5c..8fe56ff 100644
--- a/Makefile
+++ b/Makefile
@@ -287,6 +287,7 @@ CXXFLAGS += $(FLAGS)
 CFLAGS += $(FLAGS)
 
 ifneq (,$(findstring msvc,$(platform)))
+	LIBM =
 	OBJOUT = -Fo
 	LINKOUT = -out:
 	LD = link.exe
@@ -296,6 +297,13 @@ else
 	LD = $(CC)
 endif
 
+%.o: %.cpp
+	$(CXX) -c $(OBJOUT)$@ $< $(CXXFLAGS)
+
+%.o: %.c
+	$(CC) -c $(OBJOUT)$@ $< $(CFLAGS)
+
+
 ifeq ($(platform), theos_ios)
 	COMMON_FLAGS := -DIOS $(COMMON_DEFINES) $(INCFLAGS) -I$(THEOS_INCLUDE_PATH) -Wno-error
 	$(LIBRARY_NAME)_CFLAGS += $(COMMON_FLAGS) $(CFLAGS)
@@ -307,15 +315,9 @@ $(TARGET): $(OBJECTS)
 ifeq ($(STATIC_LINKING), 1)
 	$(AR) rcs $@ $(OBJECTS)
 else
-	$(CC) -o $@ $^ $(LDFLAGS)
+	$(LD) $(LINKOUT)$@ $^ $(LDFLAGS)
 endif
 
-%.o: %.cpp
-	$(CXX) -c $(OBJOUT)$@ $< $(CXXFLAGS)
-
-%.o: %.c
-	$(CC) -c $(OBJOUT)$@ $< $(CFLAGS)
-
 clean:
 	rm -f $(TARGET) $(OBJECTS)
 
-- 
cgit v1.2.3