summaryrefslogtreecommitdiff
path: root/apps/plugins/pacbox
diff options
context:
space:
mode:
authorRafaël Carré <rafael.carre@gmail.com>2010-08-25 19:14:02 +0000
committerRafaël Carré <rafael.carre@gmail.com>2010-08-25 19:14:02 +0000
commit5615881955046b1642d6ee18dda0f199c78cfc04 (patch)
treeb194b9ae172e7da4ea1b5777a2058925e41db9c8 /apps/plugins/pacbox
parent7014faee69119b832451a136c25e63722100b85e (diff)
downloadrockbox-5615881955046b1642d6ee18dda0f199c78cfc04.zip
rockbox-5615881955046b1642d6ee18dda0f199c78cfc04.tar.gz
rockbox-5615881955046b1642d6ee18dda0f199c78cfc04.tar.bz2
rockbox-5615881955046b1642d6ee18dda0f199c78cfc04.tar.xz
Remove a bunch of build conditions inside .c files
Fix logic in pacbox makefiles for asm optimizations git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27887 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/plugins/pacbox')
-rw-r--r--apps/plugins/pacbox/SOURCES6
-rw-r--r--apps/plugins/pacbox/pacbox_lcd.c4
2 files changed, 3 insertions, 7 deletions
diff --git a/apps/plugins/pacbox/SOURCES b/apps/plugins/pacbox/SOURCES
index 65a5cf1..c062886 100644
--- a/apps/plugins/pacbox/SOURCES
+++ b/apps/plugins/pacbox/SOURCES
@@ -3,11 +3,11 @@ pacbox.c
hardware.c
z80.c
wsg3.c
+
#if defined(CPU_PP502x) && (LCD_WIDTH >= 288) && (LCD_HEIGHT >= 224)
pacbox_arm.S
+#elif defined(CPU_COLDFIRE)
+pacbox_cf.S
#else
pacbox_lcd.c
#endif
-#if defined(CPU_COLDFIRE)
-pacbox_cf.S
-#endif
diff --git a/apps/plugins/pacbox/pacbox_lcd.c b/apps/plugins/pacbox/pacbox_lcd.c
index c4df2fa..04bfe5f 100644
--- a/apps/plugins/pacbox/pacbox_lcd.c
+++ b/apps/plugins/pacbox/pacbox_lcd.c
@@ -28,8 +28,6 @@
#include "arcade.h"
#include "hardware.h"
-#if (CONFIG_PLATFORM & PLATFORM_HOSTED) || !defined(IRIVER_H300_SERIES)
-
void blit_display(fb_data* lcd_framebuffer, unsigned char* vbuf)
{
fb_data* dst;
@@ -143,5 +141,3 @@ void blit_display(fb_data* lcd_framebuffer, unsigned char* vbuf)
#endif /* Size >= 144x112 */
#endif /* Not Colour */
}
-
-#endif