claunia/VARCem
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Re-worked the MVR framework to allow for custom RTC chips. Fixes EuroPC and Tosh T1000/1200.

Browse Source 
Cleaned up and re-integrated the Toshiba T1000/T1200 machines.
Moved LZF files to floppy/, as that is the only module using them.
Various bugfixes and cleanups here and there.
This commit is contained in:
waltje
2018-03-11 23:23:45 -05:00
parent f818aa78a9
commit e69a12f7ea
68 changed files with 2746 additions and 3016 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/win/Makefile.mingw
View File

@@ -8,7 +8,7 @@
#
# Makefile for Windows systems using the MinGW32 environment.
#
# Version: @(#)Makefile.mingw 1.0.9 2018/03/08
# Version: @(#)Makefile.mingw 1.0.10 2018/03/11
#
# Author: Fred N. van Kempen, <decwiz@yahoo.com>
#
@@ -196,12 +196,12 @@ endif
# Nothing should need changing from here on.. #
#########################################################################
VPATH := $(EXPATH) . cpu \
cdrom disk floppy game sio machine \
cdrom disk floppy floppy/lzf game sio machine \
sound \
sound/munt sound/munt/c_interface sound/munt/sha1 \
sound/munt/srchelper \
sound/resid-fp \
scsi video lzf network network/slirp win
scsi video network network/slirp win
#
# Select the required build environment. We have, uhm, many..
@@ -455,8 +455,8 @@ CXXFLAGS := $(WX_FLAGS) $(OPTS) $(DFLAGS) $(COPTIM) $(AOPTIM) \
#########################################################################
MAINOBJ := pc.o config.o random.o timer.o io.o dma.o nmi.o pic.o \
pit.o ppi.o pci.o mca.o mcr.o mem.o memregs.o rom.o \
rom_load.o device.o nvr.o nvr_tc8521.o rtc_tc8521.o \
nvr_at.o nvr_ps2.o $(VNCOBJ) $(RDPOBJ)
rom_load.o device.o nvr.o nvr_at.o nvr_ps2.o \
$(VNCOBJ) $(RDPOBJ)
INTELOBJ := intel.o \
intel_flash.o \
@@ -501,7 +501,7 @@ DEVOBJ := bugger.o lpt.o $(SERIAL) \
FDDOBJ := fdc.o \
fdd.o \
fdd_common.o fdd_86f.o \
fdd_fdi.o fdi2raw.o \
fdd_fdi.o fdi2raw.o lzf_c.o lzf_d.o \
fdd_imd.o fdd_img.o fdd_json.o fdd_td0.o
HDDOBJ := hdd.o \
@@ -604,7 +604,6 @@ ifdef EXOBJ
OBJ += $(EXOBJ)
endif
LZFOBJ := lzf_c.o lzf_d.o
LIBS := -mwindows \
-lddraw -ldinput8 -ldxguid -ld3d9 -ld3dx9 \
@@ -663,9 +662,9 @@ VARCem.res: VARCem.rc VARCem.mpp
@echo Processing $<
@$(WINDRES) $(RFLAGS) $(EXTRAS) -i $< -o VARCem.res
$(PROG).exe: $(OBJ) $(LZFOBJ) VARCem.res
$(PROG).exe: $(OBJ) VARCem.res
@echo Linking $(PROG).exe ..
@$(CC) -o $(PROG).exe $(OBJ) $(LZFOBJ) VARCem.res $(LIBS)
@$(CC) -o $(PROG).exe $(OBJ) VARCem.res $(LIBS)
ifneq ($(DEBUG), y)
@strip $(PROG).exe
endif

4
src/win/VARCem.rc
View File

@@ -8,7 +8,7 @@
*
* Application resource script for Windows.
*
* Version: @(#)VARCem.rc 1.0.6 2018/03/08
* Version: @(#)VARCem.rc 1.0.7 2018/03/10
*
* Authors: Fred N. van Kempen, <decwiz@yahoo.com>
* Miran Grca, <mgrca8@gmail.com>
@@ -980,7 +980,7 @@ BEGIN
IDS_2168 "&Image..."
IDS_2169 "Image (&Write-protected)..."
IDS_2170 "Check BPB"
IDS_2171 "Unable to initialize FluidSynth, make sure you have the following libraries\nin your program folder:\n\nlibfluidsynth.dll\nlibglib-2.0-0.dll\nlibiconv-2.dll\nlibintl-8.dll\nlibpcre-1.dll"
IDS_2171 "Unable to initialize FluidSynth, make sure you have the following library\nin your program folder:\n\nlibfluidsynth.dll"
IDS_2172 "E&xport to 86F..."
IDS_2173 "Surface images (*.86F)\0*.86F\0"
IDS_2174 "All images (*.86F;*.DSK;*.FLP;*.IM?;*.*FD?)\0*.86F;*.DSK;*.FLP;*.IM?;*.*FD?\0Basic sector images (*.DSK;*.FLP;*.IM?;*.*FD?)\0*.DSK;*.FLP;*.IM?;*.IMG;*.*FD?\0Surface images (*.86F)\0*.86F\0"

3
src/win/win.c
View File

@@ -8,7 +8,7 @@
*
* Platform main support module for Windows.
*
* Version: @(#)win.c 1.0.6 2018/03/08
* Version: @(#)win.c 1.0.7 2018/03/10
*
* Authors: Fred N. van Kempen, <decwiz@yahoo.com>
* Miran Grca, <mgrca8@gmail.com>
@@ -53,7 +53,6 @@
#include "../video/video.h"
#define GLOBAL
#include "../plat.h"
#include "../plat_midi.h"
#include "../ui.h"
#ifdef USE_VNC
# include "../vnc.h"

3
src/win/win_devconf.c
View File

@@ -8,7 +8,7 @@
*
* Imlementation of the Device Configuration dialog.
*
* Version: @(#)win_devconf.c 1.0.3 2018/03/07
* Version: @(#)win_devconf.c 1.0.4 2018/03/10
*
* Authors: Fred N. van Kempen, <decwiz@yahoo.com>
* Miran Grca, <mgrca8@gmail.com>
@@ -48,7 +48,6 @@
#include "../config.h"
#include "../device.h"
#include "../plat.h"
#include "../plat_midi.h"
#include "../ui.h"
#include "win.h"

4
src/win/win_dynld.c
View File

@@ -8,7 +8,7 @@
*
* Try to load a support DLL.
*
* Version: @(#)win_dynld.c 1.0.2 2018/03/07
* Version: @(#)win_dynld.c 1.0.3 2018/03/10
*
* Authors: Fred N. van Kempen, <decwiz@yahoo.com>
*
@@ -52,7 +52,7 @@
#include <stdlib.h>
#include <wchar.h>
#include "../emu.h"
#include "../plat_dynld.h"
#include "../plat.h"
void *

5
src/win/win_joystick.cpp
View File

@@ -11,7 +11,7 @@
* NOTE: Hacks currently needed to compile with MSVC; DX needs to
* be updated to 11 or 12 or so. --FvK
*
* Version: @(#)win_joystick.cpp 1.0.4 2018/03/08
* Version: @(#)win_joystick.cpp 1.0.5 2018/03/10
*
* Authors: Fred N. van Kempen, <decwiz@yahoo.com>
* Miran Grca, <mgrca8@gmail.com>
@@ -53,9 +53,8 @@
#include <math.h>
#include "../emu.h"
#include "../device.h"
#include "../plat.h"
#include "../game/gameport.h"
#include "../plat_joystick.h"
#include "../plat.h"
#include "win.h"

3
src/win/win_jsconf.c
View File

@@ -8,7 +8,7 @@
*
* Implementation of the Joystick Configuration dialog.
*
* Version: @(#)win_jsconf.c 1.0.2 2018/03/07
* Version: @(#)win_jsconf.c 1.0.3 2018/03/10
*
* Authors: Fred N. van Kempen, <decwiz@yahoo.com>
* Miran Grca, <mgrca8@gmail.com>
@@ -48,7 +48,6 @@
#include "../device.h"
#include "../game/gameport.h"
#include "../plat.h"
#include "../plat_joystick.h"
#include "win.h"

3
src/win/win_midi.c
View File

@@ -8,7 +8,7 @@
*
* Implementation of the System MIDI interface.
*
* Version: @(#)win_midi.c 1.0.2 2018/03/07
* Version: @(#)win_midi.c 1.0.3 2018/03/10
*
* Authors: Fred N. van Kempen, <decwiz@yahoo.com>
* Miran Grca, <mgrca8@gmail.com>
@@ -47,7 +47,6 @@
#include "../config.h"
#include "../sound/midi.h"
#include "../plat.h"
#include "../plat_midi.h"
#include "win.h"

3
src/win/win_settings.c
View File

@@ -8,7 +8,7 @@
*
* Implementation of the Settings dialog.
*
* Version: @(#)win_settings.c 1.0.8 2018/03/08
* Version: @(#)win_settings.c 1.0.9 2018/03/10
*
* Authors: Fred N. van Kempen, <decwiz@yahoo.com>
* Miran Grca, <mgrca8@gmail.com>
@@ -70,7 +70,6 @@
#include "../video/video.h"
#include "../video/vid_voodoo.h"
#include "../plat.h"
#include "../plat_midi.h"
#include "../ui.h"
#include "win.h"

5
src/win/win_ui.c
View File

@@ -8,7 +8,7 @@
*
* Implement the user Interface module.
*
* Version: @(#)win_ui.c 1.0.4 2018/03/07
* Version: @(#)win_ui.c 1.0.5 2018/03/10
*
* Authors: Fred N. van Kempen, <decwiz@yahoo.com>
* Miran Grca, <mgrca8@gmail.com>
@@ -51,9 +51,8 @@
#include "../keyboard.h"
#include "../mouse.h"
#include "../video/video.h"
#include "../video/vid_ega.h" // for update_overscan
#include "../video/vid_ega.h" /* for update_overscan */
#include "../plat.h"
#include "../plat_midi.h"
#include "../ui.h"
#include "win.h"
#include "win_d3d.h"