claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Moved the gameport and joysticks into subfolder.

Browse Source
This commit is contained in:
waltje
2017-10-01 17:30:02 -04:00
parent a01eb7ef34
commit f6620a45d0
23 changed files with 40 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Makefile.mingw
View File

@@ -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 \

4
src/config.c
View File

@@ -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"

12
src/gameport.c → src/game/gameport.c
View File

@@ -6,17 +6,17 @@
#include <string.h>
#include <stdlib.h>
#include <wchar.h>
#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;

0
src/gameport.h → src/game/gameport.h
View File

8
src/joystick_ch_flightstick_pro.c → src/game/joystick_ch_flightstick_pro.c
View File

@@ -3,12 +3,12 @@
#include <string.h>
#include <stdlib.h>
#include <wchar.h>
#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()

0
src/joystick_ch_flightstick_pro.h → src/game/joystick_ch_flightstick_pro.h
View File

8
src/joystick_standard.c → src/game/joystick_standard.c
View File

@@ -3,12 +3,12 @@
#include <string.h>
#include <stdlib.h>
#include <wchar.h>
#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()

0
src/joystick_standard.h → src/game/joystick_standard.h
View File

8
src/joystick_sw_pad.c → src/game/joystick_sw_pad.c
View File

@@ -24,12 +24,12 @@
#include <string.h>
#include <stdlib.h>
#include <wchar.h>
#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

0
src/joystick_sw_pad.h → src/game/joystick_sw_pad.h
View File

8
src/joystick_tm_fcs.c → src/game/joystick_tm_fcs.c
View File

@@ -3,12 +3,12 @@
#include <string.h>
#include <stdlib.h>
#include <wchar.h>
#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)

0
src/joystick_tm_fcs.h → src/game/joystick_tm_fcs.h
View File

2
src/machine/machine_amstrad.c
View File

@@ -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"

2
src/machine/machine_at.c
View File

@@ -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"

2
src/machine/machine_europc.c
View File

@@ -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"

2
src/machine/machine_olivetti_m24.c
View File

@@ -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"

2
src/machine/machine_ps1.c
View File

@@ -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"

2
src/machine/machine_tandy.c
View File

@@ -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"

2
src/machine/machine_xt.c
View File

@@ -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"

4
src/pc.c
View File

@@ -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"

4
src/win/win_joystick.cc
View File

@@ -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"

2
src/win/win_joystickconfig.c
View File

@@ -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"

4
src/win/win_settings.c
View File

@@ -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"