From aaf3cf086d1c64e994382461c02454295cc9374b Mon Sep 17 00:00:00 2001
From: n-a-c-h <>
Date: Thu, 23 Mar 2006 21:38:05 +0000
Subject: [PATCH] Moved ManyMouse to own dir, and 8.3ified.

---
 zsnes/src/Makefile.in                          | 18 +++++++++++-------
 zsnes/src/{linux_evdev.c => mmlib/linux.c}     |  2 +-
 zsnes/src/{manymouse.c => mmlib/mm.c}          |  2 +-
 zsnes/src/{manymouse.h => mmlib/mm.h}          |  0
 .../src/{windows_wminput.c => mmlib/windows.c} |  2 +-
 zsnes/src/uic.c                                |  2 +-
 6 files changed, 15 insertions(+), 11 deletions(-)
 rename zsnes/src/{linux_evdev.c => mmlib/linux.c} (99%)
 rename zsnes/src/{manymouse.c => mmlib/mm.c} (98%)
 rename zsnes/src/{manymouse.h => mmlib/mm.h} (100%)
 rename zsnes/src/{windows_wminput.c => mmlib/windows.c} (99%)

diff --git a/zsnes/src/Makefile.in b/zsnes/src/Makefile.in
index 02dbaf8e..2190e579 100644
--- a/zsnes/src/Makefile.in
+++ b/zsnes/src/Makefile.in
@@ -29,6 +29,7 @@ TOOLSDIR=tools
 VIDEODIR=video
 WINDIR=linux
 ZIPDIR=zip
+MMLIBDIR=mmlib
 
 CHIPSOBJ=${CHIPDIR}/sfxproc.o ${CHIPDIR}/fxemu2.o ${CHIPDIR}/dsp1proc.o\
 	${CHIPDIR}/fxemu2b.o ${CHIPDIR}/fxemu2c.o ${CHIPDIR}/fxtable.o\
@@ -50,9 +51,10 @@ JMAOBJ=${JMADIR}/7zlzma.o ${JMADIR}/crc32.o ${JMADIR}/iiostrm.o\
 	${JMADIR}/inbyte.o ${JMADIR}/jma.o ${JMADIR}/lzma.o ${JMADIR}/lzmadec.o\
 	${JMADIR}/winout.o ${JMADIR}/zsnesjma.o
 
-MAINOBJ=cfgload.o cfg.o endmem.o init.o initc.o md.o uic.o patch.o ui.o\
-	vcache.o version.o zmovie.o zstate.o debug.o zloader.o manymouse.o\
-        linux_evdev.o
+MMLIBOBJ=${MMLIBDIR}/mm.o ${MMLIBDIR}/linux.o
+
+MAINOBJ=cfgload.o cfg.o endmem.o init.o initc.o md.o patch.o ui.o\
+	vcache.o version.o zmovie.o zstate.o debug.o zloader.o uic.o
 
 NETOBJ=
 #${NETDIR}/ztcp.os
@@ -77,7 +79,8 @@ WINDOSOBJ=${DOSDIR}/debug.o ${DOSDIR}/joy.o ${DOSDIR}/vesa2.o
 
 ZIPOBJ=${ZIPDIR}/unzip.o ${ZIPDIR}/zpng.o
 
-ZOBJS=${MAINOBJ} ${CHIPSOBJ} ${CPUOBJ} ${WINOBJ} ${WINDOSOBJ} ${GUIOBJ} ${VIDEOBJ} ${NETOBJ} ${ZIPOBJ} ${EFFECTSOBJ} ${JMAOBJ}
+ZOBJS=${MAINOBJ} ${CHIPSOBJ} ${CPUOBJ} ${WINOBJ} ${WINDOSOBJ} ${GUIOBJ} ${VIDEOBJ} ${NETOBJ} ${ZIPOBJ}\
+	${EFFECTSOBJ} ${JMAOBJ} ${MMLIBOBJ}
 
 PSR=parsegen
 
@@ -149,14 +152,12 @@ initc.o: initc.c asm_call.h gblhdr.h ${CPUDIR}/memtable.h ${JMADIR}/zsnesjma.h\
 md.o: md.psr ${PSR}
 patch.o: patch.c gblhdr.h ${ZIPDIR}/zunzip.h
 ui.o: ui.asm macros.mac
-uic.o: uic.c asm_call.h gblhdr.h
+uic.o: uic.c asm_call.h gblhdr.h ${MMLIBDIR}/mm.h
 vcache.o: vcache.asm macros.mac
 version.o: version.c
 zloader.o: zloader.c gblhdr.h
 zmovie.o: zmovie.c asm_call.h gblhdr.h gblvars.h numconv.h ${WINDIR}/safelib.h md.o
 zstate.o: zstate.c asm_call.h gblhdr.h gblvars.h numconv.h
-manymouse.o: manymouse.c
-linux_evdev.o: linux_evdev.c
 
 ${CHIPDIR}/c4emu.o: ${CHIPDIR}/c4emu.c gblhdr.h
 ${CHIPDIR}/dsp1emu.o: ${CHIPDIR}/dsp1emu.c gblhdr.h
@@ -230,6 +231,9 @@ ${JMADIR}/winout.o: ${JMADIR}/winout.cpp ${JMADIR}/winout.h
 ${JMADIR}/zsnesjma.o: ${JMADIR}/zsnesjma.cpp ${JMADIR}/jma.h\
 	${JMADIR}/zsnesjma.h
 
+${MMLIBDIR}/mm.o: ${MMLIBDIR}/mm.c ${MMLIBDIR}/mm.h
+${MMLIBDIR}/linux.o: ${MMLIBDIR}/linux.c ${MMLIBDIR}/mm.h
+
 ${TOOLSDIR}/fileutil.o: ${TOOLSDIR}/fileutil.cpp ${TOOLSDIR}/fileutil.h
 ${TOOLSDIR}/strutil.o: ${TOOLSDIR}/strutil.cpp ${TOOLSDIR}/strutil.h
 
diff --git a/zsnes/src/linux_evdev.c b/zsnes/src/mmlib/linux.c
similarity index 99%
rename from zsnes/src/linux_evdev.c
rename to zsnes/src/mmlib/linux.c
index b116881b..665dae1f 100644
--- a/zsnes/src/linux_evdev.c
+++ b/zsnes/src/mmlib/linux.c
@@ -21,7 +21,7 @@
 
 #include <linux/input.h>  /* evdev interface...  */
 
-#include "manymouse.h"
+#include "mm.h"
 
 #define test_bit(array, bit)    (array[bit/8] & (1<<(bit%8)))
 
diff --git a/zsnes/src/manymouse.c b/zsnes/src/mmlib/mm.c
similarity index 98%
rename from zsnes/src/manymouse.c
rename to zsnes/src/mmlib/mm.c
index 7b531eb0..f23f6176 100644
--- a/zsnes/src/manymouse.c
+++ b/zsnes/src/mmlib/mm.c
@@ -8,7 +8,7 @@
  */
 
 #include <stdlib.h>
-#include "manymouse.h"
+#include "mm.h"
 
 static const char *manymouse_copyright =
     "ManyMouse " MANYMOUSE_VERSION " (c) 2005 Ryan C. Gordon.";
diff --git a/zsnes/src/manymouse.h b/zsnes/src/mmlib/mm.h
similarity index 100%
rename from zsnes/src/manymouse.h
rename to zsnes/src/mmlib/mm.h
diff --git a/zsnes/src/windows_wminput.c b/zsnes/src/mmlib/windows.c
similarity index 99%
rename from zsnes/src/windows_wminput.c
rename to zsnes/src/mmlib/windows.c
index f43cb521..a0e4b503 100644
--- a/zsnes/src/windows_wminput.c
+++ b/zsnes/src/mmlib/windows.c
@@ -22,7 +22,7 @@
 #define WM_INPUT 0x00FF
 #endif
 
-#include "manymouse.h"
+#include "mm.h"
 
 /* that should be enough, knock on wood. */
 #define MAX_MICE 32
diff --git a/zsnes/src/uic.c b/zsnes/src/uic.c
index 8e4f1e3d..b7092784 100644
--- a/zsnes/src/uic.c
+++ b/zsnes/src/uic.c
@@ -30,7 +30,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 #endif
 
 #include "asm_call.h"
-#include "manymouse.h"
+#include "mmlib/mm.h"
 
 //C++ style code in C
 #define bool unsigned char