From f6620a45d00197f751a6fa4b13125c0d30723cb2 Mon Sep 17 00:00:00 2001 From: waltje Date: Sun, 1 Oct 2017 17:30:02 -0400 Subject: [PATCH] Moved the gameport and joysticks into subfolder. --- src/Makefile.mingw | 4 ++-- src/config.c | 4 ++-- src/{ => game}/gameport.c | 12 ++++++------ src/{ => game}/gameport.h | 0 src/{ => game}/joystick_ch_flightstick_pro.c | 8 ++++---- src/{ => game}/joystick_ch_flightstick_pro.h | 0 src/{ => game}/joystick_standard.c | 8 ++++---- src/{ => game}/joystick_standard.h | 0 src/{ => game}/joystick_sw_pad.c | 8 ++++---- src/{ => game}/joystick_sw_pad.h | 0 src/{ => game}/joystick_tm_fcs.c | 8 ++++---- src/{ => game}/joystick_tm_fcs.h | 0 src/machine/machine_amstrad.c | 2 +- src/machine/machine_at.c | 2 +- src/machine/machine_europc.c | 2 +- src/machine/machine_olivetti_m24.c | 2 +- src/machine/machine_ps1.c | 2 +- src/machine/machine_tandy.c | 2 +- src/machine/machine_xt.c | 2 +- src/pc.c | 4 ++-- src/win/win_joystick.cc | 4 ++-- src/win/win_joystickconfig.c | 2 +- src/win/win_settings.c | 4 ++-- 23 files changed, 40 insertions(+), 40 deletions(-) rename src/{ => game}/gameport.c (97%) rename src/{ => game}/gameport.h (100%) rename src/{ => game}/joystick_ch_flightstick_pro.c (96%) rename src/{ => game}/joystick_ch_flightstick_pro.h (100%) rename src/{ => game}/joystick_standard.c (98%) rename src/{ => game}/joystick_standard.h (100%) rename src/{ => game}/joystick_sw_pad.c (98%) rename src/{ => game}/joystick_sw_pad.h (100%) rename src/{ => game}/joystick_tm_fcs.c (95%) rename src/{ => game}/joystick_tm_fcs.h (100%) diff --git a/src/Makefile.mingw b/src/Makefile.mingw index ab5814472..9f149dfde 100644 --- a/src/Makefile.mingw +++ b/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, # Fred N. van Kempen, @@ -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 \ diff --git a/src/config.c b/src/config.c index daa775cf7..084e0bcac 100644 --- a/src/config.c +++ b/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, @@ -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" diff --git a/src/gameport.c b/src/game/gameport.c similarity index 97% rename from src/gameport.c rename to src/game/gameport.c index c1cff71e7..c36aea716 100644 --- a/src/gameport.c +++ b/src/game/gameport.c @@ -6,17 +6,17 @@ #include #include #include -#include "ibm.h" -#include "cpu/cpu.h" -#include "device.h" -#include "io.h" -#include "timer.h" +#include "../ibm.h" +#include "../cpu/cpu.h" +#include "../device.h" +#include "../io.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; diff --git a/src/gameport.h b/src/game/gameport.h similarity index 100% rename from src/gameport.h rename to src/game/gameport.h diff --git a/src/joystick_ch_flightstick_pro.c b/src/game/joystick_ch_flightstick_pro.c similarity index 96% rename from src/joystick_ch_flightstick_pro.c rename to src/game/joystick_ch_flightstick_pro.c index 94a7e5e0f..8e62e268f 100644 --- a/src/joystick_ch_flightstick_pro.c +++ b/src/game/joystick_ch_flightstick_pro.c @@ -3,12 +3,12 @@ #include #include #include -#include "ibm.h" -#include "device.h" -#include "timer.h" +#include "../ibm.h" +#include "../device.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() diff --git a/src/joystick_ch_flightstick_pro.h b/src/game/joystick_ch_flightstick_pro.h similarity index 100% rename from src/joystick_ch_flightstick_pro.h rename to src/game/joystick_ch_flightstick_pro.h diff --git a/src/joystick_standard.c b/src/game/joystick_standard.c similarity index 98% rename from src/joystick_standard.c rename to src/game/joystick_standard.c index c7d2ed704..582cdcdb3 100644 --- a/src/joystick_standard.c +++ b/src/game/joystick_standard.c @@ -3,12 +3,12 @@ #include #include #include -#include "ibm.h" -#include "device.h" -#include "timer.h" +#include "../ibm.h" +#include "../device.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() diff --git a/src/joystick_standard.h b/src/game/joystick_standard.h similarity index 100% rename from src/joystick_standard.h rename to src/game/joystick_standard.h diff --git a/src/joystick_sw_pad.c b/src/game/joystick_sw_pad.c similarity index 98% rename from src/joystick_sw_pad.c rename to src/game/joystick_sw_pad.c index 13b0e99b3..481228dbc 100644 --- a/src/joystick_sw_pad.c +++ b/src/game/joystick_sw_pad.c @@ -24,12 +24,12 @@ #include #include #include -#include "ibm.h" -#include "device.h" -#include "timer.h" +#include "../ibm.h" +#include "../device.h" +#include "../timer.h" +#include "../win/plat_joystick.h" #include "gameport.h" #include "joystick_sw_pad.h" -#include "plat_joystick.h" typedef struct diff --git a/src/joystick_sw_pad.h b/src/game/joystick_sw_pad.h similarity index 100% rename from src/joystick_sw_pad.h rename to src/game/joystick_sw_pad.h diff --git a/src/joystick_tm_fcs.c b/src/game/joystick_tm_fcs.c similarity index 95% rename from src/joystick_tm_fcs.c rename to src/game/joystick_tm_fcs.c index 2742f5430..eda1da086 100644 --- a/src/joystick_tm_fcs.c +++ b/src/game/joystick_tm_fcs.c @@ -3,12 +3,12 @@ #include #include #include -#include "ibm.h" -#include "device.h" -#include "timer.h" +#include "../ibm.h" +#include "../device.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) diff --git a/src/joystick_tm_fcs.h b/src/game/joystick_tm_fcs.h similarity index 100% rename from src/joystick_tm_fcs.h rename to src/game/joystick_tm_fcs.h diff --git a/src/machine/machine_amstrad.c b/src/machine/machine_amstrad.c index 467ec0b27..9f18f9516 100644 --- a/src/machine/machine_amstrad.c +++ b/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" diff --git a/src/machine/machine_at.c b/src/machine/machine_at.c index 63f3a9f7a..d4eff4422 100644 --- a/src/machine/machine_at.c +++ b/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" diff --git a/src/machine/machine_europc.c b/src/machine/machine_europc.c index 0f69cb93d..0413ecf1a 100644 --- a/src/machine/machine_europc.c +++ b/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" diff --git a/src/machine/machine_olivetti_m24.c b/src/machine/machine_olivetti_m24.c index 8818b2af4..b13e8495d 100644 --- a/src/machine/machine_olivetti_m24.c +++ b/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" diff --git a/src/machine/machine_ps1.c b/src/machine/machine_ps1.c index 962c71adc..45dddc558 100644 --- a/src/machine/machine_ps1.c +++ b/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" diff --git a/src/machine/machine_tandy.c b/src/machine/machine_tandy.c index a9eed1c03..b1a1c26bf 100644 --- a/src/machine/machine_tandy.c +++ b/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" diff --git a/src/machine/machine_xt.c b/src/machine/machine_xt.c index 9cf724174..ad5639e47 100644 --- a/src/machine/machine_xt.c +++ b/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" diff --git a/src/pc.c b/src/pc.c index 523bbbc5a..6326b4787 100644 --- a/src/pc.c +++ b/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, * Miran Grca, @@ -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" diff --git a/src/win/win_joystick.cc b/src/win/win_joystick.cc index e7525f09a..b7c487182 100644 --- a/src/win/win_joystick.cc +++ b/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, * Miran Grca, @@ -21,7 +21,7 @@ #include extern "C" { #include "../device.h" -#include "../gameport.h" +#include "../game/gameport.h" } #include "plat_joystick.h" #include "win.h" diff --git a/src/win/win_joystickconfig.c b/src/win/win_joystickconfig.c index c39406f15..eb8b7f152 100644 --- a/src/win/win_joystickconfig.c +++ b/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" diff --git a/src/win/win_settings.c b/src/win/win_settings.c index 3afb52b21..ffd755445 100644 --- a/src/win/win_settings.c +++ b/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, * 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"