diff options
| -rw-r--r-- | uisimulator/x11/Makefile | 11 | ||||
| -rw-r--r-- | uisimulator/x11/button-x11.c | 2 |
2 files changed, 9 insertions, 4 deletions
diff --git a/uisimulator/x11/Makefile b/uisimulator/x11/Makefile index d6cfece..407f7b9 100644 --- a/uisimulator/x11/Makefile +++ b/uisimulator/x11/Makefile @@ -29,11 +29,14 @@ CC = gcc RM = rm -f DEBUG = -g -#DISPLAY = -DHAVE_LCD_CHARCELLS -DISPLAY = -DHAVE_LCD_BITMAP +DISPLAY = -DHAVE_LCD_CHARCELLS +#DISPLAY = -DHAVE_LCD_BITMAP + +KEYPAD = -DHAVE_PLAYER_KEYPAD +#KEYPAD = -DHAVE_RECORDER_KEYPAD DEFINES = -DHAVE_CONFIG_H -DGETTIMEOFDAY_TWO_ARGS -DSIMULATOR \ --DHAVE_RECORDER_KEYPAD $(DISPLAY) +$(KEYPAD) $(DISPLAY) LDFLAGS = -lX11 -lm -lXt -lXmu -lnsl @@ -46,7 +49,7 @@ ifeq ($(UNAME),Linux) INCLUDES += -I/usr/X11R6/include LIBDIRS = -L/usr/X11R6/lib DEFINES += -DLINUX -DLITTLE_ENDIAN - MPEG_PLAY = 1 +# MPEG_PLAY = 1 else DEFINES += -DBIG_ENDIAN LIBDIRS = diff --git a/uisimulator/x11/button-x11.c b/uisimulator/x11/button-x11.c index c3afa4b..b138d1e 100644 --- a/uisimulator/x11/button-x11.c +++ b/uisimulator/x11/button-x11.c @@ -63,6 +63,7 @@ static int get_raw_button (void) case XK_KP_2: return BUTTON_DOWN; +#ifdef HAVE_RECORDER_KEYPAD case XK_KP_Space: case XK_KP_5: return BUTTON_PLAY; @@ -81,6 +82,7 @@ static int get_raw_button (void) case XK_KP_Subtract: return BUTTON_F3; +#endif default: return 0; |