aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile8
1 files changed, 4 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index 8fe56ff..f1c2ad1 100644
--- a/Makefile
+++ b/Makefile
@@ -293,15 +293,15 @@ ifneq (,$(findstring msvc,$(platform)))
LD = link.exe
else
OBJOUT = -o
- LINKOUT = -o
+ LINKOUT = -o
LD = $(CC)
endif
%.o: %.cpp
- $(CXX) -c $(OBJOUT)$@ $< $(CXXFLAGS)
+ $(CXX) $(CXXFLAGS) -c $(OBJOUT)$@ $<
%.o: %.c
- $(CC) -c $(OBJOUT)$@ $< $(CFLAGS)
+ $(CC) $(CFLAGS) -c $(OBJOUT)$@ $<
ifeq ($(platform), theos_ios)
@@ -315,7 +315,7 @@ $(TARGET): $(OBJECTS)
ifeq ($(STATIC_LINKING), 1)
$(AR) rcs $@ $(OBJECTS)
else
- $(LD) $(LINKOUT)$@ $^ $(LDFLAGS)
+ $(CC) $(LINKOUT)$@ $(OBJECTS) $(LDFLAGS)
endif
clean: