From 8723ce52362391a23d8c8c02bac5b13ef70a5fb7 Mon Sep 17 00:00:00 2001 From: Jasmine Iwanek Date: Sat, 23 Apr 2022 15:49:11 -0400 Subject: [PATCH 1/2] Dont add the fdc twice --- src/machine/m_xt.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/machine/m_xt.c b/src/machine/m_xt.c index 1b6ceee32..f95ee2fe0 100644 --- a/src/machine/m_xt.c +++ b/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; } From c2ea62cd3cd6b490f9ef46119709efe4e55a24db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Hrdli=C4=8Dka?= Date: Wed, 4 May 2022 23:32:47 +0200 Subject: [PATCH 2/2] Bump version in `vcpkg.json` and add it to `bumpversion.sh` --- bumpversion.sh | 1 + vcpkg.json | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/bumpversion.sh b/bumpversion.sh index 431b03138..bd06f850d 100644 --- a/bumpversion.sh +++ b/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"'/' diff --git a/vcpkg.json b/vcpkg.json index 495ac2eac..aeb10dcb9 100644 --- a/vcpkg.json +++ b/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",