diff options
| author | twinaphex | 2017-08-17 03:02:29 +0200 |
|---|---|---|
| committer | twinaphex | 2017-08-17 03:02:29 +0200 |
| commit | f9da660f2ebbde449481f8a2296199a18661fed6 (patch) | |
| tree | eee2e0e3a196ad94f8ef74ce7f54698393b0515f /Makefile | |
| parent | d595f1eb9ff6cdb999636d90821d38953dcb7240 (diff) | |
| download | snes9x2005-f9da660f2ebbde449481f8a2296199a18661fed6.tar.gz snes9x2005-f9da660f2ebbde449481f8a2296199a18661fed6.tar.bz2 snes9x2005-f9da660f2ebbde449481f8a2296199a18661fed6.zip | |
Updates to Makefile
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 16 |
1 files changed, 9 insertions, 7 deletions
@@ -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) |