diff --git a/src/Makefile.mingw b/src/Makefile.mingw index 57a504121..8e28cee03 100644 --- a/src/Makefile.mingw +++ b/src/Makefile.mingw @@ -22,7 +22,7 @@ PROG = 86Box # Various compile-time options. # -DROM_TRACE=0xcd800 traces ROM access from segment C800 # -DIO_TACE=0x66 traces I/O on port 0x66 -STUFF = +STUFF = -DDEV_BRANCH # Add feature selections here. # -DBUGGER adds the ISA BusBugger emulation. @@ -105,6 +105,7 @@ VIDOBJ = video.o \ vid_hercules.o vid_herculesplus.o vid_incolor.o \ vid_colorplus.o \ vid_genius.o \ + vid_nv_riva128.o \ vid_s3.o vid_s3_virge.o \ vid_et4000.o vid_et4000w32.o vid_icd2061.o \ vid_oti067.o \ diff --git a/src/video.c b/src/video.c index 1176824ee..48fd4ff16 100644 --- a/src/video.c +++ b/src/video.c @@ -89,6 +89,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},