diff options
| author | Pietro Gagliardi <[email protected]> | 2015-04-16 14:59:17 -0400 |
|---|---|---|
| committer | Pietro Gagliardi <[email protected]> | 2015-04-16 14:59:17 -0400 |
| commit | 946b3ea34228e92eb39b1be587ede058d8942e34 (patch) | |
| tree | 99c3bc2c9d647129729cfd43533421bed9e57d3b | |
| parent | 06161cf7c218f21a17c1a0874fa9b6b5fee0c5e1 (diff) | |
Fixed Makefiles for OS X building.
| -rw-r--r-- | new/GNUmakefile | 7 | ||||
| -rw-r--r-- | new/darwin/GNUmakeinc.mk | 2 |
2 files changed, 7 insertions, 2 deletions
diff --git a/new/GNUmakefile b/new/GNUmakefile index b9d8bee..457efe4 100644 --- a/new/GNUmakefile +++ b/new/GNUmakefile @@ -37,9 +37,11 @@ xLDFLAGS = \ include $(OS)/GNUmakeinc.mk xOSCFILES = $(OSCFILES:%=$(OS)/%) +xOSMFILES = $(OSMFILES:%=$(OS)/%) OFILES = $(CFILES:%.c=$(OBJDIR)/%.o) \ - $(xOSCFILES:$(OS)/%.c=$(OBJDIR)/%_$(OS).o) + $(xOSCFILES:$(OS)/%.c=$(OBJDIR)/%_$(OS).o) \ + $(xOSMFILES:$(OS)/%.m=$(OBJDIR)/%_$(OS).o) $(OUT): $(OFILES) $(CC) -o $(OUT) $(OFILES) $(xLDFLAGS) @@ -50,6 +52,9 @@ $(OBJDIR)/%.o: %.c $(OBJDIR) $(HFILES) $(OBJDIR)/%_$(OS).o: $(OS)/%.c $(OBJDIR) $(HFILES) $(CC) -o $@ -c $< $(xCFLAGS) +$(OBJDIR)/%_$(OS).o: $(OS)/%.m $(OBJDIR) $(HFILES) + $(CC) -o $@ -c $< $(xCFLAGS) + $(OBJDIR): mkdir -p $(OBJDIR) diff --git a/new/darwin/GNUmakeinc.mk b/new/darwin/GNUmakeinc.mk index 6a69044..22ca1e3 100644 --- a/new/darwin/GNUmakeinc.mk +++ b/new/darwin/GNUmakeinc.mk @@ -1,4 +1,4 @@ -OSCFILES = \ +OSMFILES = \ alloc.m \ button.m \ checkbox.m \ |