diff --git a/CMakeLists.txt b/CMakeLists.txt index 856400ff0..2a81d698a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -60,7 +60,6 @@ option(MINITRACE "Enable Chrome tracing using the modified minitrace library" OF option(DEV_BRANCH "Development branch" OFF) CMAKE_DEPENDENT_OPTION(AMD_K5 "AMD K5" ON "DEV_BRANCH" OFF) -CMAKE_DEPENDENT_OPTION(CL5422 "Cirrus Logic CL-GD 5402/5420/5422" ON "DEV_BRANCH" OFF) CMAKE_DEPENDENT_OPTION(CYRIX_6X86 "Cyrix 6x86" ON "DEV_BRANCH" OFF) CMAKE_DEPENDENT_OPTION(GUSMAX "Gravis UltraSound MAX" ON "DEV_BRANCH" OFF) CMAKE_DEPENDENT_OPTION(HEDAKA "Hedaka HED-919" ON "DEV_BRANCH" OFF) @@ -69,19 +68,15 @@ CMAKE_DEPENDENT_OPTION(MGA "Matrox Mystique graphics adapters" ON "DEV_BRANCH" O CMAKE_DEPENDENT_OPTION(NO_SIO "Machines without emulated Super I/O chips" ON "DEV_BRANCH" OFF) CMAKE_DEPENDENT_OPTION(OPEN_AT "OpenAT" ON "DEV_BRANCH" OFF) CMAKE_DEPENDENT_OPTION(PAS16 "Pro Audio Spectrum 16" OFF "DEV_BRANCH" OFF) -CMAKE_DEPENDENT_OPTION(PS1M2133 "IBM PS/1 model 2133" ON "DEV_BRANCH" OFF) CMAKE_DEPENDENT_OPTION(PS2M70T4 "IBM PS/2 model 70 (type 4)" ON "DEV_BRANCH" OFF) CMAKE_DEPENDENT_OPTION(S3TRIO3D2X "S3 Trio3D/2X" ON "DEV_BRANCH" OFF) CMAKE_DEPENDENT_OPTION(SIO_DETECT "Super I/O Detection Helper" ON "DEV_BRANCH" OFF) -CMAKE_DEPENDENT_OPTION(STPC "STPC machines" ON "DEV_BRANCH" OFF) -CMAKE_DEPENDENT_OPTION(M1489 "ALi M1489" ON "DEV_BRANCH" OFF) CMAKE_DEPENDENT_OPTION(M154X "ALi ALADDiN IV" ON "DEV_BRANCH" OFF) CMAKE_DEPENDENT_OPTION(M6117 "ALi M6117" ON "DEV_BRANCH" OFF) CMAKE_DEPENDENT_OPTION(VGAWONDER "ATI VGA Wonder (ATI-18800)" ON "DEV_BRANCH" OFF) CMAKE_DEPENDENT_OPTION(VNC "VNC renderer" ON "DEV_BRANCH" OFF) CMAKE_DEPENDENT_OPTION(XL24 "ATI VGA Wonder XL24 (ATI-28800-6)" ON "DEV_BRANCH" OFF) CMAKE_DEPENDENT_OPTION(VECT486VL "HP Vectra 486VL" ON "DEV_BRANCH" OFF) -CMAKE_DEPENDENT_OPTION(DELLS4 "Dell Dimension XPS P60; Dell OptiPlex 560/L" ON "DEV_BRANCH" OFF) # HACK: Avoid a MSVC2019 compiler bug on ARM64 Debug builds if(MSVC_TOOLSET_VERSION GREATER_EQUAL 142 AND CMAKE_TARGET_ARCHITECTURES STREQUAL "armv8") diff --git a/src/machine/CMakeLists.txt b/src/machine/CMakeLists.txt index 16850c58d..360ba7697 100644 --- a/src/machine/CMakeLists.txt +++ b/src/machine/CMakeLists.txt @@ -44,10 +44,6 @@ if(OPEN_AT) target_compile_definitions(mch PRIVATE USE_OPEN_AT) endif() -if(PS1M2133) - target_compile_definitions(mch PRIVATE USE_PS1M2133) -endif() - if(PS2M70T4) target_compile_definitions(mch PRIVATE USE_PS2M70T4) endif() diff --git a/src/win/Makefile.mingw b/src/win/Makefile.mingw index 4546f4af4..e9d4abeea 100644 --- a/src/win/Makefile.mingw +++ b/src/win/Makefile.mingw @@ -36,9 +36,6 @@ ifeq ($(DEV_BUILD), y) ifndef AMD_K5 AMD_K5 := y endif - ifndef CL5422 - CL5422 := y - endif ifndef CYRIX_6X86 CYRIX_6X86 := y endif @@ -69,9 +66,6 @@ ifeq ($(DEV_BUILD), y) ifndef PAS16 PAS16 := n endif - ifndef PS1M2133 - PS1M2133 := y - endif ifndef PS2M70T4 PS2M70T4 := y endif @@ -112,9 +106,6 @@ else ifndef AMD_K5 AMD_K5 := n endif - ifndef CL5422 - CL5422 := n - endif ifndef CYRIX_6X86 CYRIX_6X86 := n endif @@ -145,9 +136,6 @@ else ifndef PAS16 PAS16 := n endif - ifndef PS1M2133 - PS1M2133 := n - endif ifndef PS2M70T4 PS2M70T4 := n endif @@ -544,10 +532,6 @@ OPTS += -DUSE_PAS16 DEVBROBJ += snd_pas16.o endif -ifeq ($(PS1M2133), y) -OPTS += -DUSE_PS1M2133 -endif - ifeq ($(PS2M70T4), y) OPTS += -DUSE_PS2M70T4 endif