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

2 files changed, 3 insertions, 7 deletions

diff --git a/apps/plugins/pacbox/SOURCES b/apps/plugins/pacbox/SOURCES
index 65a5cf1cb9..c06288699f 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 c4df2fa6cd..04bfe5f797 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