move common files to root

gp2x/in_gp2x.c

@@ -6,7 +6,7 @@
 #include <fcntl.h>
 #include <unistd.h>
 
-#include "../common/input.h"
+#include "../input.h"
 #include "in_gp2x.h"
 
 #define IN_GP2X_PREFIX "gp2x:"

gp2x/soc_dummy.c

@@ -2,7 +2,7 @@
 #include <stdlib.h>
 
 #include "soc.h"
-#include "../common/emu.h"
+#include "../emu.h"
 
 extern void *gp2x_screens[4];
 

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;

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;

linux/in_evdev.c

@@ -19,7 +19,7 @@
 #include <linux/input.h>
 #include <errno.h>
 
-#include "../common/input.h"
+#include "../input.h"
 #include "in_evdev.h"
 
 #define MAX_ABS_DEVS 8

linux/plat.c

@@ -19,7 +19,7 @@
 #include <sys/mman.h>
 #include <errno.h>
 
-#include "../common/plat.h"
+#include "../plat.h"
 
 /* XXX: maybe unhardcode pagesize? */
 #define HUGETLB_PAGESIZE (2 * 1024 * 1024)

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. */

win32/direct.cpp

@@ -1,6 +1,6 @@
 // ddraw
 #include <ddraw.h>
-#include "../common/lprintf.h"
+#include "../lprintf.h"
 #include "direct.h"
 #include "main.h"
 

win32/dsnd.cpp

@@ -6,7 +6,7 @@
 #include <dsound.h>
 
 #include "dsnd.h"
-#include "../common/lprintf.h"
+#include "../lprintf.h"
 
 #define NSEGS 4
 #define RELEASE(x) if (x) x->Release();  x=NULL;

win32/in_vk.c

@@ -3,8 +3,8 @@
 #undef RC_INVOKED
 #include <string.h>
 
-#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:"