From a86e9a3e58f55bf49d99dfd5e5d6413e17149593 Mon Sep 17 00:00:00 2001 From: notaz Date: Sat, 8 Sep 2012 21:30:31 +0300 Subject: [PATCH] move common files to root --- common/arm_linux.S => arm_linux.S | 0 common/arm_linux.h => arm_linux.h | 0 common/fonts.c => fonts.c | 0 common/fonts.h => fonts.h | 0 gp2x/in_gp2x.c | 2 +- gp2x/soc_dummy.c | 2 +- gp2x/soc_mmsp2.c | 6 +++--- gp2x/soc_pollux.c | 6 +++--- common/in_sdl.c => in_sdl.c | 0 common/in_sdl.h => in_sdl.h | 0 common/input.c => input.c | 0 common/input.h => input.h | 0 linux/in_evdev.c | 2 +- linux/plat.c | 2 +- linux/sndout_oss.c | 2 +- common/lprintf.h => lprintf.h | 0 common/menu.c => menu.c | 0 common/menu.h => menu.h | 0 common/plat.h => plat.h | 0 common/posix.h => posix.h | 0 common/readpng.c => readpng.c | 0 common/readpng.h => readpng.h | 0 win32/direct.cpp | 2 +- win32/dsnd.cpp | 2 +- win32/in_vk.c | 4 ++-- 25 files changed, 15 insertions(+), 15 deletions(-) rename common/arm_linux.S => arm_linux.S (100%) rename common/arm_linux.h => arm_linux.h (100%) rename common/fonts.c => fonts.c (100%) rename common/fonts.h => fonts.h (100%) rename common/in_sdl.c => in_sdl.c (100%) rename common/in_sdl.h => in_sdl.h (100%) rename common/input.c => input.c (100%) rename common/input.h => input.h (100%) rename common/lprintf.h => lprintf.h (100%) rename common/menu.c => menu.c (100%) rename common/menu.h => menu.h (100%) rename common/plat.h => plat.h (100%) rename common/posix.h => posix.h (100%) rename common/readpng.c => readpng.c (100%) rename common/readpng.h => readpng.h (100%) diff --git a/common/arm_linux.S b/arm_linux.S similarity index 100% rename from common/arm_linux.S rename to arm_linux.S diff --git a/common/arm_linux.h b/arm_linux.h similarity index 100% rename from common/arm_linux.h rename to arm_linux.h diff --git a/common/fonts.c b/fonts.c similarity index 100% rename from common/fonts.c rename to fonts.c diff --git a/common/fonts.h b/fonts.h similarity index 100% rename from common/fonts.h rename to fonts.h diff --git a/gp2x/in_gp2x.c b/gp2x/in_gp2x.c index 196f121..14c823d 100644 --- a/gp2x/in_gp2x.c +++ b/gp2x/in_gp2x.c @@ -6,7 +6,7 @@ #include #include -#include "../common/input.h" +#include "../input.h" #include "in_gp2x.h" #define IN_GP2X_PREFIX "gp2x:" diff --git a/gp2x/soc_dummy.c b/gp2x/soc_dummy.c index 9991082..89b1d71 100644 --- a/gp2x/soc_dummy.c +++ b/gp2x/soc_dummy.c @@ -2,7 +2,7 @@ #include #include "soc.h" -#include "../common/emu.h" +#include "../emu.h" extern void *gp2x_screens[4]; diff --git a/gp2x/soc_mmsp2.c b/gp2x/soc_mmsp2.c index 35748d8..e2a2f1d 100644 --- a/gp2x/soc_mmsp2.c +++ b/gp2x/soc_mmsp2.c @@ -11,9 +11,9 @@ #include "soc.h" #include "soc_mmsp2.h" #include "plat_gp2x.h" -#include "../common/emu.h" -#include "../common/plat.h" -#include "../common/arm_utils.h" +#include "../emu.h" +#include "../plat.h" +#include "../arm_utils.h" #include "940ctl.h" volatile unsigned short *gp2x_memregs; diff --git a/gp2x/soc_pollux.c b/gp2x/soc_pollux.c index b7a8a12..6a6dde0 100644 --- a/gp2x/soc_pollux.c +++ b/gp2x/soc_pollux.c @@ -20,9 +20,9 @@ #include "soc.h" #include "plat_gp2x.h" -#include "../common/emu.h" -#include "../common/plat.h" -#include "../common/arm_utils.h" +#include "../emu.h" +#include "../plat.h" +#include "../arm_utils.h" #include "pollux_set.h" static volatile unsigned short *memregs; diff --git a/common/in_sdl.c b/in_sdl.c similarity index 100% rename from common/in_sdl.c rename to in_sdl.c diff --git a/common/in_sdl.h b/in_sdl.h similarity index 100% rename from common/in_sdl.h rename to in_sdl.h diff --git a/common/input.c b/input.c similarity index 100% rename from common/input.c rename to input.c diff --git a/common/input.h b/input.h similarity index 100% rename from common/input.h rename to input.h diff --git a/linux/in_evdev.c b/linux/in_evdev.c index b447da1..f06f495 100644 --- a/linux/in_evdev.c +++ b/linux/in_evdev.c @@ -19,7 +19,7 @@ #include #include -#include "../common/input.h" +#include "../input.h" #include "in_evdev.h" #define MAX_ABS_DEVS 8 diff --git a/linux/plat.c b/linux/plat.c index 4ed1e65..f793910 100644 --- a/linux/plat.c +++ b/linux/plat.c @@ -19,7 +19,7 @@ #include #include -#include "../common/plat.h" +#include "../plat.h" /* XXX: maybe unhardcode pagesize? */ #define HUGETLB_PAGESIZE (2 * 1024 * 1024) diff --git a/linux/sndout_oss.c b/linux/sndout_oss.c index 2313d3f..9e959ef 100644 --- a/linux/sndout_oss.c +++ b/linux/sndout_oss.c @@ -98,7 +98,7 @@ int sndout_oss_write(const void *buff, int len) return write(sounddev, buff, len); } -#include "../common/plat.h" +#include "../plat.h" /* not really non-blocking, just detects if blocking occurs * and starts skipping writes in case it does. */ diff --git a/common/lprintf.h b/lprintf.h similarity index 100% rename from common/lprintf.h rename to lprintf.h diff --git a/common/menu.c b/menu.c similarity index 100% rename from common/menu.c rename to menu.c diff --git a/common/menu.h b/menu.h similarity index 100% rename from common/menu.h rename to menu.h diff --git a/common/plat.h b/plat.h similarity index 100% rename from common/plat.h rename to plat.h diff --git a/common/posix.h b/posix.h similarity index 100% rename from common/posix.h rename to posix.h diff --git a/common/readpng.c b/readpng.c similarity index 100% rename from common/readpng.c rename to readpng.c diff --git a/common/readpng.h b/readpng.h similarity index 100% rename from common/readpng.h rename to readpng.h diff --git a/win32/direct.cpp b/win32/direct.cpp index 033f87c..3d0738c 100644 --- a/win32/direct.cpp +++ b/win32/direct.cpp @@ -1,6 +1,6 @@ // ddraw #include -#include "../common/lprintf.h" +#include "../lprintf.h" #include "direct.h" #include "main.h" diff --git a/win32/dsnd.cpp b/win32/dsnd.cpp index 4e1930e..974b3b2 100644 --- a/win32/dsnd.cpp +++ b/win32/dsnd.cpp @@ -6,7 +6,7 @@ #include #include "dsnd.h" -#include "../common/lprintf.h" +#include "../lprintf.h" #define NSEGS 4 #define RELEASE(x) if (x) x->Release(); x=NULL; diff --git a/win32/in_vk.c b/win32/in_vk.c index 44e1fde..f114f74 100644 --- a/win32/in_vk.c +++ b/win32/in_vk.c @@ -3,8 +3,8 @@ #undef RC_INVOKED #include -#include "../common/input.h" -#include "../common/emu.h" // array_size +#include "../input.h" +#include "../emu.h" // array_size #include "in_vk.h" #define IN_VK_PREFIX "vk:" -- 2.39.2