1
0
Fork 0
forked from len0rd/rockbox

puzzles: fix building on c200v2

- disables Solo and Loopy

Change-Id: I3de15c0ad001683a4303950972af2f5988d438d0
This commit is contained in:
Franklin Wei 2017-01-15 14:07:18 -05:00
parent d221ca6e5b
commit 0bdb255a4e
3 changed files with 16 additions and 7 deletions

View file

@ -19,9 +19,6 @@ net.c
netslide.c netslide.c
/*palisade.c*/ /*palisade.c*/
pattern.c pattern.c
#if PLUGIN_BUFFER_SIZE > 0x20000
pearl.c
#endif
pegs.c pegs.c
range.c range.c
rect.c rect.c
@ -45,3 +42,10 @@ untangle.c
/*unfinished/separate.c*/ /*unfinished/separate.c*/
/*unfinished/slide.c*/ /*unfinished/slide.c*/
/*unfinished/sokoban.c*/ /*unfinished/sokoban.c*/
/* no c200v2 */
#if PLUGIN_BUFFER_SIZE > 0x14000
pearl.c
loopy.c
solo.c
#endif

View file

@ -42,8 +42,13 @@ PUZZLES_ROCKS := $(addprefix $(PUZZLES_OBJDIR)/sgt-, $(notdir $(PUZZLES_GAMES_SR
ROCKS += $(PUZZLES_ROCKS) ROCKS += $(PUZZLES_ROCKS)
endif endif
# Hack to suppress all warnings: PUZZLESOPTIMIZE := -O3
PUZZLESFLAGS = $(filter-out -O%,$(PLUGINFLAGS)) -O3 \ ifeq ($(MODELNAME), sansac200v2)
PUZZLESOPTIMIZE := -Os
endif
# we suppress all warnings
PUZZLESFLAGS = $(filter-out -O%,$(PLUGINFLAGS)) $(PUZZLESOPTIMIZE) \
-Wno-unused-parameter -Wno-sign-compare -Wno-strict-aliasing -w \ -Wno-unused-parameter -Wno-sign-compare -Wno-strict-aliasing -w \
-DFOR_REAL -I$(PUZZLES_SRCDIR) -DFOR_REAL -I$(PUZZLES_SRCDIR)
ifdef PUZZLES_COMBINED ifdef PUZZLES_COMBINED

View file

@ -207,7 +207,7 @@ static inline void plot(unsigned x, unsigned y, unsigned long a,
r2 = RGB_UNPACK_RED(orig); r2 = RGB_UNPACK_RED(orig);
g2 = RGB_UNPACK_GREEN(orig); g2 = RGB_UNPACK_GREEN(orig);
b2 = RGB_UNPACK_BLUE(orig); b2 = RGB_UNPACK_BLUE(orig);
#lse #else
r2 = orig.r; r2 = orig.r;
g2 = orig.g; g2 = orig.g;
b2 = orig.b; b2 = orig.b;