Merge branch 'master' of https://github.com/86Box/86Box

.github/workflows/cmake.yml

@@ -74,7 +74,7 @@ jobs:
       fail-fast: false
       matrix:
         build:
-        - name: Regular
+        - name: Debug
           dev-build: off
           new-dynarec: off
           type: Debug
@@ -82,17 +82,12 @@ jobs:
           dev-build: on
           new-dynarec: on
           type: Debug
-        target-arch: ['Win32', 'x64', 'ARM', 'ARM64']
+        target-arch: ['Win32', 'x64', 'ARM64']
         toolset: ['clangcl', 'v142']
         exclude:
-          - target-arch: 'ARM'
-            build:
-              new-dynarec: off
           - target-arch: 'ARM64'
             build:
               new-dynarec: off
-          - target-arch: 'ARM'
-            toolset: 'clangcl'
 
     steps:
     - uses: actions/checkout@v2

README.md

@@ -4,7 +4,7 @@
 operating systems and software designed for IBM PC systems and compatibles
 from 1981 through fairly recent system designs based on the PCI bus.
 
-86Box is released under the GNU General Public License, version 2 or later.
+86Box is released under the GNU General Public License, version 2 only.
 For more information, see the `COPYING` file.
 
 The project maintainer is [OBattler](https://github.com/OBattler).

src/CMakeLists.txt

@@ -95,6 +95,12 @@ if(VCPKG_TOOLCHAIN)
 	x_vcpkg_install_local_dependencies(TARGETS 86Box DESTINATION "bin")
 endif()
 
+if(MSVC)
+	install(FILES $<TARGET_PDB_FILE:86Box>
+		CONFIGURATIONS Debug RelWithDebInfo
+		DESTINATION "bin")
+endif()
+
 add_subdirectory(device)
 add_subdirectory(disk)
 add_subdirectory(floppy)

vcpkg.json

@@ -3,7 +3,7 @@
 	"version-string": "3.0",
 	"homepage": "https://86box.net/",
 	"documentation": "http://86box.readthedocs.io/",
-	"license": "GPL-2.0-or-later",
+	"license": "GPL-2.0-only",
 	"dependencies": [
 		"freetype",
 		"libpng",