diff options
| author | Franklin Wei <git@fwei.tk> | 2017-01-04 20:31:06 -0500 |
|---|---|---|
| committer | Franklin Wei <git@fwei.tk> | 2017-01-04 20:36:04 -0500 |
| commit | 31907283a4bb3aaa69a5b9cc1c1606271fb58660 (patch) | |
| tree | a3a94baac3a95c0e0d257a827fdecb1ffc33033b /apps/plugins/puzzles/puzzles.make | |
| parent | ad2297d353412dd20fc439b8053b25b18872069c (diff) | |
| download | rockbox-31907283a4bb3aaa69a5b9cc1c1606271fb58660.zip rockbox-31907283a4bb3aaa69a5b9cc1c1606271fb58660.tar.gz rockbox-31907283a4bb3aaa69a5b9cc1c1606271fb58660.tar.bz2 rockbox-31907283a4bb3aaa69a5b9cc1c1606271fb58660.tar.xz | |
puzzles: fix a few things
- old acos() function was broken, replaced with a call to atan2(); this fixes "Cube!"
- Makefile extended to support building "unfinished games", but not enabled
- a backdrop issue fixed in rockbox.c
Change-Id: I9393e958d43de32f4ccf18e1cb409f75c2e1ed3c
Diffstat (limited to 'apps/plugins/puzzles/puzzles.make')
| -rw-r--r-- | apps/plugins/puzzles/puzzles.make | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/apps/plugins/puzzles/puzzles.make b/apps/plugins/puzzles/puzzles.make index 4e1f3a1..4052423 100644 --- a/apps/plugins/puzzles/puzzles.make +++ b/apps/plugins/puzzles/puzzles.make @@ -45,7 +45,7 @@ endif # Hack to suppress all warnings: PUZZLESFLAGS = $(filter-out -O%,$(PLUGINFLAGS)) -Os \ -Wno-unused-parameter -Wno-sign-compare -Wno-strict-aliasing -w \ - -DFOR_REAL + -DFOR_REAL -I$(PUZZLES_SRCDIR) ifdef PUZZLES_COMBINED PUZZLESFLAGS += -DCOMBINED endif @@ -106,9 +106,18 @@ $(PUZZLES_OBJDIR)/sgt-undead.rock: $(PUZZLES_OBJDIR)/undead.o $(PUZZLES_SHARED_O $(PUZZLES_OBJDIR)/sgt-unequal.rock: $(PUZZLES_OBJDIR)/unequal.o $(PUZZLES_SHARED_OBJ) $(TLSFLIB) $(PUZZLES_OBJDIR)/sgt-unruly.rock: $(PUZZLES_OBJDIR)/unruly.o $(PUZZLES_SHARED_OBJ) $(TLSFLIB) $(PUZZLES_OBJDIR)/sgt-untangle.rock: $(PUZZLES_OBJDIR)/untangle.o $(PUZZLES_SHARED_OBJ) $(TLSFLIB) + +$(PUZZLES_OBJDIR)/sgt-group.rock: $(PUZZLES_OBJDIR)/unfinished/group.o $(PUZZLES_SHARED_OBJ) $(TLSFLIB) +$(PUZZLES_OBJDIR)/sgt-separate.rock: $(PUZZLES_OBJDIR)/unfinished/separate.o $(PUZZLES_SHARED_OBJ) $(TLSFLIB) +$(PUZZLES_OBJDIR)/sgt-slide.rock: $(PUZZLES_OBJDIR)/unfinished/slide.o $(PUZZLES_SHARED_OBJ) $(TLSFLIB) +$(PUZZLES_OBJDIR)/sgt-sokoban.rock: $(PUZZLES_OBJDIR)/unfinished/sokoban.o $(PUZZLES_SHARED_OBJ) $(TLSFLIB) endif # special pattern rule for compiling puzzles with extra flags $(PUZZLES_OBJDIR)/%.o: $(PUZZLES_SRCDIR)/%.c $(PUZZLES_SRCDIR)/puzzles.make $(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 + $(SILENT)mkdir -p $(dir $@) + $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) -I$(dir $<) $(PUZZLESFLAGS) -c $< -o $@ |