diff options
author | Franklin Wei <git@fwei.tk> | 2017-04-29 18:21:56 -0400 |
---|---|---|
committer | Franklin Wei <git@fwei.tk> | 2017-04-29 18:24:42 -0400 |
commit | 881746789a489fad85aae8317555f73dbe261556 (patch) | |
tree | cec2946362c4698c8db3c10f3242ef546c2c22dd /apps/plugins/puzzles/puzzles.make | |
parent | 03dd4b92be7dcd5c8ab06da3810887060e06abd5 (diff) | |
download | rockbox-881746789a489fad85aae8317555f73dbe261556.tar.gz rockbox-881746789a489fad85aae8317555f73dbe261556.zip |
puzzles: refactor and resync with upstream
This brings puzzles up-to-date with upstream revision
2d333750272c3967cfd5cd3677572cddeaad5932, though certain changes made
by me, including cursor-only Untangle and some compilation fixes
remain. Upstream code has been moved to its separate subdirectory and
future syncs can be done by simply copying over the new sources.
Change-Id: Ia6506ca5f78c3627165ea6791d38db414ace0804
Diffstat (limited to 'apps/plugins/puzzles/puzzles.make')
-rw-r--r-- | apps/plugins/puzzles/puzzles.make | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/apps/plugins/puzzles/puzzles.make b/apps/plugins/puzzles/puzzles.make index 8780986a51..87e113efa9 100644 --- a/apps/plugins/puzzles/puzzles.make +++ b/apps/plugins/puzzles/puzzles.make | |||
@@ -48,9 +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 = $(filter-out -O%,$(PLUGINFLAGS)) $(PUZZLESOPTIMIZE) \ | 51 | PUZZLESFLAGS = -I$(PUZZLES_SRCDIR)/dummy \ |
52 | -Wno-unused-parameter -Wno-sign-compare -Wno-strict-aliasing -w \ | 52 | $(filter-out -O%,$(PLUGINFLAGS)) $(PUZZLESOPTIMIZE) \ |
53 | -DFOR_REAL -I$(PUZZLES_SRCDIR) | 53 | -Wno-unused-parameter -Wno-sign-compare -Wno-strict-aliasing \ |
54 | -DFOR_REAL -I$(PUZZLES_SRCDIR)/src \ | ||
55 | -include $(PUZZLES_SRCDIR)/rbcompat.h | ||
54 | ifdef PUZZLES_COMBINED | 56 | ifdef PUZZLES_COMBINED |
55 | PUZZLESFLAGS += -DCOMBINED | 57 | PUZZLESFLAGS += -DCOMBINED |
56 | endif | 58 | endif |
@@ -71,11 +73,11 @@ $(PUZZLES_OBJDIR)/puzzles.ovl: $(PUZZLES_OBJ) $(PUZZLES_OUTLDS) $(TLSFLIB) | |||
71 | -lgcc $(PUZZLES_OVLFLAGS) | 73 | -lgcc $(PUZZLES_OVLFLAGS) |
72 | $(call PRINTS,LD $(@F))$(call objcopy,$(basename $@).elf,$@) | 74 | $(call PRINTS,LD $(@F))$(call objcopy,$(basename $@).elf,$@) |
73 | else | 75 | else |
74 | $(PUZZLES_OBJDIR)/sgt-%.rock: $(PUZZLES_OBJDIR)/%.o $(PUZZLES_SHARED_OBJ) $(TLSFLIB) | 76 | $(PUZZLES_OBJDIR)/sgt-%.rock: $(PUZZLES_OBJDIR)/src/%.o $(PUZZLES_SHARED_OBJ) $(TLSFLIB) |
75 | $(call PRINTS,LD $(@F))$(CC) $(PLUGINFLAGS) -o $(PUZZLES_OBJDIR)/$*.elf \ | 77 | $(call PRINTS,LD $(@F))$(CC) $(PLUGINFLAGS) -o $(PUZZLES_OBJDIR)/$*.elf \ |
76 | $(filter %.o, $^) \ | 78 | $(filter %.o, $^) \ |
77 | $(filter %.a, $+) \ | 79 | $(filter %.a, $+) \ |
78 | -lgcc $(filter-out -Wl%.map, $(PLUGINLDFLAGS)) -Wl,-Map,$(PUZZLES_OBJDIR)/$*.map | 80 | -lgcc $(filter-out -Wl%.map, $(PLUGINLDFLAGS)) -Wl,-Map,$(PUZZLES_OBJDIR)/src/$*.map |
79 | $(SILENT)$(call objcopy,$(PUZZLES_OBJDIR)/$*.elf,$@) | 81 | $(SILENT)$(call objcopy,$(PUZZLES_OBJDIR)/$*.elf,$@) |
80 | endif | 82 | endif |
81 | 83 | ||
@@ -87,3 +89,7 @@ $(PUZZLES_OBJDIR)/%.o: $(PUZZLES_SRCDIR)/%.c $(PUZZLES_SRCDIR)/puzzles.make | |||
87 | $(PUZZLES_OBJDIR)/unfinished/%.o: $(PUZZLES_SRCDIR)/unfinished/%.c $(PUZZLES_SRCDIR)/puzzles.make | 89 | $(PUZZLES_OBJDIR)/unfinished/%.o: $(PUZZLES_SRCDIR)/unfinished/%.c $(PUZZLES_SRCDIR)/puzzles.make |
88 | $(SILENT)mkdir -p $(dir $@) | 90 | $(SILENT)mkdir -p $(dir $@) |
89 | $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) -I$(dir $<) $(PUZZLESFLAGS) -c $< -o $@ | 91 | $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) -I$(dir $<) $(PUZZLESFLAGS) -c $< -o $@ |
92 | |||
93 | $(PUZZLES_OBJDIR)/src/%.o: $(PUZZLES_SRCDIR)/src/%.c $(PUZZLES_SRCDIR)/puzzles.make | ||
94 | $(SILENT)mkdir -p $(dir $@) | ||
95 | $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) -I$(dir $<) $(PUZZLESFLAGS) -c $< -o $@ | ||