diff --git a/CMakeLists.txt b/CMakeLists.txt index f13e91791..196952cb4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -153,7 +153,6 @@ cmake_dependent_option(ISAMEM_RAMPAGE "AST Rampage" cmake_dependent_option(ISAMEM_IAB "Intel Above Board" ON "DEV_BRANCH" OFF) cmake_dependent_option(ISAMEM_BRAT "BocaRAM/AT" ON "DEV_BRANCH" OFF) cmake_dependent_option(LASERXT "VTech Laser XT" ON "DEV_BRANCH" OFF) -cmake_dependent_option(MGA2 "Matrox Millennium II and Productiva G100" ON "DEV_BRANCH" OFF) cmake_dependent_option(OLIVETTI "Olivetti M290" ON "DEV_BRANCH" OFF) cmake_dependent_option(OPEN_AT "OpenAT" ON "DEV_BRANCH" OFF) cmake_dependent_option(OPL4ML "OPL4-ML daughterboard" ON "DEV_BRANCH" OFF) diff --git a/src/video/CMakeLists.txt b/src/video/CMakeLists.txt index dc0cac1ff..8fbd62e35 100644 --- a/src/video/CMakeLists.txt +++ b/src/video/CMakeLists.txt @@ -28,10 +28,6 @@ add_library(vid OBJECT agpgart.c video.c vid_table.c vid_cga.c vid_cga_comp.c vid_ibm_rgb528_ramdac.c vid_sdac_ramdac.c vid_ogc.c vid_mga.c vid_nga.c vid_tvp3026_ramdac.c vid_att2xc498_ramdac.c vid_xga.c) -if(MGA2) - target_compile_definitions(vid PRIVATE USE_MGA2) -endif() - if(VGAWONDER) target_compile_definitions(vid PRIVATE USE_VGAWONDER) endif() diff --git a/src/video/vid_mga.c b/src/video/vid_mga.c index 89b036ede..b85eb5ad9 100644 --- a/src/video/vid_mga.c +++ b/src/video/vid_mga.c @@ -2811,7 +2811,6 @@ static uint8_t mystique_readb_linear(uint32_t addr, void *priv) { const svga_t *svga = (svga_t *) priv; - mystique_t *mystique = (mystique_t *) svga->priv; cycles -= svga->monitor->mon_video_timing_read_b; @@ -2861,7 +2860,6 @@ static void mystique_writeb_linear(uint32_t addr, uint8_t val, void *priv) { svga_t *svga = (svga_t *) priv; - mystique_t *mystique = (mystique_t *) svga->priv; cycles -= svga->monitor->mon_video_timing_write_b; diff --git a/src/win/Makefile.mingw b/src/win/Makefile.mingw index 94b8af74a..a80458938 100644 --- a/src/win/Makefile.mingw +++ b/src/win/Makefile.mingw @@ -64,9 +64,6 @@ ifeq ($(DEV_BUILD), y) ifndef LASERXT LASERXT := y endif - ifndef MGA2 - MGA2 := y - endif ifndef OLIVETTI OLIVETTI := y endif @@ -131,9 +128,6 @@ else ifndef LASERXT LASERXT := n endif - ifndef MGA2 - MGA2 := n - endif ifndef OLIVETTI OLIVETTI := n endif @@ -502,10 +496,6 @@ ifeq ($(DEV_BRANCH), y) DEVBROBJ += m_xt_laserxt.o endif - ifeq ($(MGA2), y) - OPTS += -DUSE_MGA2 - endif - ifeq ($(OPEN_AT), y) OPTS += -DUSE_OPEN_AT endif