From: notaz Date: Sat, 19 Oct 2019 20:15:44 +0000 (+0300) Subject: Merge pull request #101 from ccawley2011/evdev X-Git-Tag: v2.00~668^2~3 X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=29cdf77cf3932c36afddb98df1f06c4e6aba7a73;hp=7ddd8501a72bd53a98083e7137a2e26f7d615a7f;p=picodrive.git Merge pull request #101 from ccawley2011/evdev Only build evdev code on GP2X and Pandora (it's only used by them). --- diff --git a/Makefile b/Makefile index 2903a689..40c9f617 100644 --- a/Makefile +++ b/Makefile @@ -98,6 +98,7 @@ platform/libpicofe/linux/plat.o: CFLAGS += -DPANDORA OBJS += platform/pandora/plat.o OBJS += platform/pandora/asm_utils.o OBJS += platform/common/arm_utils.o +OBJS += platform/libpicofe/linux/in_evdev.o OBJS += platform/libpicofe/linux/fbdev.o OBJS += platform/libpicofe/linux/xenv.o OBJS += platform/libpicofe/pandora/plat.o @@ -105,6 +106,7 @@ USE_FRONTEND = 1 endif ifeq "$(PLATFORM)" "gp2x" OBJS += platform/common/arm_utils.o +OBJS += platform/libpicofe/linux/in_evdev.o OBJS += platform/libpicofe/gp2x/in_gp2x.o OBJS += platform/libpicofe/gp2x/soc.o OBJS += platform/libpicofe/gp2x/soc_mmsp2.o @@ -132,8 +134,7 @@ OBJS += platform/common/main.o platform/common/emu.o \ # libpicofe OBJS += platform/libpicofe/input.o platform/libpicofe/readpng.o \ - platform/libpicofe/fonts.o platform/libpicofe/linux/in_evdev.o \ - platform/libpicofe/linux/plat.o + platform/libpicofe/fonts.o platform/libpicofe/linux/plat.o # libpicofe - sound OBJS += platform/libpicofe/sndout.o diff --git a/platform/linux/in_evdev.h b/platform/linux/in_evdev.h deleted file mode 100644 index c5aef9bb..00000000 --- a/platform/linux/in_evdev.h +++ /dev/null @@ -1,5 +0,0 @@ - -struct in_default_bind; -extern int in_evdev_allow_abs_only; - -void in_evdev_init(const struct in_default_bind *defbinds);