aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorneville2017-08-17 08:30:01 +0200
committerneville2017-08-17 08:30:01 +0200
commitb94a8041a928f5018d753d21d62507c1511af8d4 (patch)
tree028d5909fa68a34d1f228b98370d1c5ef9bd8f0e /Makefile
parentf9da660f2ebbde449481f8a2296199a18661fed6 (diff)
downloadsnes9x2005-b94a8041a928f5018d753d21d62507c1511af8d4.tar.gz
snes9x2005-b94a8041a928f5018d753d21d62507c1511af8d4.tar.bz2
snes9x2005-b94a8041a928f5018d753d21d62507c1511af8d4.zip
Update
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: