From 36c71a60ca82f9777fbdd239f63f62ccf68cf3f5 Mon Sep 17 00:00:00 2001 From: Maurus Cuelenaere Date: Thu, 29 Jan 2009 20:49:43 +0000 Subject: Get checkwps working again git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19880 a1c6a512-1295-4272-9138-f99709370657 --- firmware/export/button.h | 4 ++-- firmware/export/font.h | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'firmware') diff --git a/firmware/export/button.h b/firmware/export/button.h index 0b4c8fd2b0..ebfc1272cb 100644 --- a/firmware/export/button.h +++ b/firmware/export/button.h @@ -68,11 +68,11 @@ int button_apply_acceleration(const unsigned int data); #define BUTTON_TOUCHSCREEN 0x08000000 #ifdef HAVE_TOUCHSCREEN -#if !defined(BUTTON_TOPLEFT) || !defined(BUTTON_TOPMIDDLE) \ +#if (!defined(BUTTON_TOPLEFT) || !defined(BUTTON_TOPMIDDLE) \ || !defined(BUTTON_TOPRIGHT) || !defined(BUTTON_MIDLEFT) \ || !defined(BUTTON_CENTER) || !defined(BUTTON_MIDRIGHT) \ || !defined(BUTTON_BOTTOMLEFT) || !defined(BUTTON_BOTTOMMIDDLE) \ - || !defined(BUTTON_BOTTOMRIGHT) + || !defined(BUTTON_BOTTOMRIGHT)) && !defined(__PCTOOL__) #error Touchscreen button mode BUTTON_* defines not set up correctly #endif enum touchscreen_mode { diff --git a/firmware/export/font.h b/firmware/export/font.h index 75b012d722..d17fa18b8b 100644 --- a/firmware/export/font.h +++ b/firmware/export/font.h @@ -62,11 +62,13 @@ * must be available at system startup. * Fonts are specified in firmware/font.c. */ +#ifndef __PCTOOL__ enum { FONT_SYSFIXED, /* system fixed pitch font*/ FONT_UI, /* system porportional font*/ MAXFONTS }; +#endif /* * .fnt loadable font file format definition -- cgit v1.2.3