diff options
| author | Franklin Wei <git@fwei.tk> | 2017-04-30 16:32:57 -0400 |
|---|---|---|
| committer | Franklin Wei <git@fwei.tk> | 2017-04-30 16:32:57 -0400 |
| commit | 36aedfd165cc44b1a01f5b30792491976db9fbab (patch) | |
| tree | 98c7965aba17070788c0be68f2e26a33058d803c | |
| parent | 28fef2e41507068e72b1117fe4409a6b966173ab (diff) | |
fix puzzles... round 3
Change-Id: I014ace22f0b83d8e407bd46df361532207f984bc
| -rw-r--r-- | apps/plugins/puzzles/puzzles.make | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/apps/plugins/puzzles/puzzles.make b/apps/plugins/puzzles/puzzles.make index f3678b7b5b..6e10c862e6 100644 --- a/apps/plugins/puzzles/puzzles.make +++ b/apps/plugins/puzzles/puzzles.make @@ -48,11 +48,11 @@ PUZZLESOPTIMIZE := -Os # tiny plugin buffer endif # we suppress all warnings -PUZZLESFLAGS = -I$(PUZZLES_SRCDIR)/dummy \ +PUZZLESFLAGS = -I$(PUZZLES_SRCDIR)/dummy \ $(filter-out -O%,$(PLUGINFLAGS)) $(PUZZLESOPTIMIZE) \ -Wno-unused-parameter -Wno-sign-compare -Wno-strict-aliasing -w \ - -DFOR_REAL -I$(PUZZLES_SRCDIR)/src -I$(PUZZLES_SRCDIR) \ - -include $(PUZZLES_SRCDIR)/rbcompat.h + -DFOR_REAL -I$(PUZZLES_SRCDIR)/src -I$(PUZZLES_SRCDIR) -include \ + $(PUZZLES_SRCDIR)/rbcompat.h ifdef PUZZLES_COMBINED PUZZLESFLAGS += -DCOMBINED endif @@ -82,14 +82,14 @@ $(PUZZLES_OBJDIR)/sgt-%.rock: $(PUZZLES_OBJDIR)/src/%.o $(PUZZLES_SHARED_OBJ) $( endif # special pattern rule for compiling puzzles with extra flags -$(PUZZLES_OBJDIR)/%.o: $(PUZZLES_SRCDIR)/%.c $(PUZZLES_SRCDIR)/puzzles.make +$(PUZZLES_OBJDIR)/%.o: $(PUZZLES_SRCDIR)/%.c $(PUZZLES_SRCDIR)/puzzles.make $(PUZZLES_SRCDIR)/rbcompat.h # needed for proper dependency checks $(SILENT)mkdir -p $(dir $@) $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) -I$(dir $<) $(PUZZLESFLAGS) -c $< -o $@ -$(PUZZLES_OBJDIR)/unfinished/%.o: $(PUZZLES_SRCDIR)/unfinished/%.c $(PUZZLES_SRCDIR)/puzzles.make +$(PUZZLES_OBJDIR)/src/%.o: $(PUZZLES_SRCDIR)/src/%.c $(PUZZLES_SRCDIR)/puzzles.make $(PUZZLES_SRCDIR)/rbcompat.h $(SILENT)mkdir -p $(dir $@) $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) -I$(dir $<) $(PUZZLESFLAGS) -c $< -o $@ -$(PUZZLES_OBJDIR)/src/%.o: $(PUZZLES_SRCDIR)/src/%.c $(PUZZLES_SRCDIR)/puzzles.make +$(PUZZLES_OBJDIR)/src/unfinished/%.o: $(PUZZLES_SRCDIR)/src/unfinished/%.c $(PUZZLES_SRCDIR)/puzzles.make $(PUZZLES_SRCDIR)/rbcompat.h $(SILENT)mkdir -p $(dir $@) $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) -I$(dir $<) $(PUZZLESFLAGS) -c $< -o $@ |