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

Moved the two Laser XT machines to the Dev branch.

Browse Source
This commit is contained in:
OBattler
2018-01-28 17:56:32 +01:00
parent 97cc1774f6
commit cc7579b898
5 changed files with 36 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/win/Makefile.mingw
View File

@@ -8,7 +8,7 @@
#
# Makefile for Win32 (MinGW32) environment.
#
# Version: @(#)Makefile.mingw 1.0.95 2018/01/28
# Version: @(#)Makefile.mingw 1.0.96 2018/01/28
#
# Authors: Miran Grca, <mgrca8@gmail.com>
# Fred N. van Kempen, <decwiz@yahoo.com>
@@ -71,6 +71,9 @@ endif
ifndef I686
I686 := n
endif
ifndef LASERXT
LASERXT := n
endif
ifndef NV_RIVA
NV_RIVA := n
endif
@@ -112,6 +115,7 @@ DEV_BRANCH := y
CIRRUS := y
GREENB := y
I686 := y
LASERXT := y
NV_RIVA := y
PAS16 := y
PORTABLE3 := y
@@ -319,6 +323,11 @@ OPTS += -DUSE_I686
DEVBROBJ += m_at_440fx.o
endif
ifeq ($(LASERXT), y)
OPTS += -DUSE_LASERXT
DEVBROBJ += m_xt_laserxt.o
endif
ifeq ($(NV_RIVA), y)
OPTS += -DUSE_RIVA
DEVBROBJ += vid_nv_riva128.o
@@ -371,7 +380,7 @@ CPUOBJ := cpu.o cpu_table.o \
MCHOBJ := machine.o machine_table.o \
m_amstrad.o m_europc.o m_europc_hdc.o \
m_olivetti_m24.o m_tandy.o \
m_xt.o m_xt_compaq.o m_xt_laserxt.o \
m_xt.o m_xt_compaq.o \
m_at.o m_at_ali1429.o m_at_commodore.o \
m_at_neat.o m_at_headland.o \
m_at_t3100e.o \