Merge pull request #2282 from jriwanek-forks/updates

Updates

CMakeLists.txt

@@ -35,7 +35,7 @@ if(MUNT_EXTERNAL)
 endif()
 
 project(86Box
-    VERSION 3.3
+    VERSION 3.4
     DESCRIPTION "Emulator of x86-based systems"
     HOMEPAGE_URL "https://86box.net"
     LANGUAGES C CXX)

src/floppy/fdc_magitronic.c

@@ -127,7 +127,7 @@ static const device_config_t b215_config[] = {
             { .description = ""                        }
         }
     },
-    { "", "", -1 }
+    { .name = "", .description = "", .type = CONFIG_END }
 // clang-format on
 };
 

src/include_make/86box/version.h

@@ -20,11 +20,11 @@
 #define EMU_NAME	"86Box"
 #define EMU_NAME_W	LSTR(EMU_NAME)
 
-#define EMU_VERSION	"3.3"
+#define EMU_VERSION	"3.4"
 #define EMU_VERSION_W	LSTR(EMU_VERSION)
-#define EMU_VERSION_EX	"3.30"
+#define EMU_VERSION_EX	"3.40"
 #define EMU_VERSION_MAJ	3
-#define EMU_VERSION_MIN	3
+#define EMU_VERSION_MIN	4
 #define EMU_VERSION_PATCH 0
 
 #define EMU_BUILD_NUM	0

src/mac/CMakeLists.txt

@@ -50,4 +50,4 @@ set_target_properties(86Box
 
 #set(XCODE_ATTRIBUTE_CODE_SIGNING_REQUIRED "YES")
 #set(XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY "-")
-#set(XCODE_ATTRIBUTE_CODE_SIGN_ENTITLEMENTS ${CMAKE_CURRENT_SOURCE_DIR}/mac/codesign/dev/app.entitlements)  
+#set(XCODE_ATTRIBUTE_CODE_SIGN_ENTITLEMENTS ${CMAKE_CURRENT_SOURCE_DIR}/mac/codesign/dev/app.entitlements)

src/unix/assets/86Box.spec

@@ -15,7 +15,7 @@
 %global romver 20220319
 
 Name:		86Box
-Version:	3.3
+Version:	3.4
 Release:	1%{?dist}
 Summary:	Classic PC emulator
 License:	GPLv2+

vcpkg.json

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