Make the VNC renderer independent of the Dev branch option

This commit is contained in:
Alexander Babikov
2022-04-12 15:55:33 +05:00
parent 94adafa1ee
commit 60f1f418b0
2 changed files with 4 additions and 7 deletions

View File

@@ -127,6 +127,7 @@ option(OPENAL "OpenAL"
option(RTMIDI "RtMidi" ON) option(RTMIDI "RtMidi" ON)
option(FLUIDSYNTH "FluidSynth" ON) option(FLUIDSYNTH "FluidSynth" ON)
option(MUNT "MUNT" ON) option(MUNT "MUNT" ON)
option(VNC "VNC renderer" OFF)
option(DINPUT "DirectInput" OFF) option(DINPUT "DirectInput" OFF)
option(CPPTHREADS "C++11 threads" ON) option(CPPTHREADS "C++11 threads" ON)
option(NEW_DYNAREC "Use the PCem v15 (\"new\") dynamic recompiler" OFF) option(NEW_DYNAREC "Use the PCem v15 (\"new\") dynamic recompiler" OFF)
@@ -155,7 +156,6 @@ cmake_dependent_option(PAS16 "Pro Audio Spectrum 16"
cmake_dependent_option(SIO_DETECT "Super I/O Detection Helper" ON "DEV_BRANCH" OFF) cmake_dependent_option(SIO_DETECT "Super I/O Detection Helper" ON "DEV_BRANCH" OFF)
cmake_dependent_option(TANDY_ISA "Tandy PSG ISA clone boards" ON "DEV_BRANCH" OFF) cmake_dependent_option(TANDY_ISA "Tandy PSG ISA clone boards" ON "DEV_BRANCH" OFF)
cmake_dependent_option(VGAWONDER "ATI VGA Wonder (ATI-18800)" ON "DEV_BRANCH" OFF) cmake_dependent_option(VGAWONDER "ATI VGA Wonder (ATI-18800)" ON "DEV_BRANCH" OFF)
cmake_dependent_option(VNC "VNC renderer" OFF "DEV_BRANCH" OFF)
cmake_dependent_option(XL24 "ATI VGA Wonder XL24 (ATI-28800-6)" ON "DEV_BRANCH" OFF) cmake_dependent_option(XL24 "ATI VGA Wonder XL24 (ATI-28800-6)" ON "DEV_BRANCH" OFF)
# Ditto but for Qt # Ditto but for Qt

View File

@@ -79,9 +79,6 @@ ifeq ($(DEV_BUILD), y)
ifndef TANDY_ISA ifndef TANDY_ISA
TANDY_ISA := y TANDY_ISA := y
endif endif
ifndef VNC
VNC := y
endif
ifndef XL24 ifndef XL24
XL24 := y XL24 := y
endif endif
@@ -143,9 +140,6 @@ else
ifndef TANDY_ISA ifndef TANDY_ISA
TANDY_ISA := n TANDY_ISA := n
endif endif
ifndef VNC
VNC := n
endif
ifndef XL24 ifndef XL24
XL24 := n XL24 := n
endif endif
@@ -188,6 +182,9 @@ endif
ifndef MUNT ifndef MUNT
MUNT := y MUNT := y
endif endif
ifndef VNC
VNC := n
endif
ifndef NEW_DYNAREC ifndef NEW_DYNAREC
NEW_DYNAREC := n NEW_DYNAREC := n
endif endif