diff options
-rw-r--r-- | tools/checkwps/SOURCES | 10 | ||||
-rw-r--r-- | tools/checkwps/checkwps.c | 4 | ||||
-rw-r--r-- | tools/checkwps/checkwps.make | 8 | ||||
-rwxr-xr-x | tools/configure | 1 |
4 files changed, 16 insertions, 7 deletions
diff --git a/tools/checkwps/SOURCES b/tools/checkwps/SOURCES new file mode 100644 index 0000000000..80b2f76510 --- /dev/null +++ b/tools/checkwps/SOURCES | |||
@@ -0,0 +1,10 @@ | |||
1 | ../../apps/gui/skin_engine/wps_debug.c | ||
2 | ../../apps/gui/skin_engine/skin_parser.c | ||
3 | ../../apps/gui/skin_engine/skin_buffer.c | ||
4 | ../../apps/misc.c | ||
5 | ../../firmware/common/strlcpy.c | ||
6 | checkwps.c | ||
7 | |||
8 | #ifdef HAVE_LCD_BITMAP | ||
9 | ../../apps/recorder/bmp.c | ||
10 | #endif | ||
diff --git a/tools/checkwps/checkwps.c b/tools/checkwps/checkwps.c index 88ef179cb2..6e985195fb 100644 --- a/tools/checkwps/checkwps.c +++ b/tools/checkwps/checkwps.c | |||
@@ -348,9 +348,11 @@ const char* viewport_parse_viewport(struct viewport *vp, | |||
348 | #if (LCD_DEPTH == 1) || (defined(HAVE_REMOTE_LCD) && LCD_REMOTE_DEPTH == 1) | 348 | #if (LCD_DEPTH == 1) || (defined(HAVE_REMOTE_LCD) && LCD_REMOTE_DEPTH == 1) |
349 | if (depth == 1) | 349 | if (depth == 1) |
350 | { | 350 | { |
351 | #ifdef HAVE_LCD_BITMAP | ||
351 | if (!(ptr = parse_list("ddddd", &set, separator, ptr, | 352 | if (!(ptr = parse_list("ddddd", &set, separator, ptr, |
352 | &vp->x, &vp->y, &vp->width, &vp->height, &vp->font))) | 353 | &vp->x, &vp->y, &vp->width, &vp->height, &vp->font))) |
353 | return NULL; | 354 | return NULL; |
355 | #endif | ||
354 | } | 356 | } |
355 | else | 357 | else |
356 | #endif | 358 | #endif |
@@ -397,6 +399,7 @@ const char* viewport_parse_viewport(struct viewport *vp, | |||
397 | return NULL; | 399 | return NULL; |
398 | } | 400 | } |
399 | 401 | ||
402 | #ifdef HAVE_LCD_BITMAP | ||
400 | /* Default to using the user font if the font was an invalid number or '-'*/ | 403 | /* Default to using the user font if the font was an invalid number or '-'*/ |
401 | if (((vp->font != FONT_SYSFIXED) && (vp->font != FONT_UI)) | 404 | if (((vp->font != FONT_SYSFIXED) && (vp->font != FONT_UI)) |
402 | || !LIST_VALUE_PARSED(set, PL_FONT) | 405 | || !LIST_VALUE_PARSED(set, PL_FONT) |
@@ -405,6 +408,7 @@ const char* viewport_parse_viewport(struct viewport *vp, | |||
405 | 408 | ||
406 | /* Set the defaults for fields not user-specified */ | 409 | /* Set the defaults for fields not user-specified */ |
407 | vp->drawmode = DRMODE_SOLID; | 410 | vp->drawmode = DRMODE_SOLID; |
411 | #endif | ||
408 | 412 | ||
409 | return ptr; | 413 | return ptr; |
410 | } | 414 | } |
diff --git a/tools/checkwps/checkwps.make b/tools/checkwps/checkwps.make index 0a455e9770..22a1f07263 100644 --- a/tools/checkwps/checkwps.make +++ b/tools/checkwps/checkwps.make | |||
@@ -9,13 +9,7 @@ | |||
9 | 9 | ||
10 | FLAGS=-g -D__PCTOOL__ -DDEBUG -DROCKBOX_DIR_LEN=9 -DWPS_DIR=\".\" $(TARGET) | 10 | FLAGS=-g -D__PCTOOL__ -DDEBUG -DROCKBOX_DIR_LEN=9 -DWPS_DIR=\".\" $(TARGET) |
11 | 11 | ||
12 | SRC = $(ROOTDIR)/apps/gui/skin_engine/wps_debug.c \ | 12 | SRC= $(call preprocess, $(TOOLSDIR)/checkwps/SOURCES) |
13 | $(ROOTDIR)/apps/gui/skin_engine/skin_parser.c \ | ||
14 | $(ROOTDIR)/apps/gui/skin_engine/skin_buffer.c \ | ||
15 | $(ROOTDIR)/apps/misc.c \ | ||
16 | $(ROOTDIR)/apps/recorder/bmp.c \ | ||
17 | $(ROOTDIR)/firmware/common/strlcpy.c \ | ||
18 | $(APPSDIR)/checkwps.c | ||
19 | 13 | ||
20 | INCLUDES = -I$(ROOTDIR)/apps/gui \ | 14 | INCLUDES = -I$(ROOTDIR)/apps/gui \ |
21 | -I$(ROOTDIR)/apps/gui/skin_engine \ | 15 | -I$(ROOTDIR)/apps/gui/skin_engine \ |
diff --git a/tools/configure b/tools/configure index 3cbb77fedf..693113e19f 100755 --- a/tools/configure +++ b/tools/configure | |||
@@ -2519,6 +2519,7 @@ fi | |||
2519 | GCCOPTS=''; | 2519 | GCCOPTS=''; |
2520 | appsdir='\$(ROOTDIR)/tools/checkwps'; | 2520 | appsdir='\$(ROOTDIR)/tools/checkwps'; |
2521 | output='checkwps.'${modelname}; | 2521 | output='checkwps.'${modelname}; |
2522 | archosrom=''; | ||
2522 | echo "CheckWPS build selected" | 2523 | echo "CheckWPS build selected" |
2523 | ;; | 2524 | ;; |
2524 | *) | 2525 | *) |