fix gp2x build and some obvious menu glitches

git-svn-id: file:///home/notaz/opt/svn/PicoDrive/platform@665 be3aeb3a-fb24-0410-a615-afba39da0efa

gp2x/Makefile

@@ -54,14 +54,15 @@ LD = $(CROSS)ld
 OBJCOPY = $(CROSS)objcopy
 
 # frontend
-OBJS += main.o gp2x.o emu.o in_gp2x.o squidgehack.o cpuctrl.o
+# TODO: clean cpuctrl
+OBJS += main.o gp2x.o emu.o in_gp2x.o plat.o squidgehack.o cpuctrl.o
 # 940 core control
 OBJS += 940ctl.o
 
 # common
 OBJS += platform/common/emu.o platform/common/menu.o platform/common/fonts.o platform/common/config.o \
 	platform/common/arm_utils.o platform/common/arm_linux.o platform/common/readpng.o \
-	platform/common/mp3_helix.o platform/common/input.o platform/linux/usbjoy.o \
+	platform/common/mp3_helix.o platform/common/input.o \
 	platform/linux/sndout_oss.o platform/linux/plat.o
 
 # Pico

gp2x/gp2x.c

@@ -35,6 +35,7 @@
 #include "../linux/sndout_oss.h"
 #include "../common/arm_utils.h"
 #include "../common/arm_linux.h"
+#include "../common/emu.h"
 
 volatile unsigned short *gp2x_memregs;
 //static
@@ -196,7 +197,6 @@ void gp2x_pd_clone_buffer2(void)
 
 unsigned long gp2x_joystick_read(int unused)
 {
-	int i;
   	unsigned long value=(gp2x_memregs[0x1198>>1] & 0x00FF); // GPIO M
   	if(value==0xFD) value=0xFA;
   	if(value==0xF7) value=0xEB;

gp2x/port_config.h

@@ -3,6 +3,8 @@
 #ifndef PORT_CONFIG_H
 #define PORT_CONFIG_H
 
+#include "version.h"
+
 #define CASE_SENSITIVE_FS 1 // CS filesystem
 #define DONT_OPEN_MANY_FILES 0
 #define REDUCE_IO_CALLS 0