From 33cdd16c22155637a14d160fd816836b8163df7b Mon Sep 17 00:00:00 2001 From: twinaphex Date: Mon, 12 Jan 2015 19:02:30 +0100 Subject: [PATCH] Move input/osk to osk/ --- Makefile.common | 2 +- griffin/griffin.c | 4 ++-- {input/osk => osk/drivers}/nullosk.c | 0 {input/osk => osk/drivers}/ps3_osk.c | 0 4 files changed, 3 insertions(+), 3 deletions(-) rename {input/osk => osk/drivers}/nullosk.c (100%) rename {input/osk => osk/drivers}/ps3_osk.c (100%) diff --git a/Makefile.common b/Makefile.common index 2e5266de3a..d40675febd 100644 --- a/Makefile.common +++ b/Makefile.common @@ -147,7 +147,7 @@ OBJ += frontend/frontend.o \ audio/drivers/nullaudio.o \ input/drivers/nullinput.o \ input/drivers_joypad/nullinput_joypad.o \ - input/osk/nullosk.o \ + osk/drivers/nullosk.o \ playlist.o \ movie.o \ record/ffemu.o \ diff --git a/griffin/griffin.c b/griffin/griffin.c index 5a6fe01dd5..bca1e95bdb 100644 --- a/griffin/griffin.c +++ b/griffin/griffin.c @@ -350,10 +350,10 @@ INPUT #endif #if defined(__CELLOS_LV2__) -#include "../input/osk/ps3_osk.c" +#include "../osk/drivers/ps3_osk.c" #endif -#include "../input/osk/nullosk.c" +#include "../osk/drivers/nullosk.c" #if defined(__linux__) && !defined(ANDROID) #include "../input/drivers/linuxraw_input.c" diff --git a/input/osk/nullosk.c b/osk/drivers/nullosk.c similarity index 100% rename from input/osk/nullosk.c rename to osk/drivers/nullosk.c diff --git a/input/osk/ps3_osk.c b/osk/drivers/ps3_osk.c similarity index 100% rename from input/osk/ps3_osk.c rename to osk/drivers/ps3_osk.c