Merge pull request #157 from MoochMcGee/experimental

Update RIVA 128 emulation and allow dev branch to be compiled from mainline 86Box.

src/Makefile.mingw

@@ -22,9 +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
-ifndef STUFF
 STUFF	=
-endif
 
 # Add feature selections here.
 # -DANSI_CFG forces the config file to ANSI encoding.
@@ -54,6 +52,9 @@ endif
 ifndef USB
 USB	= n
 endif
+ifndef DEV_BRANCH
+DEV_BRANCH = n
+endif
 ifndef X64
 X64	= n
 endif
@@ -248,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
 

src/Makefile.mingw64

@@ -28,6 +28,6 @@ EXTRAS	=
 DEBUG	= n
 OPTIM	= n
 X64	= y
-
+DEV_BRANCH = n
 
 # End of Makefile.mingw64.

src/VIDEO/video.c

@@ -93,6 +93,10 @@ static VIDEO_CARD video_cards[] =
         {"MDA",                                    "mda",		&mda_device,                 GFX_MDA},
         {"MDSI Genius",                            "genius",            &genius_device,              GFX_GENIUS},
         {"Number Nine 9FX (S3 Trio64)",            "n9_9fx",		&s3_9fx_device,              GFX_N9_9FX},
+#ifdef DEV_BRANCH
+        {"nVidia RIVA 128",                        "riva128",		&riva128_device,             GFX_RIVA128},
+        {"nVidia RIVA TNT",                        "rivatnt",		&rivatnt_device,             GFX_RIVATNT},
+#endif
         {"OAK OTI-067",                            "oti067",		&oti067_device,              GFX_OTI067},
         {"OAK OTI-077",                            "oti077",		&oti077_device,              GFX_OTI077},
         {"Paradise Bahamas 64 (S3 Vision864)",     "bahamas64",		&s3_bahamas64_device,        GFX_BAHAMAS64},