puzzles: update frontend for new upstream, misc. changes

The upstream code changed a little bit with regard to the request_keys()
API. Also, we save some bytes (especially on the c200v2) by compiling with
-ffunction-sections and -fdata-sections, which allows Net to fit once again.

Change-Id: I3ab30127169c73e4cd8996f0c12e1223ee18d79f

1 files changed, 8 insertions, 6 deletions

diff --git a/apps/plugins/puzzles/puzzles.make b/apps/plugins/puzzles/puzzles.make
index 80a2aba76c..45f591d544 100644
--- a/apps/plugins/puzzles/puzzles.make
+++ b/apps/plugins/puzzles/puzzles.make
@@ -33,12 +33,14 @@ ifeq ($(MODELNAME), sansac200v2)
 PUZZLES_OPTIMIZE = -Os # tiny plugin buffer
 endif
 
-# we suppress all warnings
-PUZZLESFLAGS =  -I$(PUZZLES_SRCDIR)/dummy                                       \
-                $(filter-out -O%,$(PLUGINFLAGS)) $(PUZZLES_OPTIMIZE)            \
-                -Wno-unused-parameter -Wno-sign-compare -Wno-strict-aliasing -w \
-                -DFOR_REAL -I$(PUZZLES_SRCDIR)/src -I$(PUZZLES_SRCDIR) -include \
-                $(PUZZLES_SRCDIR)/rbcompat.h
+# we suppress all warnings with -w
+PUZZLESFLAGS = -I$(PUZZLES_SRCDIR)/dummy $(filter-out                   \
+                -O%,$(PLUGINFLAGS)) $(PUZZLES_OPTIMIZE)                 \
+                -Wno-unused-parameter -Wno-sign-compare                 \
+                -Wno-strict-aliasing -DFOR_REAL                         \
+                -I$(PUZZLES_SRCDIR)/src -I$(PUZZLES_SRCDIR) -include    \
+                $(PUZZLES_SRCDIR)/rbcompat.h -ffunction-sections        \
+                -fdata-sections -w
 
 $(PUZZLES_OBJDIR)/sgt-%.rock: $(PUZZLES_OBJDIR)/src/%.o $(PUZZLES_OBJDIR)/help/%.o $(PUZZLES_SHARED_OBJ) $(TLSFLIB)
         $(call PRINTS,LD $(@F))$(CC) $(PLUGINFLAGS) -o $(PUZZLES_OBJDIR)/$*.elf \