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:35:23 -0400 |
| commit | c7d6457cfdd3d39aa669ed4b08e6bdf80182d9e9 (patch) | |
| tree | d069b5a96297c289d09d94f1a8ed19e623021afa | |
| parent | 39fe30ff5841d11ae703aa2a52b75fb10657c8fc (diff) | |
| download | rockbox-c7d6457cfdd3d39aa669ed4b08e6bdf80182d9e9.tar.gz rockbox-c7d6457cfdd3d39aa669ed4b08e6bdf80182d9e9.zip | |
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 | |||
| 48 | endif | 48 | endif |
| 49 | 49 | ||
| 50 | # we suppress all warnings | 50 | # we suppress all warnings |
| 51 | PUZZLESFLAGS = -I$(PUZZLES_SRCDIR)/dummy \ | 51 | PUZZLESFLAGS = -I$(PUZZLES_SRCDIR)/dummy \ |
| 52 | $(filter-out -O%,$(PLUGINFLAGS)) $(PUZZLESOPTIMIZE) \ | 52 | $(filter-out -O%,$(PLUGINFLAGS)) $(PUZZLESOPTIMIZE) \ |
| 53 | -Wno-unused-parameter -Wno-sign-compare -Wno-strict-aliasing -w \ | 53 | -Wno-unused-parameter -Wno-sign-compare -Wno-strict-aliasing -w \ |
| 54 | -DFOR_REAL -I$(PUZZLES_SRCDIR)/src -I$(PUZZLES_SRCDIR) \ | 54 | -DFOR_REAL -I$(PUZZLES_SRCDIR)/src -I$(PUZZLES_SRCDIR) -include \ |
| 55 | -include $(PUZZLES_SRCDIR)/rbcompat.h | 55 | $(PUZZLES_SRCDIR)/rbcompat.h |
| 56 | ifdef PUZZLES_COMBINED | 56 | ifdef PUZZLES_COMBINED |
| 57 | PUZZLESFLAGS += -DCOMBINED | 57 | PUZZLESFLAGS += -DCOMBINED |
| 58 | endif | 58 | endif |
| @@ -82,14 +82,14 @@ $(PUZZLES_OBJDIR)/sgt-%.rock: $(PUZZLES_OBJDIR)/src/%.o $(PUZZLES_SHARED_OBJ) $( | |||
| 82 | endif | 82 | endif |
| 83 | 83 | ||
| 84 | # special pattern rule for compiling puzzles with extra flags | 84 | # special pattern rule for compiling puzzles with extra flags |
| 85 | $(PUZZLES_OBJDIR)/%.o: $(PUZZLES_SRCDIR)/%.c $(PUZZLES_SRCDIR)/puzzles.make | 85 | $(PUZZLES_OBJDIR)/%.o: $(PUZZLES_SRCDIR)/%.c $(PUZZLES_SRCDIR)/puzzles.make $(PUZZLES_SRCDIR)/rbcompat.h # needed for proper dependency checks |
| 86 | $(SILENT)mkdir -p $(dir $@) | 86 | $(SILENT)mkdir -p $(dir $@) |
| 87 | $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) -I$(dir $<) $(PUZZLESFLAGS) -c $< -o $@ | 87 | $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) -I$(dir $<) $(PUZZLESFLAGS) -c $< -o $@ |
| 88 | 88 | ||
| 89 | $(PUZZLES_OBJDIR)/unfinished/%.o: $(PUZZLES_SRCDIR)/unfinished/%.c $(PUZZLES_SRCDIR)/puzzles.make | 89 | $(PUZZLES_OBJDIR)/src/%.o: $(PUZZLES_SRCDIR)/src/%.c $(PUZZLES_SRCDIR)/puzzles.make $(PUZZLES_SRCDIR)/rbcompat.h |
| 90 | $(SILENT)mkdir -p $(dir $@) | 90 | $(SILENT)mkdir -p $(dir $@) |
| 91 | $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) -I$(dir $<) $(PUZZLESFLAGS) -c $< -o $@ | 91 | $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) -I$(dir $<) $(PUZZLESFLAGS) -c $< -o $@ |
| 92 | 92 | ||
| 93 | $(PUZZLES_OBJDIR)/src/%.o: $(PUZZLES_SRCDIR)/src/%.c $(PUZZLES_SRCDIR)/puzzles.make | 93 | $(PUZZLES_OBJDIR)/src/unfinished/%.o: $(PUZZLES_SRCDIR)/src/unfinished/%.c $(PUZZLES_SRCDIR)/puzzles.make $(PUZZLES_SRCDIR)/rbcompat.h |
| 94 | $(SILENT)mkdir -p $(dir $@) | 94 | $(SILENT)mkdir -p $(dir $@) |
| 95 | $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) -I$(dir $<) $(PUZZLESFLAGS) -c $< -o $@ | 95 | $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) -I$(dir $<) $(PUZZLESFLAGS) -c $< -o $@ |