From b701322fea42c809092f50e252f45ddfc38293c3 Mon Sep 17 00:00:00 2001 From: Jens Arnold Date: Fri, 27 Jul 2007 09:57:27 +0000 Subject: Rockbox compiles and boots now on the 2nd gen, but doesn't work properly yet. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@14021 a1c6a512-1295-4272-9138-f99709370657 --- apps/plugins/doom/Makefile | 2 +- apps/plugins/doom/i_video.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) (limited to 'apps/plugins/doom') diff --git a/apps/plugins/doom/Makefile b/apps/plugins/doom/Makefile index 46bd728..2fe2088 100644 --- a/apps/plugins/doom/Makefile +++ b/apps/plugins/doom/Makefile @@ -56,7 +56,7 @@ endif # The arm code compiles too large for the plugin buffer when set to optimize for speed #ifeq ($(CC), arm-elf-gcc) -ifneq (,$(strip $(foreach tgt,SANSA_E200 IPOD_NANO IPOD_COLOR IPOD_VIDEO IPOD_MINI IPOD_3G IPOD_4G IRIVER_H10_5GB IRIVER_H10 GIGABEAT_F,$(findstring $(tgt),$(TARGET))))) +ifneq (,$(strip $(foreach tgt,SANSA_E200 IPOD_NANO IPOD_COLOR IPOD_VIDEO IPOD_MINI IPOD_1G2G IPOD_3G IPOD_4G IRIVER_H10_5GB IRIVER_H10 GIGABEAT_F,$(findstring $(tgt),$(TARGET))))) CFLAGS += -Os ifndef SIMVER ifeq ($(TARGET), IRIVER_H100) diff --git a/apps/plugins/doom/i_video.c b/apps/plugins/doom/i_video.c index 6bac32b..24079a0 100644 --- a/apps/plugins/doom/i_video.c +++ b/apps/plugins/doom/i_video.c @@ -149,7 +149,8 @@ void I_ShutdownGraphics(void) // I_StartTic // -#if (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_3G_PAD) +#if (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_3G_PAD) || \ + (CONFIG_KEYPAD == IPOD_1G2G_PAD) //#define DOOMBUTTON_SCROLLWHEEL #define DOOMBUTTON_UP BUTTON_MENU #define DOOMBUTTON_WEAPON BUTTON_SELECT @@ -258,7 +259,8 @@ inline void getkey() event.type = ev_keyup; hswitch=0; } -#if (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_3G_PAD) +#if (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_3G_PAD) || \ + (CONFIG_KEYPAD == IPOD_1G2G_PAD) /* Bring up the menu */ event.data1=KEY_ESCAPE; #else -- cgit v1.1