Skip to content

Commit

Permalink
Update
Browse files Browse the repository at this point in the history
  • Loading branch information
neville committed Aug 17, 2017
1 parent f9da660 commit b94a804
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -315,7 +315,7 @@ $(TARGET): $(OBJECTS)
ifeq ($(STATIC_LINKING), 1)
$(AR) rcs $@ $(OBJECTS)
else
$(LD) $(LINKOUT)$@ $^ $(LDFLAGS)
$(CC) $(LINKOUT)$@ $(OBJECTS) $(LDFLAGS)
endif

clean:
Expand Down

0 comments on commit b94a804

Please sign in to comment.