Moved the gameport and joysticks into subfolder.

src/Makefile.mingw

@@ -8,7 +8,7 @@
 #
 #		Modified Makefile for Win32 (MinGW32) environment.
 #
-# Version:	@(#)Makefile.mingw	1.0.50	2017/10/01
+# Version:	@(#)Makefile.mingw	1.0.51	2017/10/01
 #
 # Authors:	Miran Grca, <mgrca8@gmail.com>
 #               Fred N. van Kempen, <decwiz@yahoo.com>
@@ -96,7 +96,7 @@ endif
 #		Nothing should need changing from here on..		#
 #########################################################################
 VPATH		:= $(EXPATH) . cpu \
-		   cdrom floppy hdd machine \
+		   cdrom floppy game hdd machine \
 		   sound \
 			    sound/munt sound/munt/c_interface sound/munt/sha1 \
 		     sound/munt/srchelper \

src/config.c

@@ -8,7 +8,7 @@
  *
  *		Configuration file handler.
  *
- * Version:	@(#)config.c	1.0.9	2017/10/01
+ * Version:	@(#)config.c	1.0.10	2017/10/01
  *
  * Authors:	Sarah Walker,
  *		Miran Grca, <mgrca8@gmail.com>
@@ -32,9 +32,9 @@
 #include "cpu/cpu.h"
 #include "config.h"
 #include "device.h"
-#include "gameport.h"
 #include "lpt.h"
 #include "nvr.h"
+#include "game/gameport.h"
 #include "cdrom/cdrom.h"
 #include "floppy/floppy.h"
 #include "floppy/fdc.h"

src/game/gameport.c

@@ -6,17 +6,17 @@
 #include <string.h>
 #include <stdlib.h>
 #include <wchar.h>
-#include "ibm.h"
+#include "../ibm.h"
-#include "cpu/cpu.h"
+#include "../cpu/cpu.h"
-#include "device.h"
+#include "../device.h"
-#include "io.h"
+#include "../io.h"
-#include "timer.h"
+#include "../timer.h"
 #include "gameport.h"
 #include "joystick_ch_flightstick_pro.h"
 #include "joystick_standard.h"
 #include "joystick_sw_pad.h"
 #include "joystick_tm_fcs.h"
-#include "plat_joystick.h"
+#include "../win/plat_joystick.h"
 
 
 int joystick_type;

src/game/joystick_ch_flightstick_pro.c

@@ -3,12 +3,12 @@
 #include <string.h>
 #include <stdlib.h>
 #include <wchar.h>
-#include "ibm.h"
+#include "../ibm.h"
-#include "device.h"
+#include "../device.h"
-#include "timer.h"
+#include "../timer.h"
+#include "../win/plat_joystick.h"
 #include "gameport.h"
 #include "joystick_standard.h"
-#include "plat_joystick.h"
 
 
 static void *ch_flightstick_pro_init()

src/game/joystick_standard.c

@@ -3,12 +3,12 @@
 #include <string.h>
 #include <stdlib.h>
 #include <wchar.h>
-#include "ibm.h"
+#include "../ibm.h"
-#include "device.h"
+#include "../device.h"
-#include "timer.h"
+#include "../timer.h"
+#include "../win/plat_joystick.h"
 #include "gameport.h"
 #include "joystick_standard.h"
-#include "plat_joystick.h"
 
 
 static void *joystick_standard_init()

src/game/joystick_sw_pad.c

@@ -24,12 +24,12 @@
 #include <string.h>
 #include <stdlib.h>
 #include <wchar.h>
-#include "ibm.h"
+#include "../ibm.h"
-#include "device.h"
+#include "../device.h"
-#include "timer.h"
+#include "../timer.h"
+#include "../win/plat_joystick.h"
 #include "gameport.h"
 #include "joystick_sw_pad.h"
-#include "plat_joystick.h"
 
 
 typedef struct

src/game/joystick_tm_fcs.c

@@ -3,12 +3,12 @@
 #include <string.h>
 #include <stdlib.h>
 #include <wchar.h>
-#include "ibm.h"
+#include "../ibm.h"
-#include "device.h"
+#include "../device.h"
-#include "timer.h"
+#include "../timer.h"
+#include "../win/plat_joystick.h"
 #include "gameport.h"
 #include "joystick_standard.h"
-#include "plat_joystick.h"
 
 
 static void *tm_fcs_init(void)

src/machine/machine_amstrad.c

@@ -11,7 +11,7 @@
 #include "../rom.h"
 #include "../device.h"
 #include "../nvr.h"
-#include "../gameport.h"
+#include "../game/gameport.h"
 #include "../keyboard.h"
 #include "../keyboard_amstrad.h"
 #include "../mouse.h"

src/machine/machine_at.c

@@ -10,7 +10,7 @@
 #include "../device.h"
 #include "../nvr.h"
 #include "../bugger.h"
-#include "../gameport.h"
+#include "../game/gameport.h"
 #include "../keyboard_at.h"
 #include "../lpt.h"
 #include "../hdd/hdc.h"

src/machine/machine_europc.c

@@ -13,7 +13,7 @@
 #include "../rom.h"
 #include "../device.h"
 #include "../nvr.h"
-#include "../gameport.h"
+#include "../game/gameport.h"
 #include "../keyboard_xt.h"
 #include "../lpt.h"
 #include "machine_common.h"

src/machine/machine_olivetti_m24.c

@@ -12,7 +12,7 @@
 #include "../mem.h"
 #include "../device.h"
 #include "../nvr.h"
-#include "../gameport.h"
+#include "../game/gameport.h"
 #include "../keyboard_olim24.h"
 #include "machine_common.h"
 #include "machine_olivetti_m24.h"

src/machine/machine_ps1.c

@@ -15,7 +15,7 @@
 #include "../rom.h"
 #include "../device.h"
 #include "../nvr.h"
-#include "../gameport.h"
+#include "../game/gameport.h"
 #include "../lpt.h"
 #include "../serial.h"
 #include "../keyboard_at.h"

src/machine/machine_tandy.c

@@ -7,7 +7,7 @@
 #include "../mem.h"
 #include "../rom.h"
 #include "../device.h"
-#include "../gameport.h"
+#include "../game/gameport.h"
 #include "../keyboard_xt.h"
 #include "../tandy_eeprom.h"
 #include "../tandy_rom.h"

src/machine/machine_xt.c

@@ -8,7 +8,7 @@
 #include "../mem.h"
 #include "../device.h"
 #include "../bugger.h"
-#include "../gameport.h"
+#include "../game/gameport.h"
 #include "../keyboard_xt.h"
 #include "machine_common.h"
 #include "machine_xt.h"

src/pc.c

@@ -8,7 +8,7 @@
  *
  *		Emulation core dispatcher.
  *
- * Version:	@(#)pc.c	1.0.15	2017/10/01
+ * Version:	@(#)pc.c	1.0.16	2017/10/01
  *
  * Authors:	Sarah Walker, <http://pcem-emulator.co.uk/>
  *		Miran Grca, <mgrca8@gmail.com>
@@ -33,7 +33,7 @@
 #include "dma.h"
 #include "random.h"
 #include "device.h"
-#include "gameport.h"
+#include "game/gameport.h"
 #include "floppy/floppy.h"
 #include "floppy/floppy_86f.h"
 #include "floppy/floppy_fdi.h"

src/win/win_joystick.cc

@@ -8,7 +8,7 @@
  *
  *		Joystick interface to host device.
  *
- * Version:	@(#)win_joystick.cc	1.0.1	2017/09/24
+ * Version:	@(#)win_joystick.cc	1.0.2	2017/10/01
  *
  * Authors:	Sarah Walker, <http://pcem-emulator.co.uk/>
  *		Miran Grca, <mgrca8@gmail.com>
@@ -21,7 +21,7 @@
 #include <stdint.h>
 extern "C" {
 #include "../device.h"
-#include "../gameport.h"
+#include "../game/gameport.h"
 }
 #include "plat_joystick.h"
 #include "win.h"

src/win/win_joystickconfig.c

@@ -12,7 +12,7 @@
 #include "../ibm.h"
 #include "../config.h"
 #include "../device.h"
-#include "../gameport.h"
+#include "../game/gameport.h"
 #include "plat_joystick.h"
 #include "win.h"
 

src/win/win_settings.c

@@ -8,7 +8,7 @@
  *
  *		Windows 86Box Settings dialog handler.
  *
- * Version:	@(#)win_settings.c	1.0.15	2017/10/01
+ * Version:	@(#)win_settings.c	1.0.16	2017/10/01
  *
  * Author:	Miran Grca, <mgrca8@gmail.com>
  *		Copyright 2016,2017 Miran Grca.
@@ -32,7 +32,7 @@
 #include "../device.h"
 #include "../nvr.h"
 #include "../machine/machine.h"
-#include "../gameport.h"
+#include "../game/gameport.h"
 #include "../lpt.h"
 #include "../mouse.h"
 #include "../cdrom/cdrom.h"