Moved the MR Intel Advanced/ATX to the Dev branch.

This commit is contained in:
OBattler
2018-03-06 00:51:48 +01:00
parent 381dd2376c
commit 9356ae8bed
4 changed files with 22 additions and 4 deletions

View File

@@ -8,7 +8,7 @@
#
# Makefile for Win32 (MinGW32) environment.
#
# Version: @(#)Makefile.mingw 1.0.108 2018/03/05
# Version: @(#)Makefile.mingw 1.0.109 2018/03/06
#
# Authors: Miran Grca, <mgrca8@gmail.com>
# Fred N. van Kempen, <decwiz@yahoo.com>
@@ -50,6 +50,9 @@ ifeq ($(DEV_BUILD), y)
ifndef LASERXT
LASERXT := y
endif
ifndef MRTHOR
MRTHOR := y
endif
ifndef NV_RIVA
NV_RIVA := y
endif
@@ -90,6 +93,9 @@ else
ifndef LASERXT
LASERXT := n
endif
ifndef MRTHOR
MRTHOR := n
endif
ifndef NV_RIVA
NV_RIVA := n
endif
@@ -365,6 +371,10 @@ OPTS += -DUSE_LASERXT
DEVBROBJ += m_xt_laserxt.o
endif
ifeq ($(MRTHOR), y)
OPTS += -DUSE_MRTHOR
endif
ifeq ($(NV_RIVA), y)
OPTS += -DUSE_RIVA
DEVBROBJ += vid_nv_riva128.o