From d3adc13445caafa037d1dac05c1585697562f247 Mon Sep 17 00:00:00 2001
From: Melissa Goad <alegend45@gmail.com>
Date: Thu, 27 Jul 2017 14:48:43 -0500
Subject: [PATCH] Ready experimental branch for remerging into master

---
 src/Makefile.mingw   | 12 +++++++++---
 src/Makefile.mingw64 |  2 +-
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/Makefile.mingw b/src/Makefile.mingw
index 00889f507..d63c46706 100644
--- a/src/Makefile.mingw
+++ b/src/Makefile.mingw
@@ -22,7 +22,7 @@ endif
 # Various compile-time options.
 # -DROM_TRACE=0xcd800 traces ROM access from segment C800
 # -DIO_TACE=0x66 traces I/O on port 0x66
-STUFF	= -DDEV_BRANCH
+STUFF	=
 
 # Add feature selections here.
 # -DANSI_CFG forces the config file to ANSI encoding.
@@ -52,6 +52,9 @@ endif
 ifndef USB
 USB	= n
 endif
+ifndef DEV_BRANCH
+DEV_BRANCH = n
+endif
 ifndef X64
 X64	= n
 endif
@@ -223,7 +226,6 @@ VIDOBJ	= video.o \
 	  vid_genius.o \
 	  vid_s3.o vid_s3_virge.o \
 	  vid_et4000.o vid_et4000w32.o vid_icd2061.o \
-	  vid_nv_riva128.o \
 	  vid_oti067.o \
 	  vid_paradise.o \
 	  vid_tvga.o vid_tgui9440.o vid_tkd8001_ramdac.o \
@@ -247,8 +249,12 @@ WINOBJ	= win.o \
 	  win_iodev.o win_joystick.o win_midi.o \
 	  win_settings.o win_deviceconfig.o win_joystickconfig.o \
 	  86Box.res
+ifdef DEV_BRANCH
+DEVOBJ = vid_nv_riva128.o
+endif
 OBJ	= $(MAINOBJ) $(CPUOBJ) $(SYSOBJ) $(DEVOBJ) $(USBOBJ) \
-	  $(NETOBJ) $(SCSIOBJ) $(SNDOBJ) $(VIDOBJ) $(WINOBJ)
+	  $(NETOBJ) $(SCSIOBJ) $(SNDOBJ) $(VIDOBJ) $(WINOBJ) \
+	  $(DEVOBJ)
 
 LZFOBJ	= lzf_c.o lzf_d.o
 
diff --git a/src/Makefile.mingw64 b/src/Makefile.mingw64
index 2f0f9b408..53efdd58b 100644
--- a/src/Makefile.mingw64
+++ b/src/Makefile.mingw64
@@ -28,6 +28,6 @@ EXTRAS	=
 DEBUG	= n
 OPTIM	= n
 X64	= y
-
+DEV_BRANCH = n
 
 # End of Makefile.mingw64.