From e3fc96738ade483598bd08cb76d92dcde6e3e50c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miran=20Gr=C4=8Da?= Date: Fri, 12 Feb 2021 21:29:58 +0100 Subject: [PATCH 1/4] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index f60231134..12a5d27ca 100644 --- a/README.md +++ b/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. For more information, see the `COPYING` file. The project maintainer is [OBattler](https://github.com/OBattler). From bbfb8a35cd36b75f6a401aa80535d56d3f6e596f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Hrdli=C4=8Dka?= Date: Sun, 14 Feb 2021 00:41:55 +0100 Subject: [PATCH 2/4] cmake: install PDB files --- src/CMakeLists.txt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 69784b1e1..f33ab0958 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -95,6 +95,12 @@ if(VCPKG_TOOLCHAIN) x_vcpkg_install_local_dependencies(TARGETS 86Box DESTINATION "bin") endif() +if(MSVC) + install(FILES $ + CONFIGURATIONS Debug RelWithDebInfo + DESTINATION "bin") +endif() + add_subdirectory(device) add_subdirectory(disk) add_subdirectory(floppy) From 0e24b636479298b5aa00667d315f02d6e8fcdd69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Hrdli=C4=8Dka?= Date: Sun, 14 Feb 2021 01:36:45 +0100 Subject: [PATCH 3/4] clarify license --- README.md | 2 +- vcpkg.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 12a5d27ca..12d9c48f9 100644 --- a/README.md +++ b/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. +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). diff --git a/vcpkg.json b/vcpkg.json index e57a7db16..9fba60a48 100644 --- a/vcpkg.json +++ b/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", From 6a00fd700a7673b25174ed9cdf98241a9a77e570 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Hrdli=C4=8Dka?= Date: Sun, 14 Feb 2021 03:34:45 +0100 Subject: [PATCH 4/4] workflows: remove Windows ARM32 build --- .github/workflows/cmake.yml | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index 2ae0f9ec7..11216cc74 100644 --- a/.github/workflows/cmake.yml +++ b/.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