From a4c0caf5862db3d8fa89046aadda18ea148ef543 Mon Sep 17 00:00:00 2001 From: Jasmine Iwanek Date: Sun, 2 Jul 2023 13:28:22 -0400 Subject: [PATCH 1/3] Fix typo which led to compile failure --- src/include/86box/machine.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/include/86box/machine.h b/src/include/86box/machine.h index ec2919a7c..cee90649f 100644 --- a/src/include/86box/machine.h +++ b/src/include/86box/machine.h @@ -32,7 +32,7 @@ #define MACHINE_BUS_CBUS 0x00000010 /* sys has C-BUS bus */ #define MACHINE_BUS_PS2_LATCH 0x00000020 /* system has PS/2 keyboard controller IRQ latch */ #define MACHINE_BUS_PS2_PORTS 0x00000040 /* system has PS/2 keyboard and mouse ports */ -#define MACHINE_BUS_PS2 (MACHIN_BUS_PS2_LATCH | MACHINE_BUS_PS2_PORTS) +#define MACHINE_BUS_PS2 (MACHINE_BUS_PS2_LATCH | MACHINE_BUS_PS2_PORTS) #define MACHINE_BUS_EISA 0x00000080 /* sys has EISA bus */ #define MACHINE_BUS_VLB 0x00000100 /* sys has VL bus */ #define MACHINE_BUS_MCA 0x00000200 /* sys has MCA bus */ From 98ef51251b10f5b624724f596db492c381aa1ceb Mon Sep 17 00:00:00 2001 From: Jasmine Iwanek Date: Sun, 2 Jul 2023 13:30:58 -0400 Subject: [PATCH 2/3] Fix cmake actions after external libslirp changes --- .github/workflows/cmake.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index 49ea8c890..20c42a713 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -104,6 +104,7 @@ jobs: libpng:p openal:p rtmidi:p + libslirp:p libvncserver:p ${{ matrix.ui.packages }} @@ -329,6 +330,7 @@ jobs: librtmidi-dev libopenal-dev libvncserver-dev + libslirp-dev ${{ matrix.ui.packages }} - name: Checkout repository From 7a919e2c59aa6e6c5e75235d868fc7fdf917e8bb Mon Sep 17 00:00:00 2001 From: Jasmine Iwanek Date: Sun, 2 Jul 2023 15:29:05 -0400 Subject: [PATCH 3/3] Fix codeql actions after external libslirp changes --- .github/workflows/codeql.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 107755af6..b9f38b29d 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -107,6 +107,7 @@ jobs: libpng:p openal:p rtmidi:p + libslirp:p libvncserver:p ${{ matrix.ui.packages }} @@ -191,6 +192,7 @@ jobs: libc6-dev librtmidi-dev libopenal-dev + libslirp-dev libvncserver-dev ${{ matrix.ui.packages }}