Moved the AMD K5 and K6 CPU's and the ATi VGA Wonder XL24 to the Dev branch;

Turned the char arrays in gameport.h into const char pointers;
The makefile no longer links in the (unfinished) PIIX4 emulation code (which is currently not used by anything even in the Dev branch).
This commit is contained in:
OBattler
2018-02-18 13:43:49 +01:00
parent e0a9de85c9
commit 1405d9b10b
13 changed files with 120 additions and 18 deletions

View File

@@ -8,7 +8,7 @@
#
# Makefile for Win32 (MinGW32) environment.
#
# Version: @(#)Makefile.mingw 1.0.102 2018/02/18
# Version: @(#)Makefile.mingw 1.0.103 2018/02/18
#
# Authors: Miran Grca, <mgrca8@gmail.com>
# Fred N. van Kempen, <decwiz@yahoo.com>
@@ -58,6 +58,9 @@ endif
ifndef DEV_BRANCH
DEV_BRANCH := n
endif
ifndef AMD_K
AMD_K := n
endif
ifndef CRASHDUMP
CRASHDUMP := n
endif
@@ -91,6 +94,9 @@ endif
ifndef STEALTH32
STEALTH32 := n
endif
ifndef XL24
XL24 := n
endif
ifndef DYNAREC
DYNAREC := y
endif
@@ -108,6 +114,7 @@ endif
ifeq ($(DEV_BUILD), y)
DEBUG := y
DEV_BRANCH := y
AMD_K := y
CRASHDUMP := y
GREENB := y
I686 := y
@@ -117,6 +124,7 @@ PAS16 := y
PORTABLE3 := y
STEALTH32 := y
VNC := y
XL24 := y
endif
# WxWidgets basic info. Extract using the config program.
@@ -301,6 +309,10 @@ ifeq ($(DEV_BRANCH), y)
OPTS += -DDEV_BRANCH
DEVBROBJ :=
ifeq ($(AMD_K), y)
OPTS += -DUSE_AMD_K
endif
ifeq ($(CRASHDUMPOBJ), y)
OPTS += -DUSE_CRASHDUMP
DEVBROBJ += win_crashdump.o
@@ -340,6 +352,10 @@ OPTS += -DUSE_STEALTH32
DEVBROBJ += vid_icd2061.o
endif
ifeq ($(XL24), y)
OPTS += -DUSE_XL24
endif
endif
@@ -370,8 +386,7 @@ MAINOBJ := pc.o config.o random.o timer.o io.o dma.o nmi.o pic.o \
INTELOBJ := intel.o \
intel_flash.o \
intel_sio.o \
intel_piix.o intel_piix4.o
intel_sio.o intel_piix.o
CPUOBJ := cpu.o cpu_table.o \
808x.o 386.o 386_dynarec.o \