Merge branch '86Box:master' into nec-v20

bumpversion.sh

@@ -60,6 +60,7 @@ patch_file() {
 }
 patch_file CMakeLists.txt VERSION 's/^(\s*VERSION ).+/\1'"$newversion"'/'
 patch_file CMakeLists.txt EMU_VERSION_EX 's/(\s*set\(EMU_VERSION_EX\s+")[^"]+/\1'"$newversion_maj_base36.$newversion_min_base36$newversion_patch_base36"'/'
+patch_file vcpkg.json version-string 's/(^\s*"version-string"\s*:\s*")[^"]+/\1'"$newversion"'/'
 patch_file src/include_make/*/version.h EMU_VERSION 's/(#\s*define\s+EMU_VERSION\s+")[^"]+/\1'"$newversion"'/'
 patch_file src/include_make/*/version.h EMU_VERSION_EX 's/(#\s*define\s+EMU_VERSION_EX\s+")[^"]+/\1'"$newversion_maj_base36.$newversion_min_base36$newversion_patch_base36"'/'
 patch_file src/include_make/*/version.h EMU_VERSION_MAJ 's/(#\s*define\s+EMU_VERSION_MAJ\s+)[0-9]+/\1'"$newversion_maj"'/'

src/machine/m_xt.c

@@ -451,9 +451,6 @@ machine_xt_vendex_init(const machine_t *model)
 
     machine_xt_clone_init(model);
 
-    /* On-board FDC cannot be disabled */
-	device_add(&fdc_xt_device);
-
     return ret;
 }
 

vcpkg.json

@@ -1,6 +1,6 @@
 {
     "name": "86box",
-    "version-string": "3.4",
+    "version-string": "3.5",
     "homepage": "https://86box.net/",
     "documentation": "http://86box.readthedocs.io/",
     "license": "GPL-2.0-or-later",