Merge pull request #71 from retro-wertz/patch-3

Update Makefile
This commit is contained in:
hizzlekizzle 2019-08-06 18:50:45 -05:00 committed by GitHub
commit 4dbdf87d0a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions

View File

@ -580,10 +580,10 @@ else
endif endif
%.o: %.cpp %.o: %.cpp
$(CXX) -c $(OBJOUT) $@ $< $(CXXFLAGS) $(INCFLAGS) $(CXX) -c $(OBJOUT)$@ $< $(CXXFLAGS) $(INCFLAGS)
%.o: %.c %.o: %.c
$(CC) -c $(OBJOUT) $@ $< $(CFLAGS) $(INCFLAGS) $(CC) -c $(OBJOUT)$@ $< $(CFLAGS) $(INCFLAGS)
ifeq ($(platform), theos_ios) ifeq ($(platform), theos_ios)
COMMON_FLAGS := -DIOS $(COMMON_DEFINES) $(INCFLAGS) -I$(THEOS_INCLUDE_PATH) -Wno-error COMMON_FLAGS := -DIOS $(COMMON_DEFINES) $(INCFLAGS) -I$(THEOS_INCLUDE_PATH) -Wno-error
@ -598,7 +598,7 @@ $(TARGET): $(OBJS)
ifeq ($(STATIC_LINKING), 1) ifeq ($(STATIC_LINKING), 1)
$(AR) rcs $@ $(OBJS) $(AR) rcs $@ $(OBJS)
else else
$(LD) $(LINKOUT) $@ $(SHARED) $(OBJS) $(LDFLAGS) $(LIBS) $(LD) $(LINKOUT)$@ $(SHARED) $(OBJS) $(LDFLAGS) $(LIBS)
endif endif
clean: clean: