From 231cadb0a7ee74fc95191e746d899cea82e9a036 Mon Sep 17 00:00:00 2001
From: Jasmine Iwanek <jasmine@iwanek.co.uk>
Date: Fri, 23 Dec 2022 14:22:17 -0500
Subject: [PATCH 01/25] Fix Multiplication result converted to larger type from
 CodeQL

---
 src/floppy/fdd_img.c        |  4 ++--
 src/printer/prt_escp.c      | 12 ++++++------
 src/video/vid_pgc.c         |  4 ++--
 src/video/vid_svga_render.c |  2 +-
 src/video/video.c           |  2 +-
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/floppy/fdd_img.c b/src/floppy/fdd_img.c
index 3ebfeefd9..e0847c010 100644
--- a/src/floppy/fdd_img.c
+++ b/src/floppy/fdd_img.c
@@ -486,9 +486,9 @@ img_seek(int drive, int track)
     for (side = 0; side < dev->sides; side++) {
         if (dev->disk_at_once) {
             cur_pos = (track * dev->sectors * ssize * dev->sides) + (side * dev->sectors * ssize);
-            memcpy(dev->track_data[side], dev->disk_data + cur_pos, dev->sectors * ssize);
+            memcpy(dev->track_data[side], dev->disk_data + cur_pos, (size_t) dev->sectors * ssize);
         } else {
-            read_bytes = fread(dev->track_data[side], 1, dev->sectors * ssize, dev->f);
+            read_bytes = fread(dev->track_data[side], 1, (size_t) dev->sectors * ssize, dev->f);
             if (read_bytes < (dev->sectors * ssize))
                 memset(dev->track_data[side] + read_bytes, 0xf6, (dev->sectors * ssize) - read_bytes);
         }
diff --git a/src/printer/prt_escp.c b/src/printer/prt_escp.c
index e0a83da31..b2827e3f9 100644
--- a/src/printer/prt_escp.c
+++ b/src/printer/prt_escp.c
@@ -407,7 +407,7 @@ new_page(escp_t *dev, int8_t save, int8_t resetx)
     dev->curr_y = dev->top_margin;
     if (dev->page) {
         dev->page->dirty = 0;
-        memset(dev->page->pixels, 0x00, dev->page->pitch * dev->page->h);
+        memset(dev->page->pixels, 0x00, (size_t) dev->page->pitch * dev->page->h);
     }
 
     /* Make the page's file name. */
@@ -451,9 +451,9 @@ fill_palette(uint8_t redmax, uint8_t greenmax, uint8_t bluemax, uint8_t colorID,
     colormask = colorID <<= 5;
 
     for (i = 0; i < 32; i++) {
-        dev->palcol[i + colormask].r = 255 - (uint8_t) floor(red * (float) i);
-        dev->palcol[i + colormask].g = 255 - (uint8_t) floor(green * (float) i);
-        dev->palcol[i + colormask].b = 255 - (uint8_t) floor(blue * (float) i);
+        dev->palcol[i + colormask].r = 255 - (uint8_t) floor((double) red * (float) i);
+        dev->palcol[i + colormask].g = 255 - (uint8_t) floor((double) green * (float) i);
+        dev->palcol[i + colormask].b = 255 - (uint8_t) floor((double) blue * (float) i);
     }
 }
 
@@ -2043,8 +2043,8 @@ escp_init(void *lpt)
     dev->page->w      = (int) (dev->dpi * dev->page_width);
     dev->page->h      = (int) (dev->dpi * dev->page_height);
     dev->page->pitch  = dev->page->w;
-    dev->page->pixels = (uint8_t *) malloc(dev->page->pitch * dev->page->h);
-    memset(dev->page->pixels, 0x00, dev->page->pitch * dev->page->h);
+    dev->page->pixels = (uint8_t *) malloc((size_t) dev->page->pitch * dev->page->h);
+    memset(dev->page->pixels, 0x00, (size_t) dev->page->pitch * dev->page->h);
 
     /* Initialize parameters. */
     for (i = 0; i < 32; i++) {
diff --git a/src/video/vid_pgc.c b/src/video/vid_pgc.c
index 89d1505bb..eb28540fc 100644
--- a/src/video/vid_pgc.c
+++ b/src/video/vid_pgc.c
@@ -2663,8 +2663,8 @@ pgc_init(pgc_t *dev, int maxw, int maxh, int visw, int vish,
     dev->visw = visw;
     dev->vish = vish;
 
-    dev->vram = (uint8_t *) malloc(maxw * maxh);
-    memset(dev->vram, 0x00, maxw * maxh);
+    dev->vram = (uint8_t *) malloc((size_t) maxw * maxh);
+    memset(dev->vram, 0x00, (size_t) maxw * maxh);
     dev->cga_vram = (uint8_t *) malloc(16384);
     memset(dev->cga_vram, 0x00, 16384);
 
diff --git a/src/video/vid_svga_render.c b/src/video/vid_svga_render.c
index 30d2c93b0..c67a46e0d 100644
--- a/src/video/vid_svga_render.c
+++ b/src/video/vid_svga_render.c
@@ -68,7 +68,7 @@ svga_render_blank(svga_t *svga)
     }
 
     uint32_t *line_ptr   = &buffer32->line[svga->displine + svga->y_add][svga->x_add];
-    uint32_t  line_width = (svga->hdisp + svga->scrollcache) * char_width * sizeof(uint32_t);
+    uint32_t  line_width = (uint32_t) (svga->hdisp + svga->scrollcache) * char_width * sizeof(uint32_t);
     memset(line_ptr, 0, line_width);
 }
 
diff --git a/src/video/video.c b/src/video/video.c
index 18f2e1427..096ea89e1 100644
--- a/src/video/video.c
+++ b/src/video/video.c
@@ -804,7 +804,7 @@ create_bitmap(int x, int y)
     bitmap_t *b = malloc(sizeof(bitmap_t) + (y * sizeof(uint32_t *)));
     int       c;
 
-    b->dat = malloc(x * y * 4);
+    b->dat = malloc((size_t) x * y * 4);
     for (c = 0; c < y; c++)
         b->line[c] = &(b->dat[c * x]);
     b->w = x;

From ecd7694006d0ca392c46a44e90dcb1ff28310407 Mon Sep 17 00:00:00 2001
From: Jasmine Iwanek <jasmine@iwanek.co.uk>
Date: Fri, 23 Dec 2022 15:14:30 -0500
Subject: [PATCH 02/25] Fix more warnings

---
 src/sound/midi_rtmidi.cpp  |  8 ++++++++
 src/sound/snd_opl_ymfm.cpp | 16 ++++++++++++++++
 2 files changed, 24 insertions(+)

diff --git a/src/sound/midi_rtmidi.cpp b/src/sound/midi_rtmidi.cpp
index 743b828ad..354c7f61b 100644
--- a/src/sound/midi_rtmidi.cpp
+++ b/src/sound/midi_rtmidi.cpp
@@ -39,6 +39,7 @@ extern "C" {
 // Disable c99-designator to avoid the warnings in rtmidi_*_device
 #ifdef __clang__
 #    if __has_warning("-Wc99-designator")
+#        pragma clang diagnostic push
 #        pragma clang diagnostic ignored "-Wc99-designator"
 #    endif
 #endif
@@ -302,4 +303,11 @@ const device_t rtmidi_input_device = {
     .force_redraw  = NULL,
     .config        = midi_input_config
 };
+
+#ifdef __clang__
+#    if __has_warning("-Wc99-designator")
+#        pragma clang diagnostic pop
+#    endif
+#endif
+
 }
diff --git a/src/sound/snd_opl_ymfm.cpp b/src/sound/snd_opl_ymfm.cpp
index bb52f3c55..012e77bdb 100644
--- a/src/sound/snd_opl_ymfm.cpp
+++ b/src/sound/snd_opl_ymfm.cpp
@@ -29,6 +29,15 @@ extern "C" {
 #include <86box/snd_opl.h>
 #include <86box/mem.h>
 #include <86box/rom.h>
+
+// Disable c99-designator to avoid the warnings in *_ymfm_device
+#ifdef __clang__
+#    if __has_warning("-Wc99-designator")
+#        pragma clang diagnostic push
+#        pragma clang diagnostic ignored "-Wc99-designator"
+#    endif
+#endif
+
 }
 
 #define RSM_FRAC 10
@@ -432,4 +441,11 @@ const fm_drv_t ymfm_drv {
     &ymfm_drv_set_do_cycles,
     NULL,
 };
+
+#ifdef __clang__
+#    if __has_warning("-Wc99-designator")
+#        pragma clang diagnostic pop
+#    endif
+#endif
+
 }

From 5984270f0def98a5ceaa3dc8379eab8295e16226 Mon Sep 17 00:00:00 2001
From: Jasmine Iwanek <jasmine@iwanek.co.uk>
Date: Wed, 28 Dec 2022 19:07:51 -0500
Subject: [PATCH 03/25] Minor formatting in cpu.c

---
 src/cpu/cpu.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/cpu/cpu.c b/src/cpu/cpu.c
index 1ab06205f..4d1abcd05 100644
--- a/src/cpu/cpu.c
+++ b/src/cpu/cpu.c
@@ -2848,7 +2848,7 @@ amd_k_invalid_wrmsr:
                     break;
                 case 0x1b:
                     cpu_log("APIC_BASE write: %08X%08X\n", EDX, EAX);
-                    // msr.apic_base = EAX | ((uint64_t)EDX << 32);
+                    // msr.apic_base = EAX | ((uint64_t) EDX << 32);
                     break;
                 case 0x2a:
                     break;

From 7ec2a1c1488196b095606f70da24a096d0a2625b Mon Sep 17 00:00:00 2001
From: Jasmine Iwanek <jasmine@iwanek.co.uk>
Date: Thu, 29 Dec 2022 21:59:00 -0500
Subject: [PATCH 04/25] Use doubles as requested

---
 src/printer/prt_escp.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/printer/prt_escp.c b/src/printer/prt_escp.c
index b2827e3f9..e7c9e0442 100644
--- a/src/printer/prt_escp.c
+++ b/src/printer/prt_escp.c
@@ -444,16 +444,16 @@ fill_palette(uint8_t redmax, uint8_t greenmax, uint8_t bluemax, uint8_t colorID,
     uint8_t colormask;
     int     i;
 
-    float red   = (float) redmax / (float) 30.9;
-    float green = (float) greenmax / (float) 30.9;
-    float blue  = (float) bluemax / (float) 30.9;
+    double red   = (double) redmax / (double) 30.9;
+    double green = (double) greenmax / (double) 30.9;
+    double blue  = (double) bluemax / (double) 30.9;
 
     colormask = colorID <<= 5;
 
     for (i = 0; i < 32; i++) {
-        dev->palcol[i + colormask].r = 255 - (uint8_t) floor((double) red * (float) i);
-        dev->palcol[i + colormask].g = 255 - (uint8_t) floor((double) green * (float) i);
-        dev->palcol[i + colormask].b = 255 - (uint8_t) floor((double) blue * (float) i);
+        dev->palcol[i + colormask].r = 255 - (uint8_t) floor(red * (double) i);
+        dev->palcol[i + colormask].g = 255 - (uint8_t) floor(green * (double) i);
+        dev->palcol[i + colormask].b = 255 - (uint8_t) floor(blue * (double) i);
     }
 }
 

From a2568a6fea1b26c44fb74d1594e15d45514e14fd Mon Sep 17 00:00:00 2001
From: Jasmine Iwanek <jasmine@iwanek.co.uk>
Date: Thu, 29 Dec 2022 21:59:21 -0500
Subject: [PATCH 05/25] Fix building with libvncserver

---
 mingw32-cmake.log      | 492 +++++++++++++++++++++++++++++++++++++++++
 src/CMakeLists.txt     |  13 +-
 src/win/Makefile.mingw |   2 +-
 3 files changed, 501 insertions(+), 6 deletions(-)
 create mode 100644 mingw32-cmake.log

diff --git a/mingw32-cmake.log b/mingw32-cmake.log
new file mode 100644
index 000000000..112fd3327
--- /dev/null
+++ b/mingw32-cmake.log
@@ -0,0 +1,492 @@
+[1/492] Building C object src/CMakeFiles/86Box.dir/random.c.obj
+[2/492] Building C object src/CMakeFiles/86Box.dir/nmi.c.obj
+[3/492] Building C object src/CMakeFiles/86Box.dir/log.c.obj
+[4/492] Building C object src/CMakeFiles/86Box.dir/apm.c.obj
+[5/492] Building C object src/CMakeFiles/86Box.dir/ppi.c.obj
+[6/492] Building C object src/CMakeFiles/86Box.dir/ddma.c.obj
+[7/492] Building C object src/CMakeFiles/86Box.dir/timer.c.obj
+[8/492] Building C object src/CMakeFiles/86Box.dir/mca.c.obj
+[9/492] Building C object src/CMakeFiles/86Box.dir/port_6x.c.obj
+[10/492] Building C object src/CMakeFiles/86Box.dir/fifo8.c.obj
+[11/492] Building C object src/CMakeFiles/86Box.dir/port_92.c.obj
+[12/492] Building C object src/CMakeFiles/86Box.dir/io.c.obj
+[13/492] Building C object src/CMakeFiles/86Box.dir/usb.c.obj
+[14/492] Building C object src/CMakeFiles/86Box.dir/nvr_ps2.c.obj
+[15/492] Building C object src/CMakeFiles/86Box.dir/machine_status.c.obj
+[16/492] Building C object src/CMakeFiles/vnc.dir/vnc_keymap.c.obj
+[17/492] Building C object src/CMakeFiles/86Box.dir/pit_fast.c.obj
+[18/492] Building C object src/CMakeFiles/86Box.dir/nvr.c.obj
+[19/492] Building C object src/CMakeFiles/86Box.dir/pic.c.obj
+[20/492] Building C object src/CMakeFiles/86Box.dir/86box.c.obj
+[21/492] Building C object src/CMakeFiles/86Box.dir/pit.c.obj
+[22/492] Building C object src/CMakeFiles/86Box.dir/pci.c.obj
+[23/492] Building C object src/cdrom/CMakeFiles/cdrom.dir/cdrom_image.c.obj
+[24/492] Building C object src/cdrom/CMakeFiles/cdrom.dir/cdrom_mitsumi.c.obj
+[25/492] Building C object src/CMakeFiles/86Box.dir/device.c.obj
+[26/492] Building C object src/chipset/CMakeFiles/chipset.dir/82c100.c.obj
+[27/492] Building C object src/chipset/CMakeFiles/chipset.dir/acc2168.c.obj
+[28/492] Building C object src/CMakeFiles/86Box.dir/ini.c.obj
+[29/492] Building C object src/CMakeFiles/86Box.dir/nvr_at.c.obj
+[30/492] Building C object src/chipset/CMakeFiles/chipset.dir/ali1429.c.obj
+[31/492] Building C object src/chipset/CMakeFiles/chipset.dir/cs8230.c.obj
+[32/492] Building C object src/CMakeFiles/86Box.dir/dma.c.obj
+[33/492] Building C object src/chipset/CMakeFiles/chipset.dir/ali1531.c.obj
+[34/492] Building C object src/CMakeFiles/86Box.dir/acpi.c.obj
+[35/492] Building C object src/chipset/CMakeFiles/chipset.dir/ali1489.c.obj
+[36/492] Building C object src/chipset/CMakeFiles/chipset.dir/intel_82335.c.obj
+[37/492] Building C object src/chipset/CMakeFiles/chipset.dir/cs4031.c.obj
+[38/492] Building C object src/chipset/CMakeFiles/chipset.dir/ali1541.c.obj
+[39/492] Building C object src/chipset/CMakeFiles/chipset.dir/contaq_82c59x.c.obj
+[40/492] Building C object src/chipset/CMakeFiles/chipset.dir/ali6117.c.obj
+[41/492] Building C object src/CMakeFiles/86Box.dir/discord.c.obj
+[42/492] Building C object src/chipset/CMakeFiles/chipset.dir/__/ioapic.c.obj
+[43/492] Building C object src/chipset/CMakeFiles/chipset.dir/ims8848.c.obj
+[44/492] Building C object src/chipset/CMakeFiles/chipset.dir/ali1621.c.obj
+[45/492] Building C object src/cdrom/CMakeFiles/cdrom.dir/cdrom_image_backend.c.obj
+[46/492] Building C object src/chipset/CMakeFiles/chipset.dir/intel_420ex.c.obj
+[47/492] Building C object src/chipset/CMakeFiles/chipset.dir/headland.c.obj
+[48/492] Building C object src/chipset/CMakeFiles/chipset.dir/intel_sio.c.obj
+[49/492] Building C object src/cdrom/CMakeFiles/cdrom.dir/cdrom.c.obj
+[50/492] Building CXX object src/CMakeFiles/86Box.dir/thread.cpp.obj
+[51/492] Building C object src/chipset/CMakeFiles/chipset.dir/opti291.c.obj
+[52/492] Building C object src/chipset/CMakeFiles/chipset.dir/opti391.c.obj
+[53/492] Building C object src/chipset/CMakeFiles/chipset.dir/neat.c.obj
+[54/492] Building C object src/chipset/CMakeFiles/chipset.dir/opti495.c.obj
+[55/492] Building C object src/CMakeFiles/vnc.dir/vnc.c.obj
+[56/492] Building C object src/chipset/CMakeFiles/chipset.dir/opti283.c.obj
+[57/492] Building C object src/chipset/CMakeFiles/chipset.dir/ali1543.c.obj
+[58/492] Building C object src/chipset/CMakeFiles/chipset.dir/opti5x7.c.obj
+[59/492] Building C object src/chipset/CMakeFiles/chipset.dir/opti895.c.obj
+[60/492] Building C object src/chipset/CMakeFiles/chipset.dir/sis_85c310.c.obj
+[61/492] Building C object src/chipset/CMakeFiles/chipset.dir/intel_i450kx.c.obj
+[62/492] Building C object src/CMakeFiles/86Box.dir/config.c.obj
+[63/492] Building C object src/chipset/CMakeFiles/chipset.dir/opti822.c.obj
+[64/492] Building C object src/cdrom/CMakeFiles/cdrom.dir/cdrom_image_viso.c.obj
+[65/492] Building C object src/chipset/CMakeFiles/chipset.dir/sis_85c50x.c.obj
+[66/492] Building C object src/chipset/CMakeFiles/chipset.dir/sis_85c4xx.c.obj
+[67/492] Building C object src/chipset/CMakeFiles/chipset.dir/via_vt82c505.c.obj
+[68/492] Building C object src/chipset/CMakeFiles/chipset.dir/intel_4x0.c.obj
+[69/492] Building C object src/chipset/CMakeFiles/chipset.dir/gc100.c.obj
+[70/492] Building C object src/chipset/CMakeFiles/chipset.dir/olivetti_eva.c.obj
+[71/492] Building C object src/chipset/CMakeFiles/chipset.dir/via_vt82c49x.c.obj
+[72/492] Building C object src/chipset/CMakeFiles/chipset.dir/vl82c480.c.obj
+[73/492] Building C object src/chipset/CMakeFiles/chipset.dir/umc_8886.c.obj
+[74/492] Building C object src/chipset/CMakeFiles/chipset.dir/sis_5571.c.obj
+[75/492] Building C object src/cpu/CMakeFiles/cpu.dir/cpu_table.c.obj
+[76/492] Building C object src/chipset/CMakeFiles/chipset.dir/sis_85c496.c.obj
+[77/492] Building C object src/chipset/CMakeFiles/chipset.dir/umc_hb4.c.obj
+[78/492] Building C object src/chipset/CMakeFiles/chipset.dir/scamp.c.obj
+[79/492] Building C object src/chipset/CMakeFiles/chipset.dir/sis_5511.c.obj
+[80/492] Building C object src/cpu/CMakeFiles/cpu.dir/fpu.c.obj
+[81/492] Building C object src/chipset/CMakeFiles/chipset.dir/wd76c10.c.obj
+[82/492] Building C object src/chipset/CMakeFiles/chipset.dir/intel_piix.c.obj
+[83/492] Building C object src/cpu/CMakeFiles/cpu.dir/x87_timings.c.obj
+[84/492] Building C object src/cpu/CMakeFiles/cpu.dir/x86.c.obj
+[85/492] Building C object src/cpu/CMakeFiles/cpu.dir/x87.c.obj
+[86/492] Building C object src/chipset/CMakeFiles/chipset.dir/via_apollo.c.obj
+[87/492] Building C object src/cpu/CMakeFiles/cgt.dir/codegen_timing_common.c.obj
+[88/492] Building C object src/cpu/CMakeFiles/cpu.dir/8080.c.obj
+[89/492] Building C object src/chipset/CMakeFiles/chipset.dir/stpc.c.obj
+[90/492] Building C object src/cpu/CMakeFiles/cgt.dir/codegen_timing_486.c.obj
+[91/492] Building C object src/codegen/CMakeFiles/dynarec.dir/codegen.c.obj
+[92/492] Building C object src/cpu/CMakeFiles/cpu.dir/386.c.obj
+[93/492] Building C object src/cpu/CMakeFiles/cgt.dir/codegen_timing_686.c.obj
+[94/492] Building C object src/chipset/CMakeFiles/chipset.dir/scat.c.obj
+[95/492] Building C object src/cpu/CMakeFiles/cgt.dir/codegen_timing_winchip.c.obj
+[96/492] Building C object src/codegen/CMakeFiles/dynarec.dir/codegen_accumulate_x86.c.obj
+[97/492] Building C object src/device/CMakeFiles/dev.dir/bugger.c.obj
+[98/492] Building C object src/cpu/CMakeFiles/cgt.dir/codegen_timing_k6.c.obj
+[99/492] Building C object src/device/CMakeFiles/dev.dir/cartridge.c.obj
+[100/492] Building C object src/device/CMakeFiles/dev.dir/hwm.c.obj
+[101/492] Building C object src/cpu/CMakeFiles/cgt.dir/codegen_timing_winchip2.c.obj
+[102/492] Building C object src/cpu/CMakeFiles/cgt.dir/codegen_timing_p6.c.obj
+[103/492] Building C object src/device/CMakeFiles/dev.dir/hasp.c.obj
+[104/492] Building C object src/cpu/CMakeFiles/cgt.dir/codegen_timing_pentium.c.obj
+[105/492] Building C object src/chipset/CMakeFiles/chipset.dir/via_pipc.c.obj
+[106/492] Building C object src/device/CMakeFiles/dev.dir/hwm_lm75.c.obj
+[107/492] Building C object src/device/CMakeFiles/dev.dir/hwm_vt82c686.c.obj
+[108/492] Building C object src/device/CMakeFiles/dev.dir/hwm_gl518sm.c.obj
+[109/492] Building C object src/device/CMakeFiles/dev.dir/ibm_5161.c.obj
+[110/492] Building C object src/device/CMakeFiles/dev.dir/cassette.c.obj
+[111/492] Building C object src/device/CMakeFiles/dev.dir/postcard.c.obj
+[112/492] Building C object src/device/CMakeFiles/dev.dir/__/lpt.c.obj
+[113/492] Building C object src/device/CMakeFiles/dev.dir/pci_bridge.c.obj
+[114/492] Building C object src/device/CMakeFiles/dev.dir/isamem.c.obj
+[115/492] Building C object src/device/CMakeFiles/dev.dir/hwm_lm78.c.obj
+[116/492] Building C object src/device/CMakeFiles/dev.dir/clock_ics9xxx.c.obj
+[117/492] Building C object src/device/CMakeFiles/dev.dir/i2c.c.obj
+[118/492] Building C object src/device/CMakeFiles/dev.dir/i2c_gpio.c.obj
+[119/492] Building C object src/device/CMakeFiles/dev.dir/isartc.c.obj
+[120/492] Building C object src/cpu/CMakeFiles/cpu.dir/386_common.c.obj
+[121/492] Building C object src/device/CMakeFiles/dev.dir/smbus_ali7101.c.obj
+[122/492] Building C object src/device/CMakeFiles/dev.dir/smbus_piix4.c.obj
+[123/492] Building C object src/device/CMakeFiles/dev.dir/keyboard.c.obj
+[124/492] Building C object src/device/CMakeFiles/dev.dir/serial.c.obj
+[125/492] Building C object src/cpu/CMakeFiles/cpu.dir/cpu.c.obj
+[126/492] Building C object src/disk/CMakeFiles/hdd.dir/hdd_table.c.obj
+[127/492] Building C object src/device/CMakeFiles/dev.dir/mouse.c.obj
+[128/492] Building C object src/device/CMakeFiles/dev.dir/phoenix_486_jumper.c.obj
+[129/492] Building C object src/device/CMakeFiles/dev.dir/isapnp.c.obj
+[130/492] Building C object src/device/CMakeFiles/dev.dir/keyboard_xt.c.obj
+[131/492] Building C object src/disk/CMakeFiles/hdd.dir/hdc.c.obj
+[132/492] Building C object src/device/CMakeFiles/dev.dir/mouse_ps2.c.obj
+[133/492] Building C object src/device/CMakeFiles/dev.dir/mouse_bus.c.obj
+[134/492] Building C object src/disk/CMakeFiles/hdd.dir/hdd.c.obj
+[135/492] Building C object src/cpu/CMakeFiles/cpu.dir/x86seg.c.obj
+[136/492] Building C object src/disk/CMakeFiles/hdd.dir/hdc_xtide.c.obj
+[137/492] Building C object src/device/CMakeFiles/dev.dir/mouse_serial.c.obj
+[138/492] Building C object src/disk/CMakeFiles/hdd.dir/hdc_st506_at.c.obj
+[139/492] Building C object src/disk/CMakeFiles/hdd.dir/hdc_ide_opti611.c.obj
+[140/492] Building C object src/disk/CMakeFiles/hdd.dir/hdd_image.c.obj
+[141/492] Building C object src/disk/CMakeFiles/hdd.dir/hdc_ide_cmd646.c.obj
+[142/492] Building C object src/disk/CMakeFiles/hdd.dir/hdc_esdi_at.c.obj
+[143/492] Building C object src/disk/CMakeFiles/hdd.dir/hdc_ide_cmd640.c.obj
+[144/492] Building C object src/disk/CMakeFiles/hdd.dir/hdc_ide_sff8038i.c.obj
+[145/492] Building C object src/disk/CMakeFiles/hdd.dir/hdc_xta.c.obj
+[146/492] Building C object src/disk/CMakeFiles/hdd.dir/hdc_esdi_mca.c.obj
+[147/492] Building C object src/device/CMakeFiles/dev.dir/keyboard_at.c.obj
+[148/492] Building C object src/disk/minivhd/CMakeFiles/minivhd.dir/minivhd_convert.c.obj
+[149/492] Building C object src/disk/CMakeFiles/hdd.dir/hdc_st506_xt.c.obj
+[150/492] Building C object src/disk/minivhd/CMakeFiles/minivhd.dir/libxml2_encoding.c.obj
+[151/492] Building C object src/disk/minivhd/CMakeFiles/minivhd.dir/minivhd_io.c.obj
+[152/492] Building C object src/floppy/CMakeFiles/fdd.dir/fdc_magitronic.c.obj
+[153/492] Building C object src/disk/minivhd/CMakeFiles/minivhd.dir/minivhd_struct_rw.c.obj
+[154/492] Building C object src/floppy/CMakeFiles/fdd.dir/fdc_monster.c.obj
+[155/492] Building C object src/floppy/CMakeFiles/fdd.dir/fdc_pii15xb.c.obj
+[156/492] Building C object src/disk/minivhd/CMakeFiles/minivhd.dir/minivhd_create.c.obj
+[157/492] Building C object src/disk/minivhd/CMakeFiles/minivhd.dir/minivhd_manage.c.obj
+[158/492] Building C object src/disk/minivhd/CMakeFiles/minivhd.dir/minivhd_util.c.obj
+[159/492] Building C object src/floppy/CMakeFiles/fdd.dir/fdd_common.c.obj
+[160/492] Building C object src/disk/minivhd/CMakeFiles/minivhd.dir/cwalk.c.obj
+[161/492] Building C object src/floppy/CMakeFiles/fdd.dir/fdd.c.obj
+[162/492] Building C object src/codegen/CMakeFiles/dynarec.dir/codegen_x86.c.obj
+[163/492] Building C object src/floppy/CMakeFiles/fdd.dir/fdd_fdi.c.obj
+[164/492] Building C object src/game/CMakeFiles/game.dir/joystick_ch_flightstick_pro.c.obj
+[165/492] Building C object src/game/CMakeFiles/game.dir/joystick_standard.c.obj
+[166/492] Building C object src/floppy/CMakeFiles/fdd.dir/fdd_mfm.c.obj
+[167/492] Building C object src/game/CMakeFiles/game.dir/joystick_tm_fcs.c.obj
+[168/492] Building C object src/game/CMakeFiles/game.dir/gameport.c.obj
+[169/492] Building C object src/disk/CMakeFiles/zip.dir/zip.c.obj
+[170/492] Linking C static library src\disk\minivhd\libminivhd.a
+[171/492] Building C object src/game/CMakeFiles/game.dir/joystick_sw_pad.c.obj
+[172/492] Building C object src/machine/CMakeFiles/mch.dir/machine.c.obj
+[173/492] Building C object src/floppy/CMakeFiles/fdd.dir/fdd_json.c.obj
+[174/492] Building C object src/machine/CMakeFiles/mch.dir/m_xt_compaq.c.obj
+[175/492] Building C object src/floppy/CMakeFiles/fdd.dir/fdd_imd.c.obj
+[176/492] Building C object src/machine/CMakeFiles/mch.dir/m_xt_philips.c.obj
+[177/492] Building C object src/machine/CMakeFiles/mch.dir/machine_table.c.obj
+[178/492] Building C object src/floppy/CMakeFiles/fdd.dir/fdd_img.c.obj
+[179/492] Building C object src/machine/CMakeFiles/mch.dir/m_xt_xi8088.c.obj
+[180/492] Building C object src/machine/CMakeFiles/mch.dir/m_xt_zenith.c.obj
+[181/492] Building C object src/machine/CMakeFiles/mch.dir/m_xt.c.obj
+[182/492] Building C object src/floppy/CMakeFiles/fdd.dir/fdd_td0.c.obj
+[183/492] Building C object src/disk/CMakeFiles/hdd.dir/hdc_ide.c.obj
+[184/492] Building C object src/machine/CMakeFiles/mch.dir/m_elt.c.obj
+[185/492] Building C object src/machine/CMakeFiles/mch.dir/m_v86p.c.obj
+[186/492] Building C object src/floppy/CMakeFiles/fdd.dir/fdc.c.obj
+[187/492] Building C object src/machine/CMakeFiles/mch.dir/m_europc.c.obj
+[188/492] Building C object src/machine/CMakeFiles/mch.dir/m_at_commodore.c.obj
+[189/492] Building C object src/machine/CMakeFiles/mch.dir/m_at.c.obj
+[190/492] Building C object src/machine/CMakeFiles/mch.dir/m_xt_t1000_vid.c.obj
+[191/492] Building C object src/machine/CMakeFiles/mch.dir/m_xt_t1000.c.obj
+[192/492] Building C object src/floppy/CMakeFiles/fdd.dir/fdi2raw.c.obj
+[193/492] Building C object src/machine/CMakeFiles/mch.dir/m_ps2_isa.c.obj
+[194/492] Building C object src/machine/CMakeFiles/mch.dir/m_ps1.c.obj
+[195/492] Building C object src/disk/CMakeFiles/mo.dir/mo.c.obj
+[196/492] Building C object src/machine/CMakeFiles/mch.dir/m_pcjr.c.obj
+[197/492] Building C object src/machine/CMakeFiles/mch.dir/m_at_t3100e.c.obj
+[198/492] Building C object src/cpu/CMakeFiles/cpu.dir/808x.c.obj
+[199/492] Building C object src/machine/CMakeFiles/mch.dir/m_at_socket4.c.obj
+[200/492] Building C object src/machine/CMakeFiles/mch.dir/m_xt_olivetti.c.obj
+[201/492] Building C object src/machine/CMakeFiles/mch.dir/m_at_socket5.c.obj
+[202/492] Building C object src/machine/CMakeFiles/mch.dir/m_ps1_hdc.c.obj
+[203/492] Building C object src/machine/CMakeFiles/mch.dir/m_at_t3100e_vid.c.obj
+[204/492] Building C object src/machine/CMakeFiles/mch.dir/m_at_286_386sx.c.obj
+[205/492] Building C object src/machine/CMakeFiles/mch.dir/m_at_slot2.c.obj
+[206/492] Building C object src/machine/CMakeFiles/mch.dir/m_at_sockets7.c.obj
+[207/492] Building C object src/machine/CMakeFiles/mch.dir/m_at_socket8.c.obj
+[208/492] Building C object src/machine/CMakeFiles/mch.dir/m_tandy.c.obj
+[209/492] Building C object src/machine/CMakeFiles/mch.dir/m_at_socket7_3v.c.obj
+[210/492] Building C object src/machine/CMakeFiles/mch.dir/m_at_misc.c.obj
+[211/492] Building C object src/machine/CMakeFiles/mch.dir/m_at_socket370.c.obj
+[212/492] Building C object src/machine/CMakeFiles/mch.dir/m_at_compaq.c.obj
+[213/492] Building C object src/machine/CMakeFiles/mch.dir/m_ps2_mca.c.obj
+[214/492] Building C object src/machine/CMakeFiles/mch.dir/m_xt_laserxt.c.obj
+[215/492] Building C object src/mem/CMakeFiles/mem.dir/i2c_eeprom.c.obj
+[216/492] Building C object src/mem/CMakeFiles/mem.dir/catalyst_flash.c.obj
+[217/492] Building C object src/machine/CMakeFiles/mch.dir/m_at_slot1.c.obj
+[218/492] Building C object src/machine/CMakeFiles/mch.dir/m_at_socket7.c.obj
+[219/492] Building C object src/machine/CMakeFiles/mch.dir/m_amstrad.c.obj
+[220/492] Building C object src/floppy/CMakeFiles/fdd.dir/fdd_86f.c.obj
+[221/492] Building C object src/machine/CMakeFiles/mch.dir/m_at_386dx_486.c.obj
+[222/492] Building C object src/mem/CMakeFiles/mem.dir/intel_flash.c.obj
+[223/492] Building C object src/mem/CMakeFiles/mem.dir/smram.c.obj
+[224/492] Building C object src/mem/CMakeFiles/mem.dir/sst_flash.c.obj
+[225/492] Building C object src/mem/CMakeFiles/mem.dir/spd.c.obj
+[226/492] Building C object src/network/CMakeFiles/net.dir/net_3c503.c.obj
+[227/492] Building C object src/mem/CMakeFiles/mem.dir/rom.c.obj
+[228/492] Building C object src/network/CMakeFiles/net.dir/net_plip.c.obj
+[229/492] Building C object src/network/CMakeFiles/net.dir/net_pcap.c.obj
+[230/492] Building C object src/network/CMakeFiles/net.dir/net_3c501.c.obj
+[231/492] Building C object src/network/CMakeFiles/net.dir/net_event.c.obj
+[232/492] Building C object src/network/CMakeFiles/net.dir/net_dp8390.c.obj
+[233/492] Building C object src/network/CMakeFiles/net.dir/net_wd8003.c.obj
+[234/492] Building C object src/network/CMakeFiles/net.dir/net_ne2000.c.obj
+[235/492] Building C object src/network/CMakeFiles/net.dir/network.c.obj
+[236/492] Building C object src/network/CMakeFiles/net.dir/net_slirp.c.obj
+[237/492] Building C object src/network/slirp/CMakeFiles/slirp.dir/arp_table.c.obj
+[238/492] Building C object src/mem/CMakeFiles/mem.dir/mem.c.obj
+[239/492] Building C object src/network/slirp/CMakeFiles/slirp.dir/cksum.c.obj
+[240/492] Building C object src/network/slirp/CMakeFiles/slirp.dir/bootp.c.obj
+[241/492] Building C object src/network/slirp/CMakeFiles/slirp.dir/if.c.obj
+[242/492] Building C object src/network/slirp/CMakeFiles/slirp.dir/ip_output.c.obj
+[243/492] Building C object src/network/slirp/CMakeFiles/slirp.dir/dnssearch.c.obj
+[244/492] Building C object src/network/slirp/CMakeFiles/slirp.dir/ip_icmp.c.obj
+[245/492] Building C object src/network/slirp/CMakeFiles/slirp.dir/ip_input.c.obj
+[246/492] Building C object src/network/slirp/CMakeFiles/slirp.dir/sbuf.c.obj
+[247/492] Building C object src/network/slirp/CMakeFiles/slirp.dir/mbuf.c.obj
+[248/492] Building C object src/network/slirp/CMakeFiles/slirp.dir/tinyglib.c.obj
+[249/492] Building C object src/network/slirp/CMakeFiles/slirp.dir/misc.c.obj
+[250/492] Building C object src/printer/CMakeFiles/print.dir/prt_cpmap.c.obj
+[251/492] Building C object src/printer/CMakeFiles/print.dir/png.c.obj
+[252/492] Building C object src/network/slirp/CMakeFiles/slirp.dir/tcp_output.c.obj
+[253/492] Building C object src/codegen/CMakeFiles/dynarec.dir/codegen_ops.c.obj
+[254/492] Building C object src/sio/CMakeFiles/sio.dir/sio_acc3221.c.obj
+[255/492] Building C object src/printer/CMakeFiles/print.dir/prt_text.c.obj
+[256/492] Building C object src/printer/CMakeFiles/print.dir/prt_ps.c.obj
+[257/492] Building C object src/network/slirp/CMakeFiles/slirp.dir/socket.c.obj
+[258/492] Building C object src/sio/CMakeFiles/sio.dir/sio_f82c710.c.obj
+[259/492] Building C object src/sio/CMakeFiles/sio.dir/sio_ali5123.c.obj
+[260/492] Building C object src/network/CMakeFiles/net.dir/net_pcnet.c.obj
+[261/492] Building C object src/network/slirp/CMakeFiles/slirp.dir/tcp_input.c.obj
+[262/492] Building C object src/sio/CMakeFiles/sio.dir/sio_fdc37c6xx.c.obj
+[263/492] Building C object src/network/slirp/CMakeFiles/slirp.dir/slirp.c.obj
+[264/492] Building C object src/sio/CMakeFiles/sio.dir/sio_82091aa.c.obj
+[265/492] Building C object src/sio/CMakeFiles/sio.dir/sio_fdc37c669.c.obj
+[266/492] Building C object src/network/slirp/CMakeFiles/slirp.dir/tcp_subr.c.obj
+[267/492] Building C object src/sio/CMakeFiles/sio.dir/sio_fdc37c67x.c.obj
+[268/492] Building C object src/sio/CMakeFiles/sio.dir/sio_fdc37m60x.c.obj
+[269/492] Building C object src/sio/CMakeFiles/sio.dir/sio_it8661f.c.obj
+[270/492] Building C object src/network/slirp/CMakeFiles/slirp.dir/version.c.obj
+[271/492] Building C object src/network/slirp/CMakeFiles/slirp.dir/tcp_timer.c.obj
+[272/492] Building C object src/sio/CMakeFiles/sio.dir/sio_pc87306.c.obj
+[273/492] Building C object src/sio/CMakeFiles/sio.dir/sio_pc87310.c.obj
+[274/492] Building C object src/sio/CMakeFiles/sio.dir/sio_pc87311.c.obj
+[275/492] Building C object src/sio/CMakeFiles/sio.dir/sio_prime3b.c.obj
+[276/492] Building C object src/sio/CMakeFiles/sio.dir/sio_pc87307.c.obj
+[277/492] Building C object src/network/slirp/CMakeFiles/slirp.dir/udp.c.obj
+[278/492] Building C object src/sio/CMakeFiles/sio.dir/sio_pc87332.c.obj
+[279/492] Building C object src/sio/CMakeFiles/sio.dir/sio_pc87309.c.obj
+[280/492] Building C object src/network/slirp/CMakeFiles/slirp.dir/util.c.obj
+[281/492] Building C object src/sio/CMakeFiles/sio.dir/sio_detect.c.obj
+[282/492] Building C object src/sio/CMakeFiles/sio.dir/sio_prime3c.c.obj
+[283/492] Building C object src/sio/CMakeFiles/sio.dir/sio_fdc37c93x.c.obj
+[284/492] Building C object src/scsi/CMakeFiles/scsi.dir/scsi.c.obj
+[285/492] Building C object src/sio/CMakeFiles/sio.dir/sio_um8669f.c.obj
+[286/492] Building C object src/sio/CMakeFiles/sio.dir/sio_w83787f.c.obj
+[287/492] Building C object src/sio/CMakeFiles/sio.dir/sio_vt82c686.c.obj
+[288/492] Building C object src/sio/CMakeFiles/sio.dir/sio_w83877f.c.obj
+[289/492] Building C object src/scsi/CMakeFiles/scsi.dir/scsi_device.c.obj
+[290/492] Building C object src/printer/CMakeFiles/print.dir/prt_escp.c.obj
+[291/492] Building C object src/sio/CMakeFiles/sio.dir/sio_w83977f.c.obj
+[292/492] Building C object src/sound/CMakeFiles/snd.dir/snd_opl.c.obj
+[293/492] Linking C static library src\network\slirp\libslirp.a
+[294/492] Building C object src/sound/CMakeFiles/snd.dir/snd_speaker.c.obj
+[295/492] Building C object src/sound/CMakeFiles/snd.dir/snd_lpt_dac.c.obj
+[296/492] Building C object src/sound/CMakeFiles/snd.dir/sound.c.obj
+[297/492] Building CXX object src/sound/CMakeFiles/snd.dir/snd_resid.cc.obj
+[298/492] Building C object src/sound/CMakeFiles/snd.dir/snd_pssj.c.obj
+[299/492] Building C object src/scsi/CMakeFiles/scsi.dir/scsi_aha154x.c.obj
+[300/492] Building C object src/sound/CMakeFiles/snd.dir/midi.c.obj
+[301/492] Building C object src/sound/CMakeFiles/snd.dir/snd_lpt_dss.c.obj
+[302/492] Building C object src/scsi/CMakeFiles/scsi.dir/scsi_disk.c.obj
+[303/492] Building C object src/sound/CMakeFiles/snd.dir/snd_ps1.c.obj
+[304/492] Building C object src/scsi/CMakeFiles/scsi.dir/scsi_spock.c.obj
+[305/492] Building C object src/sound/CMakeFiles/snd.dir/snd_adlib.c.obj
+[306/492] Building C object src/sound/CMakeFiles/snd.dir/snd_ac97_codec.c.obj
+[307/492] Building C object src/sound/CMakeFiles/snd.dir/snd_ac97_via.c.obj
+[308/492] Building C object src/scsi/CMakeFiles/scsi.dir/scsi_buslogic.c.obj
+[309/492] Building C object src/sound/CMakeFiles/snd.dir/snd_opl_nuked.c.obj
+[310/492] Building C object src/scsi/CMakeFiles/scsi.dir/scsi_ncr5380.c.obj
+[311/492] Building C object src/sound/CMakeFiles/snd.dir/snd_cms.c.obj
+[312/492] Building C object src/scsi/CMakeFiles/scsi.dir/scsi_x54x.c.obj
+[313/492] Building C object src/scsi/CMakeFiles/scsi.dir/scsi_pcscsi.c.obj
+[314/492] Building C object src/sound/CMakeFiles/snd.dir/snd_ad1848.c.obj
+[315/492] Building C object src/sound/CMakeFiles/snd.dir/snd_ssi2001.c.obj
+[316/492] Building C object src/sound/CMakeFiles/snd.dir/snd_ym7128.c.obj
+[317/492] Building C object src/sound/CMakeFiles/snd.dir/snd_azt2316a.c.obj
+[318/492] Building C object src/sound/CMakeFiles/snd.dir/snd_wss.c.obj
+[319/492] Building C object src/sound/CMakeFiles/snd.dir/snd_adlibgold.c.obj
+[320/492] Building C object src/sound/CMakeFiles/snd.dir/snd_sn76489.c.obj
+[321/492] Building C object src/scsi/CMakeFiles/scsi.dir/scsi_cdrom.c.obj
+[322/492] Building C object src/scsi/CMakeFiles/scsi.dir/scsi_ncr53c8xx.c.obj
+[323/492] Building C object src/sound/CMakeFiles/snd.dir/snd_cs423x.c.obj
+[324/492] Building C object src/sound/CMakeFiles/snd.dir/openal.c.obj
+[325/492] Building C object src/sound/CMakeFiles/snd.dir/snd_optimc.c.obj
+[326/492] Building C object src/sound/CMakeFiles/snd.dir/snd_gus.c.obj
+[327/492] Building C object src/sound/CMakeFiles/snd.dir/snd_cmi8x38.c.obj
+[328/492] Building CXX object src/sound/munt/CMakeFiles/mt32emu.dir/LA32Ramp.cpp.obj
+[329/492] Building C object src/sound/CMakeFiles/snd.dir/snd_audiopci.c.obj
+[330/492] Building C object src/sound/CMakeFiles/snd.dir/midi_fluidsynth.c.obj
+[331/492] Building CXX object src/sound/munt/CMakeFiles/mt32emu.dir/File.cpp.obj
+[332/492] Building CXX object src/sound/munt/CMakeFiles/mt32emu.dir/Display.cpp.obj
+[333/492] Building C object src/sound/CMakeFiles/snd.dir/midi_mt32.c.obj
+[334/492] Building CXX object src/sound/munt/CMakeFiles/mt32emu.dir/LA32FloatWaveGenerator.cpp.obj
+[335/492] Building C object src/sound/CMakeFiles/snd.dir/snd_sb_dsp.c.obj
+[336/492] Building C object src/sound/CMakeFiles/snd.dir/snd_pas16.c.obj
+[337/492] Building C object src/sound/CMakeFiles/snd.dir/snd_mpu401.c.obj
+[338/492] Building CXX object src/sound/munt/CMakeFiles/mt32emu.dir/Analog.cpp.obj
+[339/492] Building CXX object src/sound/munt/CMakeFiles/mt32emu.dir/Poly.cpp.obj
+[340/492] Building C object src/sound/CMakeFiles/snd.dir/snd_emu8k.c.obj
+[341/492] Building CXX object src/sound/munt/CMakeFiles/mt32emu.dir/LA32WaveGenerator.cpp.obj
+[342/492] Building CXX object src/sound/munt/CMakeFiles/mt32emu.dir/SampleRateConverter.cpp.obj
+[343/492] Building CXX object src/sound/munt/CMakeFiles/mt32emu.dir/PartialManager.cpp.obj
+[344/492] Building C object src/sound/CMakeFiles/snd.dir/snd_sb.c.obj
+[345/492] Building CXX object src/sound/munt/CMakeFiles/mt32emu.dir/MidiStreamParser.cpp.obj
+[346/492] Building CXX object src/sound/CMakeFiles/snd.dir/snd_opl_ymfm.cpp.obj
+[347/492] Building CXX object src/sound/munt/CMakeFiles/mt32emu.dir/srchelper/srctools/src/FIRResampler.cpp.obj
+[348/492] Building CXX object src/sound/munt/CMakeFiles/mt32emu.dir/Partial.cpp.obj
+[349/492] Building CXX object src/sound/CMakeFiles/snd.dir/midi_rtmidi.cpp.obj
+[350/492] Building CXX object src/sound/munt/CMakeFiles/mt32emu.dir/srchelper/srctools/src/LinearResampler.cpp.obj
+[351/492] Building CXX object src/sound/munt/CMakeFiles/mt32emu.dir/ROMInfo.cpp.obj
+[352/492] Building CXX object src/sound/munt/CMakeFiles/mt32emu.dir/FileStream.cpp.obj
+[353/492] Building CXX object src/sound/munt/CMakeFiles/mt32emu.dir/srchelper/InternalResampler.cpp.obj
+[354/492] Building CXX object src/sound/munt/CMakeFiles/mt32emu.dir/srchelper/srctools/src/IIR2xResampler.cpp.obj
+[355/492] Building CXX object src/sound/munt/CMakeFiles/mt32emu.dir/srchelper/srctools/src/SincResampler.cpp.obj
+[356/492] Building CXX object src/sound/munt/CMakeFiles/mt32emu.dir/srchelper/srctools/src/ResamplerModel.cpp.obj
+[357/492] Building CXX object src/sound/munt/CMakeFiles/mt32emu.dir/Tables.cpp.obj
+[358/492] Building CXX object src/sound/munt/CMakeFiles/mt32emu.dir/BReverbModel.cpp.obj
+[359/492] Building CXX object src/sound/munt/CMakeFiles/mt32emu.dir/TVF.cpp.obj
+[360/492] Building CXX object src/sound/munt/CMakeFiles/mt32emu.dir/sha1/sha1.cpp.obj
+[361/492] Building CXX object src/sound/munt/CMakeFiles/mt32emu.dir/Part.cpp.obj
+[362/492] Building CXX object src/sound/resid-fp/CMakeFiles/resid-fp.dir/envelope.cc.obj
+[363/492] Building CXX object src/sound/munt/CMakeFiles/mt32emu.dir/TVA.cpp.obj
+[364/492] Building CXX object src/sound/munt/CMakeFiles/mt32emu.dir/TVP.cpp.obj
+[365/492] Building CXX object src/sound/resid-fp/CMakeFiles/resid-fp.dir/convolve.cc.obj
+[366/492] Building CXX object src/sound/resid-fp/CMakeFiles/resid-fp.dir/pot.cc.obj
+[367/492] Building CXX object src/sound/resid-fp/CMakeFiles/resid-fp.dir/convolve-sse.cc.obj
+[368/492] Building CXX object src/sound/resid-fp/CMakeFiles/resid-fp.dir/extfilt.cc.obj
+[369/492] Building CXX object src/sound/resid-fp/CMakeFiles/resid-fp.dir/wave6581_PST.cc.obj
+[370/492] Building CXX object src/sound/resid-fp/CMakeFiles/resid-fp.dir/wave6581_P_T.cc.obj
+[371/492] Building CXX object src/sound/resid-fp/CMakeFiles/resid-fp.dir/wave6581_PS_.cc.obj
+[372/492] Building CXX object src/sound/resid-fp/CMakeFiles/resid-fp.dir/filter.cc.obj
+[373/492] Building CXX object src/sound/resid-fp/CMakeFiles/resid-fp.dir/wave6581__ST.cc.obj
+[374/492] Building CXX object src/sound/resid-fp/CMakeFiles/resid-fp.dir/wave8580_PS_.cc.obj
+[375/492] Building CXX object src/sound/resid-fp/CMakeFiles/resid-fp.dir/wave8580_PST.cc.obj
+[376/492] Building CXX object src/sound/resid-fp/CMakeFiles/resid-fp.dir/wave.cc.obj
+[377/492] Building CXX object src/sound/resid-fp/CMakeFiles/resid-fp.dir/voice.cc.obj
+[378/492] Building CXX object src/sound/resid-fp/CMakeFiles/resid-fp.dir/wave8580_P_T.cc.obj
+[379/492] Building CXX object src/sound/resid-fp/CMakeFiles/resid-fp.dir/wave8580__ST.cc.obj
+[380/492] Building C object src/video/CMakeFiles/vid.dir/agpgart.c.obj
+[381/492] Building CXX object src/sound/ymfm/CMakeFiles/ymfm.dir/ymfm_misc.cpp.obj
+[382/492] Building C object src/video/CMakeFiles/vid.dir/vid_table.c.obj
+[383/492] Building C object src/video/CMakeFiles/vid.dir/vid_cga_comp.c.obj
+[384/492] Building C object src/video/CMakeFiles/vid.dir/vid_mda.c.obj
+[385/492] Building CXX object src/sound/resid-fp/CMakeFiles/resid-fp.dir/sid.cc.obj
+[386/492] Building C object src/video/CMakeFiles/vid.dir/vid_compaq_cga.c.obj
+[387/492] Building C object src/video/CMakeFiles/vid.dir/vid_cga.c.obj
+[388/492] Building C object src/video/CMakeFiles/vid.dir/vid_hercules.c.obj
+[389/492] Building C object src/video/CMakeFiles/vid.dir/vid_herculesplus.c.obj
+[390/492] Building C object src/video/CMakeFiles/vid.dir/vid_colorplus.c.obj
+[391/492] Building C object src/video/CMakeFiles/vid.dir/video.c.obj
+[392/492] Building C object src/video/CMakeFiles/vid.dir/vid_genius.c.obj
+[393/492] Building CXX object src/sound/munt/CMakeFiles/mt32emu.dir/c_interface/c_interface.cpp.obj
+[394/492] Building C object src/video/CMakeFiles/vid.dir/vid_incolor.c.obj
+[395/492] Building CXX object src/sound/ymfm/CMakeFiles/ymfm.dir/ymfm_pcm.cpp.obj
+[396/492] Linking CXX static library src\sound\resid-fp\libresid-fp.a
+[397/492] Building CXX object src/sound/ymfm/CMakeFiles/ymfm.dir/ymfm_adpcm.cpp.obj
+[398/492] Building C object src/video/CMakeFiles/vid.dir/vid_im1024.c.obj
+[399/492] Building C object src/video/CMakeFiles/vid.dir/vid_ddc.c.obj
+[400/492] Building C object src/video/CMakeFiles/vid.dir/vid_wy700.c.obj
+[401/492] Building C object src/video/CMakeFiles/vid.dir/vid_sigma.c.obj
+[402/492] Building C object src/video/CMakeFiles/vid.dir/vid_vga.c.obj
+[403/492] Building C object src/video/CMakeFiles/vid.dir/vid_ati_eeprom.c.obj
+[404/492] Building CXX object src/sound/ymfm/CMakeFiles/ymfm.dir/ymfm_opq.cpp.obj
+[405/492] Building CXX object src/sound/ymfm/CMakeFiles/ymfm.dir/ymfm_opm.cpp.obj
+[406/492] Building C object src/video/CMakeFiles/vid.dir/vid_ati18800.c.obj
+[407/492] Building C object src/video/CMakeFiles/vid.dir/vid_ega_render.c.obj
+[408/492] Building C object src/video/CMakeFiles/vid.dir/vid_av9194.c.obj
+[409/492] Building C object src/video/CMakeFiles/vid.dir/vid_icd2061.c.obj
+[410/492] Building C object src/video/CMakeFiles/vid.dir/vid_ega.c.obj
+[411/492] Building C object src/video/CMakeFiles/vid.dir/vid_ati28800.c.obj
+[412/492] Building C object src/video/CMakeFiles/vid.dir/vid_ati68860_ramdac.c.obj
+[413/492] Building C object src/video/CMakeFiles/vid.dir/vid_ics2494.c.obj
+[414/492] Building CXX object src/sound/munt/CMakeFiles/mt32emu.dir/Synth.cpp.obj
+[415/492] Building C object src/video/CMakeFiles/vid.dir/vid_ics2595.c.obj
+[416/492] Building C object src/video/CMakeFiles/vid.dir/vid_bt48x_ramdac.c.obj
+[417/492] Building CXX object src/sound/ymfm/CMakeFiles/ymfm.dir/ymfm_opz.cpp.obj
+[418/492] Building C object src/video/CMakeFiles/vid.dir/vid_et3000.c.obj
+[419/492] Building C object src/video/CMakeFiles/vid.dir/vid_sc1148x_ramdac.c.obj
+[420/492] Building C object src/video/CMakeFiles/vid.dir/vid_sc1502x_ramdac.c.obj
+[421/492] Building C object src/video/CMakeFiles/vid.dir/vid_svga.c.obj
+[422/492] Building C object src/video/CMakeFiles/vid.dir/vid_stg_ramdac.c.obj
+[423/492] Building C object src/video/CMakeFiles/vid.dir/vid_pgc.c.obj
+[424/492] Building C object src/video/CMakeFiles/vid.dir/vid_ti_cf62011.c.obj
+[425/492] Linking CXX static library src\sound\munt\libmt32emu.a
+[426/492] Building C object src/video/CMakeFiles/vid.dir/vid_rtg310x.c.obj
+[427/492] Building C object src/video/CMakeFiles/vid.dir/vid_et4000.c.obj
+[428/492] Building C object src/video/CMakeFiles/vid.dir/vid_oak_oti.c.obj
+[429/492] Building C object src/video/CMakeFiles/vid.dir/vid_tkd8001_ramdac.c.obj
+[430/492] Building C object src/video/CMakeFiles/vid.dir/vid_att20c49x_ramdac.c.obj
+[431/492] Building C object src/video/CMakeFiles/vid.dir/vid_paradise.c.obj
+[432/492] Building C object src/video/CMakeFiles/vid.dir/vid_f82c425.c.obj
+[433/492] Building C object src/video/CMakeFiles/vid.dir/vid_tvga.c.obj
+[434/492] Building C object src/video/CMakeFiles/vid.dir/vid_sdac_ramdac.c.obj
+[435/492] Building C object src/video/CMakeFiles/vid.dir/vid_att2xc498_ramdac.c.obj
+[436/492] Building C object src/video/CMakeFiles/vid.dir/vid_ht216.c.obj
+[437/492] Building C object src/video/CMakeFiles/vid.dir/vid_tvp3026_ramdac.c.obj
+[438/492] Building C object src/video/CMakeFiles/vid.dir/vid_svga_render.c.obj
+[439/492] Building C object src/video/CMakeFiles/vid.dir/vid_ogc.c.obj
+[440/492] Building C object src/video/CMakeFiles/vid.dir/vid_nga.c.obj
+[441/492] Building C object src/video/CMakeFiles/vid.dir/vid_ibm_rgb528_ramdac.c.obj
+[442/492] Building C object src/video/CMakeFiles/voodoo.dir/vid_voodoo_fifo.c.obj
+[443/492] Building C object src/video/CMakeFiles/voodoo.dir/vid_voodoo_blitter.c.obj
+[444/492] Building C object src/video/CMakeFiles/voodoo.dir/vid_voodoo.c.obj
+[445/492] Building C object src/video/CMakeFiles/voodoo.dir/vid_voodoo_display.c.obj
+[446/492] Building C object src/video/CMakeFiles/voodoo.dir/vid_voodoo_fb.c.obj
+[447/492] Building C object src/video/CMakeFiles/vid.dir/vid_tgui9440.c.obj
+[448/492] Building C object src/video/CMakeFiles/vid.dir/vid_cl54xx.c.obj
+[449/492] Building C object src/video/CMakeFiles/vid.dir/vid_et4000w32.c.obj
+[450/492] Building C object src/video/CMakeFiles/voodoo.dir/vid_voodoo_reg.c.obj
+[451/492] Building C object src/video/CMakeFiles/voodoo.dir/vid_voodoo_setup.c.obj
+[452/492] Building C object src/video/CMakeFiles/voodoo.dir/vid_voodoo_banshee_blitter.c.obj
+[453/492] Building C object src/video/CMakeFiles/vid.dir/vid_8514a.c.obj
+[454/492] Building CXX object src/sound/ymfm/CMakeFiles/ymfm.dir/ymfm_opn.cpp.obj
+[455/492] Building C object src/video/CMakeFiles/vid.dir/vid_ati_mach64.c.obj
+[456/492] Building C object src/video/CMakeFiles/voodoo.dir/vid_voodoo_texture.c.obj
+[457/492] Building C object src/video/CMakeFiles/vid.dir/vid_xga.c.obj
+[458/492] Building C object src/video/CMakeFiles/voodoo.dir/vid_voodoo_banshee.c.obj
+[459/492] Building C object src/win/CMakeFiles/plat.dir/win_dynld.c.obj
+[460/492] Building C object src/video/CMakeFiles/vid.dir/vid_s3_virge.c.obj
+[461/492] Building C object src/win/CMakeFiles/plat.dir/win_keyboard.c.obj
+[462/492] Building C object src/win/CMakeFiles/plat.dir/win_mouse.c.obj
+[463/492] Building C object src/win/CMakeFiles/plat.dir/win_cdrom.c.obj
+[464/492] Building C object src/win/CMakeFiles/ui.dir/win_icon.c.obj
+[465/492] Building C object src/win/CMakeFiles/ui.dir/win_about.c.obj
+[466/492] Building C object src/win/CMakeFiles/plat.dir/win_joystick_rawinput.c.obj
+[467/492] Building C object src/video/CMakeFiles/vid.dir/vid_mga.c.obj
+[468/492] Building C object src/win/CMakeFiles/ui.dir/win_sdl.c.obj
+[469/492] Building C object src/win/CMakeFiles/ui.dir/win_snd_gain.c.obj
+[470/492] Building C object src/win/CMakeFiles/ui.dir/win_opengl_glslp.c.obj
+[471/492] Building C object src/win/CMakeFiles/ui.dir/win_stbar.c.obj
+[472/492] Building C object src/win/CMakeFiles/ui.dir/win_specify_dim.c.obj
+[473/492] Building C object src/win/CMakeFiles/ui.dir/win_ui.c.obj
+[474/492] Building C object src/win/CMakeFiles/ui.dir/win_devconf.c.obj
+[475/492] Building RC object src/win/CMakeFiles/ui.dir/86Box.rc.obj
+[476/492] Building C object src/win/CMakeFiles/ui.dir/win_new_floppy.c.obj
+[477/492] Building C object src/win/CMakeFiles/ui.dir/win_preferences.c.obj
+[478/492] Building C object src/win/CMakeFiles/ui.dir/win_dialog.c.obj
+[479/492] Building C object src/win/CMakeFiles/ui.dir/win_jsconf.c.obj
+[480/492] Building C object src/win/CMakeFiles/plat.dir/win.c.obj
+[481/492] Building C object src/win/CMakeFiles/ui.dir/glad.c.obj
+[482/492] Building C object src/win/CMakeFiles/ui.dir/win_toolbar.c.obj
+[483/492] Building CXX object src/sound/ymfm/CMakeFiles/ymfm.dir/ymfm_opl.cpp.obj
+[484/492] Linking CXX static library src\sound\ymfm\libymfm.a
+[485/492] Building C object src/video/CMakeFiles/voodoo.dir/vid_voodoo_render.c.obj
+[486/492] Building C object src/video/CMakeFiles/vid.dir/vid_s3.c.obj
+[487/492] Building C object src/win/CMakeFiles/ui.dir/win_media_menu.c.obj
+[488/492] Building C object src/win/CMakeFiles/ui.dir/win_opengl.c.obj
+[489/492] Building C object src/win/CMakeFiles/ui.dir/win_settings.c.obj
+[490/492] Building C object src/cpu/CMakeFiles/cpu.dir/386_dynarec_ops.c.obj
+[491/492] Building C object src/cpu/CMakeFiles/cpu.dir/386_dynarec.c.obj
+[492/492] Linking CXX executable src\86Box.exe
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 94a6f1821..476c27439 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -52,11 +52,14 @@ if(DEV_BRANCH)
 endif()
 
 if(VNC)
-    add_compile_definitions(USE_VNC)
-    add_library(vnc OBJECT vnc.c vnc_keymap.c)
-    target_link_libraries(86Box vnc vncserver)
-    if(WIN32)
-        target_link_libraries(86Box ws2_32)
+    find_package(LibVNCServer)
+    if(LibVNCServer_FOUND)
+        add_compile_definitions(USE_VNC)
+        add_library(vnc OBJECT vnc.c vnc_keymap.c)
+            target_link_libraries(86Box vnc LibVNCServer::vncserver)
+        if(WIN32)
+            target_link_libraries(86Box ws2_32)
+        endif()
     endif()
 endif()
 
diff --git a/src/win/Makefile.mingw b/src/win/Makefile.mingw
index 040b14aee..e39792966 100644
--- a/src/win/Makefile.mingw
+++ b/src/win/Makefile.mingw
@@ -416,7 +416,7 @@ ifeq ($(VNC), y)
   OPTS   += -I$(VNC_PATH)\INCLUDE
   VNCLIB := -L$(VNC_PATH)\LIB
  endif
- VNCLIB +=  -lvncserver
+ VNCLIB +=  -lvncserver.dll
  VNCOBJ := vnc.o vnc_keymap.o
 endif
 

From 4e0f10969f8374ffb6a75d916459631b3bf9a6fb Mon Sep 17 00:00:00 2001
From: Jasmine Iwanek <jasmine@iwanek.co.uk>
Date: Thu, 29 Dec 2022 21:59:28 -0500
Subject: [PATCH 06/25] Use correct case

---
 .github/workflows/c-cpp.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml
index 0c4ecd6b7..8987941c1 100644
--- a/.github/workflows/c-cpp.yml
+++ b/.github/workflows/c-cpp.yml
@@ -74,7 +74,7 @@ jobs:
       - uses: actions/checkout@v3
       - name: make
         run: >-
-          make -fwin/makefile.mingw -j
+          make -fwin/Makefile.mingw -j
           DEV_BUILD=${{ matrix.build.dev }}
           DEBUG=${{ matrix.build.debug }}
           NEW_DYNAREC=${{ matrix.dynarec.new }}

From eb26c1658d25abce8314b8eb17790b51122e4107 Mon Sep 17 00:00:00 2001
From: Jasmine Iwanek <jasmine@iwanek.co.uk>
Date: Thu, 29 Dec 2022 22:01:33 -0500
Subject: [PATCH 07/25] VNC=n not needed as it's off by default anyway

---
 .github/workflows/c-cpp.yml | 1 -
 .github/workflows/cmake.yml | 1 -
 2 files changed, 2 deletions(-)

diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml
index 8987941c1..8899d9943 100644
--- a/.github/workflows/c-cpp.yml
+++ b/.github/workflows/c-cpp.yml
@@ -79,7 +79,6 @@ jobs:
           DEBUG=${{ matrix.build.debug }}
           NEW_DYNAREC=${{ matrix.dynarec.new }}
           X64=${{ matrix.environment.x64 }}
-          VNC=n
         working-directory: ./src
       - uses: actions/upload-artifact@v3
         with:
diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
index 6876e83bc..c03b6b2b4 100644
--- a/.github/workflows/cmake.yml
+++ b/.github/workflows/cmake.yml
@@ -100,7 +100,6 @@ jobs:
           -D CMAKE_INSTALL_PREFIX=./build/artifacts
           -D QT=${{ matrix.ui.qt }}
           -D STATIC_BUILD=${{ matrix.ui.static }}
-          -D VNC=n
       - name: Build
         run: cmake --build build
       - name: Generate package

From 4cc21ee2dbb789203f27a03918333503520f62b7 Mon Sep 17 00:00:00 2001
From: Jasmine Iwanek <jasmine@iwanek.co.uk>
Date: Thu, 29 Dec 2022 22:10:53 -0500
Subject: [PATCH 08/25] Delete mingw32-cmake.log

It was an accidental upload
---
 mingw32-cmake.log | 492 ----------------------------------------------
 1 file changed, 492 deletions(-)
 delete mode 100644 mingw32-cmake.log

diff --git a/mingw32-cmake.log b/mingw32-cmake.log
deleted file mode 100644
index 112fd3327..000000000
--- a/mingw32-cmake.log
+++ /dev/null
@@ -1,492 +0,0 @@
-[1/492] Building C object src/CMakeFiles/86Box.dir/random.c.obj
-[2/492] Building C object src/CMakeFiles/86Box.dir/nmi.c.obj
-[3/492] Building C object src/CMakeFiles/86Box.dir/log.c.obj
-[4/492] Building C object src/CMakeFiles/86Box.dir/apm.c.obj
-[5/492] Building C object src/CMakeFiles/86Box.dir/ppi.c.obj
-[6/492] Building C object src/CMakeFiles/86Box.dir/ddma.c.obj
-[7/492] Building C object src/CMakeFiles/86Box.dir/timer.c.obj
-[8/492] Building C object src/CMakeFiles/86Box.dir/mca.c.obj
-[9/492] Building C object src/CMakeFiles/86Box.dir/port_6x.c.obj
-[10/492] Building C object src/CMakeFiles/86Box.dir/fifo8.c.obj
-[11/492] Building C object src/CMakeFiles/86Box.dir/port_92.c.obj
-[12/492] Building C object src/CMakeFiles/86Box.dir/io.c.obj
-[13/492] Building C object src/CMakeFiles/86Box.dir/usb.c.obj
-[14/492] Building C object src/CMakeFiles/86Box.dir/nvr_ps2.c.obj
-[15/492] Building C object src/CMakeFiles/86Box.dir/machine_status.c.obj
-[16/492] Building C object src/CMakeFiles/vnc.dir/vnc_keymap.c.obj
-[17/492] Building C object src/CMakeFiles/86Box.dir/pit_fast.c.obj
-[18/492] Building C object src/CMakeFiles/86Box.dir/nvr.c.obj
-[19/492] Building C object src/CMakeFiles/86Box.dir/pic.c.obj
-[20/492] Building C object src/CMakeFiles/86Box.dir/86box.c.obj
-[21/492] Building C object src/CMakeFiles/86Box.dir/pit.c.obj
-[22/492] Building C object src/CMakeFiles/86Box.dir/pci.c.obj
-[23/492] Building C object src/cdrom/CMakeFiles/cdrom.dir/cdrom_image.c.obj
-[24/492] Building C object src/cdrom/CMakeFiles/cdrom.dir/cdrom_mitsumi.c.obj
-[25/492] Building C object src/CMakeFiles/86Box.dir/device.c.obj
-[26/492] Building C object src/chipset/CMakeFiles/chipset.dir/82c100.c.obj
-[27/492] Building C object src/chipset/CMakeFiles/chipset.dir/acc2168.c.obj
-[28/492] Building C object src/CMakeFiles/86Box.dir/ini.c.obj
-[29/492] Building C object src/CMakeFiles/86Box.dir/nvr_at.c.obj
-[30/492] Building C object src/chipset/CMakeFiles/chipset.dir/ali1429.c.obj
-[31/492] Building C object src/chipset/CMakeFiles/chipset.dir/cs8230.c.obj
-[32/492] Building C object src/CMakeFiles/86Box.dir/dma.c.obj
-[33/492] Building C object src/chipset/CMakeFiles/chipset.dir/ali1531.c.obj
-[34/492] Building C object src/CMakeFiles/86Box.dir/acpi.c.obj
-[35/492] Building C object src/chipset/CMakeFiles/chipset.dir/ali1489.c.obj
-[36/492] Building C object src/chipset/CMakeFiles/chipset.dir/intel_82335.c.obj
-[37/492] Building C object src/chipset/CMakeFiles/chipset.dir/cs4031.c.obj
-[38/492] Building C object src/chipset/CMakeFiles/chipset.dir/ali1541.c.obj
-[39/492] Building C object src/chipset/CMakeFiles/chipset.dir/contaq_82c59x.c.obj
-[40/492] Building C object src/chipset/CMakeFiles/chipset.dir/ali6117.c.obj
-[41/492] Building C object src/CMakeFiles/86Box.dir/discord.c.obj
-[42/492] Building C object src/chipset/CMakeFiles/chipset.dir/__/ioapic.c.obj
-[43/492] Building C object src/chipset/CMakeFiles/chipset.dir/ims8848.c.obj
-[44/492] Building C object src/chipset/CMakeFiles/chipset.dir/ali1621.c.obj
-[45/492] Building C object src/cdrom/CMakeFiles/cdrom.dir/cdrom_image_backend.c.obj
-[46/492] Building C object src/chipset/CMakeFiles/chipset.dir/intel_420ex.c.obj
-[47/492] Building C object src/chipset/CMakeFiles/chipset.dir/headland.c.obj
-[48/492] Building C object src/chipset/CMakeFiles/chipset.dir/intel_sio.c.obj
-[49/492] Building C object src/cdrom/CMakeFiles/cdrom.dir/cdrom.c.obj
-[50/492] Building CXX object src/CMakeFiles/86Box.dir/thread.cpp.obj
-[51/492] Building C object src/chipset/CMakeFiles/chipset.dir/opti291.c.obj
-[52/492] Building C object src/chipset/CMakeFiles/chipset.dir/opti391.c.obj
-[53/492] Building C object src/chipset/CMakeFiles/chipset.dir/neat.c.obj
-[54/492] Building C object src/chipset/CMakeFiles/chipset.dir/opti495.c.obj
-[55/492] Building C object src/CMakeFiles/vnc.dir/vnc.c.obj
-[56/492] Building C object src/chipset/CMakeFiles/chipset.dir/opti283.c.obj
-[57/492] Building C object src/chipset/CMakeFiles/chipset.dir/ali1543.c.obj
-[58/492] Building C object src/chipset/CMakeFiles/chipset.dir/opti5x7.c.obj
-[59/492] Building C object src/chipset/CMakeFiles/chipset.dir/opti895.c.obj
-[60/492] Building C object src/chipset/CMakeFiles/chipset.dir/sis_85c310.c.obj
-[61/492] Building C object src/chipset/CMakeFiles/chipset.dir/intel_i450kx.c.obj
-[62/492] Building C object src/CMakeFiles/86Box.dir/config.c.obj
-[63/492] Building C object src/chipset/CMakeFiles/chipset.dir/opti822.c.obj
-[64/492] Building C object src/cdrom/CMakeFiles/cdrom.dir/cdrom_image_viso.c.obj
-[65/492] Building C object src/chipset/CMakeFiles/chipset.dir/sis_85c50x.c.obj
-[66/492] Building C object src/chipset/CMakeFiles/chipset.dir/sis_85c4xx.c.obj
-[67/492] Building C object src/chipset/CMakeFiles/chipset.dir/via_vt82c505.c.obj
-[68/492] Building C object src/chipset/CMakeFiles/chipset.dir/intel_4x0.c.obj
-[69/492] Building C object src/chipset/CMakeFiles/chipset.dir/gc100.c.obj
-[70/492] Building C object src/chipset/CMakeFiles/chipset.dir/olivetti_eva.c.obj
-[71/492] Building C object src/chipset/CMakeFiles/chipset.dir/via_vt82c49x.c.obj
-[72/492] Building C object src/chipset/CMakeFiles/chipset.dir/vl82c480.c.obj
-[73/492] Building C object src/chipset/CMakeFiles/chipset.dir/umc_8886.c.obj
-[74/492] Building C object src/chipset/CMakeFiles/chipset.dir/sis_5571.c.obj
-[75/492] Building C object src/cpu/CMakeFiles/cpu.dir/cpu_table.c.obj
-[76/492] Building C object src/chipset/CMakeFiles/chipset.dir/sis_85c496.c.obj
-[77/492] Building C object src/chipset/CMakeFiles/chipset.dir/umc_hb4.c.obj
-[78/492] Building C object src/chipset/CMakeFiles/chipset.dir/scamp.c.obj
-[79/492] Building C object src/chipset/CMakeFiles/chipset.dir/sis_5511.c.obj
-[80/492] Building C object src/cpu/CMakeFiles/cpu.dir/fpu.c.obj
-[81/492] Building C object src/chipset/CMakeFiles/chipset.dir/wd76c10.c.obj
-[82/492] Building C object src/chipset/CMakeFiles/chipset.dir/intel_piix.c.obj
-[83/492] Building C object src/cpu/CMakeFiles/cpu.dir/x87_timings.c.obj
-[84/492] Building C object src/cpu/CMakeFiles/cpu.dir/x86.c.obj
-[85/492] Building C object src/cpu/CMakeFiles/cpu.dir/x87.c.obj
-[86/492] Building C object src/chipset/CMakeFiles/chipset.dir/via_apollo.c.obj
-[87/492] Building C object src/cpu/CMakeFiles/cgt.dir/codegen_timing_common.c.obj
-[88/492] Building C object src/cpu/CMakeFiles/cpu.dir/8080.c.obj
-[89/492] Building C object src/chipset/CMakeFiles/chipset.dir/stpc.c.obj
-[90/492] Building C object src/cpu/CMakeFiles/cgt.dir/codegen_timing_486.c.obj
-[91/492] Building C object src/codegen/CMakeFiles/dynarec.dir/codegen.c.obj
-[92/492] Building C object src/cpu/CMakeFiles/cpu.dir/386.c.obj
-[93/492] Building C object src/cpu/CMakeFiles/cgt.dir/codegen_timing_686.c.obj
-[94/492] Building C object src/chipset/CMakeFiles/chipset.dir/scat.c.obj
-[95/492] Building C object src/cpu/CMakeFiles/cgt.dir/codegen_timing_winchip.c.obj
-[96/492] Building C object src/codegen/CMakeFiles/dynarec.dir/codegen_accumulate_x86.c.obj
-[97/492] Building C object src/device/CMakeFiles/dev.dir/bugger.c.obj
-[98/492] Building C object src/cpu/CMakeFiles/cgt.dir/codegen_timing_k6.c.obj
-[99/492] Building C object src/device/CMakeFiles/dev.dir/cartridge.c.obj
-[100/492] Building C object src/device/CMakeFiles/dev.dir/hwm.c.obj
-[101/492] Building C object src/cpu/CMakeFiles/cgt.dir/codegen_timing_winchip2.c.obj
-[102/492] Building C object src/cpu/CMakeFiles/cgt.dir/codegen_timing_p6.c.obj
-[103/492] Building C object src/device/CMakeFiles/dev.dir/hasp.c.obj
-[104/492] Building C object src/cpu/CMakeFiles/cgt.dir/codegen_timing_pentium.c.obj
-[105/492] Building C object src/chipset/CMakeFiles/chipset.dir/via_pipc.c.obj
-[106/492] Building C object src/device/CMakeFiles/dev.dir/hwm_lm75.c.obj
-[107/492] Building C object src/device/CMakeFiles/dev.dir/hwm_vt82c686.c.obj
-[108/492] Building C object src/device/CMakeFiles/dev.dir/hwm_gl518sm.c.obj
-[109/492] Building C object src/device/CMakeFiles/dev.dir/ibm_5161.c.obj
-[110/492] Building C object src/device/CMakeFiles/dev.dir/cassette.c.obj
-[111/492] Building C object src/device/CMakeFiles/dev.dir/postcard.c.obj
-[112/492] Building C object src/device/CMakeFiles/dev.dir/__/lpt.c.obj
-[113/492] Building C object src/device/CMakeFiles/dev.dir/pci_bridge.c.obj
-[114/492] Building C object src/device/CMakeFiles/dev.dir/isamem.c.obj
-[115/492] Building C object src/device/CMakeFiles/dev.dir/hwm_lm78.c.obj
-[116/492] Building C object src/device/CMakeFiles/dev.dir/clock_ics9xxx.c.obj
-[117/492] Building C object src/device/CMakeFiles/dev.dir/i2c.c.obj
-[118/492] Building C object src/device/CMakeFiles/dev.dir/i2c_gpio.c.obj
-[119/492] Building C object src/device/CMakeFiles/dev.dir/isartc.c.obj
-[120/492] Building C object src/cpu/CMakeFiles/cpu.dir/386_common.c.obj
-[121/492] Building C object src/device/CMakeFiles/dev.dir/smbus_ali7101.c.obj
-[122/492] Building C object src/device/CMakeFiles/dev.dir/smbus_piix4.c.obj
-[123/492] Building C object src/device/CMakeFiles/dev.dir/keyboard.c.obj
-[124/492] Building C object src/device/CMakeFiles/dev.dir/serial.c.obj
-[125/492] Building C object src/cpu/CMakeFiles/cpu.dir/cpu.c.obj
-[126/492] Building C object src/disk/CMakeFiles/hdd.dir/hdd_table.c.obj
-[127/492] Building C object src/device/CMakeFiles/dev.dir/mouse.c.obj
-[128/492] Building C object src/device/CMakeFiles/dev.dir/phoenix_486_jumper.c.obj
-[129/492] Building C object src/device/CMakeFiles/dev.dir/isapnp.c.obj
-[130/492] Building C object src/device/CMakeFiles/dev.dir/keyboard_xt.c.obj
-[131/492] Building C object src/disk/CMakeFiles/hdd.dir/hdc.c.obj
-[132/492] Building C object src/device/CMakeFiles/dev.dir/mouse_ps2.c.obj
-[133/492] Building C object src/device/CMakeFiles/dev.dir/mouse_bus.c.obj
-[134/492] Building C object src/disk/CMakeFiles/hdd.dir/hdd.c.obj
-[135/492] Building C object src/cpu/CMakeFiles/cpu.dir/x86seg.c.obj
-[136/492] Building C object src/disk/CMakeFiles/hdd.dir/hdc_xtide.c.obj
-[137/492] Building C object src/device/CMakeFiles/dev.dir/mouse_serial.c.obj
-[138/492] Building C object src/disk/CMakeFiles/hdd.dir/hdc_st506_at.c.obj
-[139/492] Building C object src/disk/CMakeFiles/hdd.dir/hdc_ide_opti611.c.obj
-[140/492] Building C object src/disk/CMakeFiles/hdd.dir/hdd_image.c.obj
-[141/492] Building C object src/disk/CMakeFiles/hdd.dir/hdc_ide_cmd646.c.obj
-[142/492] Building C object src/disk/CMakeFiles/hdd.dir/hdc_esdi_at.c.obj
-[143/492] Building C object src/disk/CMakeFiles/hdd.dir/hdc_ide_cmd640.c.obj
-[144/492] Building C object src/disk/CMakeFiles/hdd.dir/hdc_ide_sff8038i.c.obj
-[145/492] Building C object src/disk/CMakeFiles/hdd.dir/hdc_xta.c.obj
-[146/492] Building C object src/disk/CMakeFiles/hdd.dir/hdc_esdi_mca.c.obj
-[147/492] Building C object src/device/CMakeFiles/dev.dir/keyboard_at.c.obj
-[148/492] Building C object src/disk/minivhd/CMakeFiles/minivhd.dir/minivhd_convert.c.obj
-[149/492] Building C object src/disk/CMakeFiles/hdd.dir/hdc_st506_xt.c.obj
-[150/492] Building C object src/disk/minivhd/CMakeFiles/minivhd.dir/libxml2_encoding.c.obj
-[151/492] Building C object src/disk/minivhd/CMakeFiles/minivhd.dir/minivhd_io.c.obj
-[152/492] Building C object src/floppy/CMakeFiles/fdd.dir/fdc_magitronic.c.obj
-[153/492] Building C object src/disk/minivhd/CMakeFiles/minivhd.dir/minivhd_struct_rw.c.obj
-[154/492] Building C object src/floppy/CMakeFiles/fdd.dir/fdc_monster.c.obj
-[155/492] Building C object src/floppy/CMakeFiles/fdd.dir/fdc_pii15xb.c.obj
-[156/492] Building C object src/disk/minivhd/CMakeFiles/minivhd.dir/minivhd_create.c.obj
-[157/492] Building C object src/disk/minivhd/CMakeFiles/minivhd.dir/minivhd_manage.c.obj
-[158/492] Building C object src/disk/minivhd/CMakeFiles/minivhd.dir/minivhd_util.c.obj
-[159/492] Building C object src/floppy/CMakeFiles/fdd.dir/fdd_common.c.obj
-[160/492] Building C object src/disk/minivhd/CMakeFiles/minivhd.dir/cwalk.c.obj
-[161/492] Building C object src/floppy/CMakeFiles/fdd.dir/fdd.c.obj
-[162/492] Building C object src/codegen/CMakeFiles/dynarec.dir/codegen_x86.c.obj
-[163/492] Building C object src/floppy/CMakeFiles/fdd.dir/fdd_fdi.c.obj
-[164/492] Building C object src/game/CMakeFiles/game.dir/joystick_ch_flightstick_pro.c.obj
-[165/492] Building C object src/game/CMakeFiles/game.dir/joystick_standard.c.obj
-[166/492] Building C object src/floppy/CMakeFiles/fdd.dir/fdd_mfm.c.obj
-[167/492] Building C object src/game/CMakeFiles/game.dir/joystick_tm_fcs.c.obj
-[168/492] Building C object src/game/CMakeFiles/game.dir/gameport.c.obj
-[169/492] Building C object src/disk/CMakeFiles/zip.dir/zip.c.obj
-[170/492] Linking C static library src\disk\minivhd\libminivhd.a
-[171/492] Building C object src/game/CMakeFiles/game.dir/joystick_sw_pad.c.obj
-[172/492] Building C object src/machine/CMakeFiles/mch.dir/machine.c.obj
-[173/492] Building C object src/floppy/CMakeFiles/fdd.dir/fdd_json.c.obj
-[174/492] Building C object src/machine/CMakeFiles/mch.dir/m_xt_compaq.c.obj
-[175/492] Building C object src/floppy/CMakeFiles/fdd.dir/fdd_imd.c.obj
-[176/492] Building C object src/machine/CMakeFiles/mch.dir/m_xt_philips.c.obj
-[177/492] Building C object src/machine/CMakeFiles/mch.dir/machine_table.c.obj
-[178/492] Building C object src/floppy/CMakeFiles/fdd.dir/fdd_img.c.obj
-[179/492] Building C object src/machine/CMakeFiles/mch.dir/m_xt_xi8088.c.obj
-[180/492] Building C object src/machine/CMakeFiles/mch.dir/m_xt_zenith.c.obj
-[181/492] Building C object src/machine/CMakeFiles/mch.dir/m_xt.c.obj
-[182/492] Building C object src/floppy/CMakeFiles/fdd.dir/fdd_td0.c.obj
-[183/492] Building C object src/disk/CMakeFiles/hdd.dir/hdc_ide.c.obj
-[184/492] Building C object src/machine/CMakeFiles/mch.dir/m_elt.c.obj
-[185/492] Building C object src/machine/CMakeFiles/mch.dir/m_v86p.c.obj
-[186/492] Building C object src/floppy/CMakeFiles/fdd.dir/fdc.c.obj
-[187/492] Building C object src/machine/CMakeFiles/mch.dir/m_europc.c.obj
-[188/492] Building C object src/machine/CMakeFiles/mch.dir/m_at_commodore.c.obj
-[189/492] Building C object src/machine/CMakeFiles/mch.dir/m_at.c.obj
-[190/492] Building C object src/machine/CMakeFiles/mch.dir/m_xt_t1000_vid.c.obj
-[191/492] Building C object src/machine/CMakeFiles/mch.dir/m_xt_t1000.c.obj
-[192/492] Building C object src/floppy/CMakeFiles/fdd.dir/fdi2raw.c.obj
-[193/492] Building C object src/machine/CMakeFiles/mch.dir/m_ps2_isa.c.obj
-[194/492] Building C object src/machine/CMakeFiles/mch.dir/m_ps1.c.obj
-[195/492] Building C object src/disk/CMakeFiles/mo.dir/mo.c.obj
-[196/492] Building C object src/machine/CMakeFiles/mch.dir/m_pcjr.c.obj
-[197/492] Building C object src/machine/CMakeFiles/mch.dir/m_at_t3100e.c.obj
-[198/492] Building C object src/cpu/CMakeFiles/cpu.dir/808x.c.obj
-[199/492] Building C object src/machine/CMakeFiles/mch.dir/m_at_socket4.c.obj
-[200/492] Building C object src/machine/CMakeFiles/mch.dir/m_xt_olivetti.c.obj
-[201/492] Building C object src/machine/CMakeFiles/mch.dir/m_at_socket5.c.obj
-[202/492] Building C object src/machine/CMakeFiles/mch.dir/m_ps1_hdc.c.obj
-[203/492] Building C object src/machine/CMakeFiles/mch.dir/m_at_t3100e_vid.c.obj
-[204/492] Building C object src/machine/CMakeFiles/mch.dir/m_at_286_386sx.c.obj
-[205/492] Building C object src/machine/CMakeFiles/mch.dir/m_at_slot2.c.obj
-[206/492] Building C object src/machine/CMakeFiles/mch.dir/m_at_sockets7.c.obj
-[207/492] Building C object src/machine/CMakeFiles/mch.dir/m_at_socket8.c.obj
-[208/492] Building C object src/machine/CMakeFiles/mch.dir/m_tandy.c.obj
-[209/492] Building C object src/machine/CMakeFiles/mch.dir/m_at_socket7_3v.c.obj
-[210/492] Building C object src/machine/CMakeFiles/mch.dir/m_at_misc.c.obj
-[211/492] Building C object src/machine/CMakeFiles/mch.dir/m_at_socket370.c.obj
-[212/492] Building C object src/machine/CMakeFiles/mch.dir/m_at_compaq.c.obj
-[213/492] Building C object src/machine/CMakeFiles/mch.dir/m_ps2_mca.c.obj
-[214/492] Building C object src/machine/CMakeFiles/mch.dir/m_xt_laserxt.c.obj
-[215/492] Building C object src/mem/CMakeFiles/mem.dir/i2c_eeprom.c.obj
-[216/492] Building C object src/mem/CMakeFiles/mem.dir/catalyst_flash.c.obj
-[217/492] Building C object src/machine/CMakeFiles/mch.dir/m_at_slot1.c.obj
-[218/492] Building C object src/machine/CMakeFiles/mch.dir/m_at_socket7.c.obj
-[219/492] Building C object src/machine/CMakeFiles/mch.dir/m_amstrad.c.obj
-[220/492] Building C object src/floppy/CMakeFiles/fdd.dir/fdd_86f.c.obj
-[221/492] Building C object src/machine/CMakeFiles/mch.dir/m_at_386dx_486.c.obj
-[222/492] Building C object src/mem/CMakeFiles/mem.dir/intel_flash.c.obj
-[223/492] Building C object src/mem/CMakeFiles/mem.dir/smram.c.obj
-[224/492] Building C object src/mem/CMakeFiles/mem.dir/sst_flash.c.obj
-[225/492] Building C object src/mem/CMakeFiles/mem.dir/spd.c.obj
-[226/492] Building C object src/network/CMakeFiles/net.dir/net_3c503.c.obj
-[227/492] Building C object src/mem/CMakeFiles/mem.dir/rom.c.obj
-[228/492] Building C object src/network/CMakeFiles/net.dir/net_plip.c.obj
-[229/492] Building C object src/network/CMakeFiles/net.dir/net_pcap.c.obj
-[230/492] Building C object src/network/CMakeFiles/net.dir/net_3c501.c.obj
-[231/492] Building C object src/network/CMakeFiles/net.dir/net_event.c.obj
-[232/492] Building C object src/network/CMakeFiles/net.dir/net_dp8390.c.obj
-[233/492] Building C object src/network/CMakeFiles/net.dir/net_wd8003.c.obj
-[234/492] Building C object src/network/CMakeFiles/net.dir/net_ne2000.c.obj
-[235/492] Building C object src/network/CMakeFiles/net.dir/network.c.obj
-[236/492] Building C object src/network/CMakeFiles/net.dir/net_slirp.c.obj
-[237/492] Building C object src/network/slirp/CMakeFiles/slirp.dir/arp_table.c.obj
-[238/492] Building C object src/mem/CMakeFiles/mem.dir/mem.c.obj
-[239/492] Building C object src/network/slirp/CMakeFiles/slirp.dir/cksum.c.obj
-[240/492] Building C object src/network/slirp/CMakeFiles/slirp.dir/bootp.c.obj
-[241/492] Building C object src/network/slirp/CMakeFiles/slirp.dir/if.c.obj
-[242/492] Building C object src/network/slirp/CMakeFiles/slirp.dir/ip_output.c.obj
-[243/492] Building C object src/network/slirp/CMakeFiles/slirp.dir/dnssearch.c.obj
-[244/492] Building C object src/network/slirp/CMakeFiles/slirp.dir/ip_icmp.c.obj
-[245/492] Building C object src/network/slirp/CMakeFiles/slirp.dir/ip_input.c.obj
-[246/492] Building C object src/network/slirp/CMakeFiles/slirp.dir/sbuf.c.obj
-[247/492] Building C object src/network/slirp/CMakeFiles/slirp.dir/mbuf.c.obj
-[248/492] Building C object src/network/slirp/CMakeFiles/slirp.dir/tinyglib.c.obj
-[249/492] Building C object src/network/slirp/CMakeFiles/slirp.dir/misc.c.obj
-[250/492] Building C object src/printer/CMakeFiles/print.dir/prt_cpmap.c.obj
-[251/492] Building C object src/printer/CMakeFiles/print.dir/png.c.obj
-[252/492] Building C object src/network/slirp/CMakeFiles/slirp.dir/tcp_output.c.obj
-[253/492] Building C object src/codegen/CMakeFiles/dynarec.dir/codegen_ops.c.obj
-[254/492] Building C object src/sio/CMakeFiles/sio.dir/sio_acc3221.c.obj
-[255/492] Building C object src/printer/CMakeFiles/print.dir/prt_text.c.obj
-[256/492] Building C object src/printer/CMakeFiles/print.dir/prt_ps.c.obj
-[257/492] Building C object src/network/slirp/CMakeFiles/slirp.dir/socket.c.obj
-[258/492] Building C object src/sio/CMakeFiles/sio.dir/sio_f82c710.c.obj
-[259/492] Building C object src/sio/CMakeFiles/sio.dir/sio_ali5123.c.obj
-[260/492] Building C object src/network/CMakeFiles/net.dir/net_pcnet.c.obj
-[261/492] Building C object src/network/slirp/CMakeFiles/slirp.dir/tcp_input.c.obj
-[262/492] Building C object src/sio/CMakeFiles/sio.dir/sio_fdc37c6xx.c.obj
-[263/492] Building C object src/network/slirp/CMakeFiles/slirp.dir/slirp.c.obj
-[264/492] Building C object src/sio/CMakeFiles/sio.dir/sio_82091aa.c.obj
-[265/492] Building C object src/sio/CMakeFiles/sio.dir/sio_fdc37c669.c.obj
-[266/492] Building C object src/network/slirp/CMakeFiles/slirp.dir/tcp_subr.c.obj
-[267/492] Building C object src/sio/CMakeFiles/sio.dir/sio_fdc37c67x.c.obj
-[268/492] Building C object src/sio/CMakeFiles/sio.dir/sio_fdc37m60x.c.obj
-[269/492] Building C object src/sio/CMakeFiles/sio.dir/sio_it8661f.c.obj
-[270/492] Building C object src/network/slirp/CMakeFiles/slirp.dir/version.c.obj
-[271/492] Building C object src/network/slirp/CMakeFiles/slirp.dir/tcp_timer.c.obj
-[272/492] Building C object src/sio/CMakeFiles/sio.dir/sio_pc87306.c.obj
-[273/492] Building C object src/sio/CMakeFiles/sio.dir/sio_pc87310.c.obj
-[274/492] Building C object src/sio/CMakeFiles/sio.dir/sio_pc87311.c.obj
-[275/492] Building C object src/sio/CMakeFiles/sio.dir/sio_prime3b.c.obj
-[276/492] Building C object src/sio/CMakeFiles/sio.dir/sio_pc87307.c.obj
-[277/492] Building C object src/network/slirp/CMakeFiles/slirp.dir/udp.c.obj
-[278/492] Building C object src/sio/CMakeFiles/sio.dir/sio_pc87332.c.obj
-[279/492] Building C object src/sio/CMakeFiles/sio.dir/sio_pc87309.c.obj
-[280/492] Building C object src/network/slirp/CMakeFiles/slirp.dir/util.c.obj
-[281/492] Building C object src/sio/CMakeFiles/sio.dir/sio_detect.c.obj
-[282/492] Building C object src/sio/CMakeFiles/sio.dir/sio_prime3c.c.obj
-[283/492] Building C object src/sio/CMakeFiles/sio.dir/sio_fdc37c93x.c.obj
-[284/492] Building C object src/scsi/CMakeFiles/scsi.dir/scsi.c.obj
-[285/492] Building C object src/sio/CMakeFiles/sio.dir/sio_um8669f.c.obj
-[286/492] Building C object src/sio/CMakeFiles/sio.dir/sio_w83787f.c.obj
-[287/492] Building C object src/sio/CMakeFiles/sio.dir/sio_vt82c686.c.obj
-[288/492] Building C object src/sio/CMakeFiles/sio.dir/sio_w83877f.c.obj
-[289/492] Building C object src/scsi/CMakeFiles/scsi.dir/scsi_device.c.obj
-[290/492] Building C object src/printer/CMakeFiles/print.dir/prt_escp.c.obj
-[291/492] Building C object src/sio/CMakeFiles/sio.dir/sio_w83977f.c.obj
-[292/492] Building C object src/sound/CMakeFiles/snd.dir/snd_opl.c.obj
-[293/492] Linking C static library src\network\slirp\libslirp.a
-[294/492] Building C object src/sound/CMakeFiles/snd.dir/snd_speaker.c.obj
-[295/492] Building C object src/sound/CMakeFiles/snd.dir/snd_lpt_dac.c.obj
-[296/492] Building C object src/sound/CMakeFiles/snd.dir/sound.c.obj
-[297/492] Building CXX object src/sound/CMakeFiles/snd.dir/snd_resid.cc.obj
-[298/492] Building C object src/sound/CMakeFiles/snd.dir/snd_pssj.c.obj
-[299/492] Building C object src/scsi/CMakeFiles/scsi.dir/scsi_aha154x.c.obj
-[300/492] Building C object src/sound/CMakeFiles/snd.dir/midi.c.obj
-[301/492] Building C object src/sound/CMakeFiles/snd.dir/snd_lpt_dss.c.obj
-[302/492] Building C object src/scsi/CMakeFiles/scsi.dir/scsi_disk.c.obj
-[303/492] Building C object src/sound/CMakeFiles/snd.dir/snd_ps1.c.obj
-[304/492] Building C object src/scsi/CMakeFiles/scsi.dir/scsi_spock.c.obj
-[305/492] Building C object src/sound/CMakeFiles/snd.dir/snd_adlib.c.obj
-[306/492] Building C object src/sound/CMakeFiles/snd.dir/snd_ac97_codec.c.obj
-[307/492] Building C object src/sound/CMakeFiles/snd.dir/snd_ac97_via.c.obj
-[308/492] Building C object src/scsi/CMakeFiles/scsi.dir/scsi_buslogic.c.obj
-[309/492] Building C object src/sound/CMakeFiles/snd.dir/snd_opl_nuked.c.obj
-[310/492] Building C object src/scsi/CMakeFiles/scsi.dir/scsi_ncr5380.c.obj
-[311/492] Building C object src/sound/CMakeFiles/snd.dir/snd_cms.c.obj
-[312/492] Building C object src/scsi/CMakeFiles/scsi.dir/scsi_x54x.c.obj
-[313/492] Building C object src/scsi/CMakeFiles/scsi.dir/scsi_pcscsi.c.obj
-[314/492] Building C object src/sound/CMakeFiles/snd.dir/snd_ad1848.c.obj
-[315/492] Building C object src/sound/CMakeFiles/snd.dir/snd_ssi2001.c.obj
-[316/492] Building C object src/sound/CMakeFiles/snd.dir/snd_ym7128.c.obj
-[317/492] Building C object src/sound/CMakeFiles/snd.dir/snd_azt2316a.c.obj
-[318/492] Building C object src/sound/CMakeFiles/snd.dir/snd_wss.c.obj
-[319/492] Building C object src/sound/CMakeFiles/snd.dir/snd_adlibgold.c.obj
-[320/492] Building C object src/sound/CMakeFiles/snd.dir/snd_sn76489.c.obj
-[321/492] Building C object src/scsi/CMakeFiles/scsi.dir/scsi_cdrom.c.obj
-[322/492] Building C object src/scsi/CMakeFiles/scsi.dir/scsi_ncr53c8xx.c.obj
-[323/492] Building C object src/sound/CMakeFiles/snd.dir/snd_cs423x.c.obj
-[324/492] Building C object src/sound/CMakeFiles/snd.dir/openal.c.obj
-[325/492] Building C object src/sound/CMakeFiles/snd.dir/snd_optimc.c.obj
-[326/492] Building C object src/sound/CMakeFiles/snd.dir/snd_gus.c.obj
-[327/492] Building C object src/sound/CMakeFiles/snd.dir/snd_cmi8x38.c.obj
-[328/492] Building CXX object src/sound/munt/CMakeFiles/mt32emu.dir/LA32Ramp.cpp.obj
-[329/492] Building C object src/sound/CMakeFiles/snd.dir/snd_audiopci.c.obj
-[330/492] Building C object src/sound/CMakeFiles/snd.dir/midi_fluidsynth.c.obj
-[331/492] Building CXX object src/sound/munt/CMakeFiles/mt32emu.dir/File.cpp.obj
-[332/492] Building CXX object src/sound/munt/CMakeFiles/mt32emu.dir/Display.cpp.obj
-[333/492] Building C object src/sound/CMakeFiles/snd.dir/midi_mt32.c.obj
-[334/492] Building CXX object src/sound/munt/CMakeFiles/mt32emu.dir/LA32FloatWaveGenerator.cpp.obj
-[335/492] Building C object src/sound/CMakeFiles/snd.dir/snd_sb_dsp.c.obj
-[336/492] Building C object src/sound/CMakeFiles/snd.dir/snd_pas16.c.obj
-[337/492] Building C object src/sound/CMakeFiles/snd.dir/snd_mpu401.c.obj
-[338/492] Building CXX object src/sound/munt/CMakeFiles/mt32emu.dir/Analog.cpp.obj
-[339/492] Building CXX object src/sound/munt/CMakeFiles/mt32emu.dir/Poly.cpp.obj
-[340/492] Building C object src/sound/CMakeFiles/snd.dir/snd_emu8k.c.obj
-[341/492] Building CXX object src/sound/munt/CMakeFiles/mt32emu.dir/LA32WaveGenerator.cpp.obj
-[342/492] Building CXX object src/sound/munt/CMakeFiles/mt32emu.dir/SampleRateConverter.cpp.obj
-[343/492] Building CXX object src/sound/munt/CMakeFiles/mt32emu.dir/PartialManager.cpp.obj
-[344/492] Building C object src/sound/CMakeFiles/snd.dir/snd_sb.c.obj
-[345/492] Building CXX object src/sound/munt/CMakeFiles/mt32emu.dir/MidiStreamParser.cpp.obj
-[346/492] Building CXX object src/sound/CMakeFiles/snd.dir/snd_opl_ymfm.cpp.obj
-[347/492] Building CXX object src/sound/munt/CMakeFiles/mt32emu.dir/srchelper/srctools/src/FIRResampler.cpp.obj
-[348/492] Building CXX object src/sound/munt/CMakeFiles/mt32emu.dir/Partial.cpp.obj
-[349/492] Building CXX object src/sound/CMakeFiles/snd.dir/midi_rtmidi.cpp.obj
-[350/492] Building CXX object src/sound/munt/CMakeFiles/mt32emu.dir/srchelper/srctools/src/LinearResampler.cpp.obj
-[351/492] Building CXX object src/sound/munt/CMakeFiles/mt32emu.dir/ROMInfo.cpp.obj
-[352/492] Building CXX object src/sound/munt/CMakeFiles/mt32emu.dir/FileStream.cpp.obj
-[353/492] Building CXX object src/sound/munt/CMakeFiles/mt32emu.dir/srchelper/InternalResampler.cpp.obj
-[354/492] Building CXX object src/sound/munt/CMakeFiles/mt32emu.dir/srchelper/srctools/src/IIR2xResampler.cpp.obj
-[355/492] Building CXX object src/sound/munt/CMakeFiles/mt32emu.dir/srchelper/srctools/src/SincResampler.cpp.obj
-[356/492] Building CXX object src/sound/munt/CMakeFiles/mt32emu.dir/srchelper/srctools/src/ResamplerModel.cpp.obj
-[357/492] Building CXX object src/sound/munt/CMakeFiles/mt32emu.dir/Tables.cpp.obj
-[358/492] Building CXX object src/sound/munt/CMakeFiles/mt32emu.dir/BReverbModel.cpp.obj
-[359/492] Building CXX object src/sound/munt/CMakeFiles/mt32emu.dir/TVF.cpp.obj
-[360/492] Building CXX object src/sound/munt/CMakeFiles/mt32emu.dir/sha1/sha1.cpp.obj
-[361/492] Building CXX object src/sound/munt/CMakeFiles/mt32emu.dir/Part.cpp.obj
-[362/492] Building CXX object src/sound/resid-fp/CMakeFiles/resid-fp.dir/envelope.cc.obj
-[363/492] Building CXX object src/sound/munt/CMakeFiles/mt32emu.dir/TVA.cpp.obj
-[364/492] Building CXX object src/sound/munt/CMakeFiles/mt32emu.dir/TVP.cpp.obj
-[365/492] Building CXX object src/sound/resid-fp/CMakeFiles/resid-fp.dir/convolve.cc.obj
-[366/492] Building CXX object src/sound/resid-fp/CMakeFiles/resid-fp.dir/pot.cc.obj
-[367/492] Building CXX object src/sound/resid-fp/CMakeFiles/resid-fp.dir/convolve-sse.cc.obj
-[368/492] Building CXX object src/sound/resid-fp/CMakeFiles/resid-fp.dir/extfilt.cc.obj
-[369/492] Building CXX object src/sound/resid-fp/CMakeFiles/resid-fp.dir/wave6581_PST.cc.obj
-[370/492] Building CXX object src/sound/resid-fp/CMakeFiles/resid-fp.dir/wave6581_P_T.cc.obj
-[371/492] Building CXX object src/sound/resid-fp/CMakeFiles/resid-fp.dir/wave6581_PS_.cc.obj
-[372/492] Building CXX object src/sound/resid-fp/CMakeFiles/resid-fp.dir/filter.cc.obj
-[373/492] Building CXX object src/sound/resid-fp/CMakeFiles/resid-fp.dir/wave6581__ST.cc.obj
-[374/492] Building CXX object src/sound/resid-fp/CMakeFiles/resid-fp.dir/wave8580_PS_.cc.obj
-[375/492] Building CXX object src/sound/resid-fp/CMakeFiles/resid-fp.dir/wave8580_PST.cc.obj
-[376/492] Building CXX object src/sound/resid-fp/CMakeFiles/resid-fp.dir/wave.cc.obj
-[377/492] Building CXX object src/sound/resid-fp/CMakeFiles/resid-fp.dir/voice.cc.obj
-[378/492] Building CXX object src/sound/resid-fp/CMakeFiles/resid-fp.dir/wave8580_P_T.cc.obj
-[379/492] Building CXX object src/sound/resid-fp/CMakeFiles/resid-fp.dir/wave8580__ST.cc.obj
-[380/492] Building C object src/video/CMakeFiles/vid.dir/agpgart.c.obj
-[381/492] Building CXX object src/sound/ymfm/CMakeFiles/ymfm.dir/ymfm_misc.cpp.obj
-[382/492] Building C object src/video/CMakeFiles/vid.dir/vid_table.c.obj
-[383/492] Building C object src/video/CMakeFiles/vid.dir/vid_cga_comp.c.obj
-[384/492] Building C object src/video/CMakeFiles/vid.dir/vid_mda.c.obj
-[385/492] Building CXX object src/sound/resid-fp/CMakeFiles/resid-fp.dir/sid.cc.obj
-[386/492] Building C object src/video/CMakeFiles/vid.dir/vid_compaq_cga.c.obj
-[387/492] Building C object src/video/CMakeFiles/vid.dir/vid_cga.c.obj
-[388/492] Building C object src/video/CMakeFiles/vid.dir/vid_hercules.c.obj
-[389/492] Building C object src/video/CMakeFiles/vid.dir/vid_herculesplus.c.obj
-[390/492] Building C object src/video/CMakeFiles/vid.dir/vid_colorplus.c.obj
-[391/492] Building C object src/video/CMakeFiles/vid.dir/video.c.obj
-[392/492] Building C object src/video/CMakeFiles/vid.dir/vid_genius.c.obj
-[393/492] Building CXX object src/sound/munt/CMakeFiles/mt32emu.dir/c_interface/c_interface.cpp.obj
-[394/492] Building C object src/video/CMakeFiles/vid.dir/vid_incolor.c.obj
-[395/492] Building CXX object src/sound/ymfm/CMakeFiles/ymfm.dir/ymfm_pcm.cpp.obj
-[396/492] Linking CXX static library src\sound\resid-fp\libresid-fp.a
-[397/492] Building CXX object src/sound/ymfm/CMakeFiles/ymfm.dir/ymfm_adpcm.cpp.obj
-[398/492] Building C object src/video/CMakeFiles/vid.dir/vid_im1024.c.obj
-[399/492] Building C object src/video/CMakeFiles/vid.dir/vid_ddc.c.obj
-[400/492] Building C object src/video/CMakeFiles/vid.dir/vid_wy700.c.obj
-[401/492] Building C object src/video/CMakeFiles/vid.dir/vid_sigma.c.obj
-[402/492] Building C object src/video/CMakeFiles/vid.dir/vid_vga.c.obj
-[403/492] Building C object src/video/CMakeFiles/vid.dir/vid_ati_eeprom.c.obj
-[404/492] Building CXX object src/sound/ymfm/CMakeFiles/ymfm.dir/ymfm_opq.cpp.obj
-[405/492] Building CXX object src/sound/ymfm/CMakeFiles/ymfm.dir/ymfm_opm.cpp.obj
-[406/492] Building C object src/video/CMakeFiles/vid.dir/vid_ati18800.c.obj
-[407/492] Building C object src/video/CMakeFiles/vid.dir/vid_ega_render.c.obj
-[408/492] Building C object src/video/CMakeFiles/vid.dir/vid_av9194.c.obj
-[409/492] Building C object src/video/CMakeFiles/vid.dir/vid_icd2061.c.obj
-[410/492] Building C object src/video/CMakeFiles/vid.dir/vid_ega.c.obj
-[411/492] Building C object src/video/CMakeFiles/vid.dir/vid_ati28800.c.obj
-[412/492] Building C object src/video/CMakeFiles/vid.dir/vid_ati68860_ramdac.c.obj
-[413/492] Building C object src/video/CMakeFiles/vid.dir/vid_ics2494.c.obj
-[414/492] Building CXX object src/sound/munt/CMakeFiles/mt32emu.dir/Synth.cpp.obj
-[415/492] Building C object src/video/CMakeFiles/vid.dir/vid_ics2595.c.obj
-[416/492] Building C object src/video/CMakeFiles/vid.dir/vid_bt48x_ramdac.c.obj
-[417/492] Building CXX object src/sound/ymfm/CMakeFiles/ymfm.dir/ymfm_opz.cpp.obj
-[418/492] Building C object src/video/CMakeFiles/vid.dir/vid_et3000.c.obj
-[419/492] Building C object src/video/CMakeFiles/vid.dir/vid_sc1148x_ramdac.c.obj
-[420/492] Building C object src/video/CMakeFiles/vid.dir/vid_sc1502x_ramdac.c.obj
-[421/492] Building C object src/video/CMakeFiles/vid.dir/vid_svga.c.obj
-[422/492] Building C object src/video/CMakeFiles/vid.dir/vid_stg_ramdac.c.obj
-[423/492] Building C object src/video/CMakeFiles/vid.dir/vid_pgc.c.obj
-[424/492] Building C object src/video/CMakeFiles/vid.dir/vid_ti_cf62011.c.obj
-[425/492] Linking CXX static library src\sound\munt\libmt32emu.a
-[426/492] Building C object src/video/CMakeFiles/vid.dir/vid_rtg310x.c.obj
-[427/492] Building C object src/video/CMakeFiles/vid.dir/vid_et4000.c.obj
-[428/492] Building C object src/video/CMakeFiles/vid.dir/vid_oak_oti.c.obj
-[429/492] Building C object src/video/CMakeFiles/vid.dir/vid_tkd8001_ramdac.c.obj
-[430/492] Building C object src/video/CMakeFiles/vid.dir/vid_att20c49x_ramdac.c.obj
-[431/492] Building C object src/video/CMakeFiles/vid.dir/vid_paradise.c.obj
-[432/492] Building C object src/video/CMakeFiles/vid.dir/vid_f82c425.c.obj
-[433/492] Building C object src/video/CMakeFiles/vid.dir/vid_tvga.c.obj
-[434/492] Building C object src/video/CMakeFiles/vid.dir/vid_sdac_ramdac.c.obj
-[435/492] Building C object src/video/CMakeFiles/vid.dir/vid_att2xc498_ramdac.c.obj
-[436/492] Building C object src/video/CMakeFiles/vid.dir/vid_ht216.c.obj
-[437/492] Building C object src/video/CMakeFiles/vid.dir/vid_tvp3026_ramdac.c.obj
-[438/492] Building C object src/video/CMakeFiles/vid.dir/vid_svga_render.c.obj
-[439/492] Building C object src/video/CMakeFiles/vid.dir/vid_ogc.c.obj
-[440/492] Building C object src/video/CMakeFiles/vid.dir/vid_nga.c.obj
-[441/492] Building C object src/video/CMakeFiles/vid.dir/vid_ibm_rgb528_ramdac.c.obj
-[442/492] Building C object src/video/CMakeFiles/voodoo.dir/vid_voodoo_fifo.c.obj
-[443/492] Building C object src/video/CMakeFiles/voodoo.dir/vid_voodoo_blitter.c.obj
-[444/492] Building C object src/video/CMakeFiles/voodoo.dir/vid_voodoo.c.obj
-[445/492] Building C object src/video/CMakeFiles/voodoo.dir/vid_voodoo_display.c.obj
-[446/492] Building C object src/video/CMakeFiles/voodoo.dir/vid_voodoo_fb.c.obj
-[447/492] Building C object src/video/CMakeFiles/vid.dir/vid_tgui9440.c.obj
-[448/492] Building C object src/video/CMakeFiles/vid.dir/vid_cl54xx.c.obj
-[449/492] Building C object src/video/CMakeFiles/vid.dir/vid_et4000w32.c.obj
-[450/492] Building C object src/video/CMakeFiles/voodoo.dir/vid_voodoo_reg.c.obj
-[451/492] Building C object src/video/CMakeFiles/voodoo.dir/vid_voodoo_setup.c.obj
-[452/492] Building C object src/video/CMakeFiles/voodoo.dir/vid_voodoo_banshee_blitter.c.obj
-[453/492] Building C object src/video/CMakeFiles/vid.dir/vid_8514a.c.obj
-[454/492] Building CXX object src/sound/ymfm/CMakeFiles/ymfm.dir/ymfm_opn.cpp.obj
-[455/492] Building C object src/video/CMakeFiles/vid.dir/vid_ati_mach64.c.obj
-[456/492] Building C object src/video/CMakeFiles/voodoo.dir/vid_voodoo_texture.c.obj
-[457/492] Building C object src/video/CMakeFiles/vid.dir/vid_xga.c.obj
-[458/492] Building C object src/video/CMakeFiles/voodoo.dir/vid_voodoo_banshee.c.obj
-[459/492] Building C object src/win/CMakeFiles/plat.dir/win_dynld.c.obj
-[460/492] Building C object src/video/CMakeFiles/vid.dir/vid_s3_virge.c.obj
-[461/492] Building C object src/win/CMakeFiles/plat.dir/win_keyboard.c.obj
-[462/492] Building C object src/win/CMakeFiles/plat.dir/win_mouse.c.obj
-[463/492] Building C object src/win/CMakeFiles/plat.dir/win_cdrom.c.obj
-[464/492] Building C object src/win/CMakeFiles/ui.dir/win_icon.c.obj
-[465/492] Building C object src/win/CMakeFiles/ui.dir/win_about.c.obj
-[466/492] Building C object src/win/CMakeFiles/plat.dir/win_joystick_rawinput.c.obj
-[467/492] Building C object src/video/CMakeFiles/vid.dir/vid_mga.c.obj
-[468/492] Building C object src/win/CMakeFiles/ui.dir/win_sdl.c.obj
-[469/492] Building C object src/win/CMakeFiles/ui.dir/win_snd_gain.c.obj
-[470/492] Building C object src/win/CMakeFiles/ui.dir/win_opengl_glslp.c.obj
-[471/492] Building C object src/win/CMakeFiles/ui.dir/win_stbar.c.obj
-[472/492] Building C object src/win/CMakeFiles/ui.dir/win_specify_dim.c.obj
-[473/492] Building C object src/win/CMakeFiles/ui.dir/win_ui.c.obj
-[474/492] Building C object src/win/CMakeFiles/ui.dir/win_devconf.c.obj
-[475/492] Building RC object src/win/CMakeFiles/ui.dir/86Box.rc.obj
-[476/492] Building C object src/win/CMakeFiles/ui.dir/win_new_floppy.c.obj
-[477/492] Building C object src/win/CMakeFiles/ui.dir/win_preferences.c.obj
-[478/492] Building C object src/win/CMakeFiles/ui.dir/win_dialog.c.obj
-[479/492] Building C object src/win/CMakeFiles/ui.dir/win_jsconf.c.obj
-[480/492] Building C object src/win/CMakeFiles/plat.dir/win.c.obj
-[481/492] Building C object src/win/CMakeFiles/ui.dir/glad.c.obj
-[482/492] Building C object src/win/CMakeFiles/ui.dir/win_toolbar.c.obj
-[483/492] Building CXX object src/sound/ymfm/CMakeFiles/ymfm.dir/ymfm_opl.cpp.obj
-[484/492] Linking CXX static library src\sound\ymfm\libymfm.a
-[485/492] Building C object src/video/CMakeFiles/voodoo.dir/vid_voodoo_render.c.obj
-[486/492] Building C object src/video/CMakeFiles/vid.dir/vid_s3.c.obj
-[487/492] Building C object src/win/CMakeFiles/ui.dir/win_media_menu.c.obj
-[488/492] Building C object src/win/CMakeFiles/ui.dir/win_opengl.c.obj
-[489/492] Building C object src/win/CMakeFiles/ui.dir/win_settings.c.obj
-[490/492] Building C object src/cpu/CMakeFiles/cpu.dir/386_dynarec_ops.c.obj
-[491/492] Building C object src/cpu/CMakeFiles/cpu.dir/386_dynarec.c.obj
-[492/492] Linking CXX executable src\86Box.exe

From 06a7e00af4b53eae996a14ba44d9b8448dd1f552 Mon Sep 17 00:00:00 2001
From: OBattler <oubattler@gmail.com>
Date: Fri, 30 Dec 2022 04:29:56 +0100
Subject: [PATCH 09/25] Fix video output via VNC.

---
 src/vnc.c | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/src/vnc.c b/src/vnc.c
index 3bffdcd9d..ef2ac7639 100644
--- a/src/vnc.c
+++ b/src/vnc.c
@@ -160,20 +160,15 @@ vnc_display(rfbClientPtr cl)
 static void
 vnc_blit(int x, int y, int w, int h, int monitor_index)
 {
-    uint32_t *p;
-    int       yy;
+    int       row;
 
     if (monitor_index || (x < 0) || (y < 0) || (w <= 0) || (h <= 0) || (w > 2048) || (h > 2048) || (buffer32 == NULL)) {
         video_blit_complete_monitor(monitor_index);
         return;
     }
 
-    for (yy = 0; yy < h; yy++) {
-        p = (uint32_t *) &(((uint32_t *) rfb->frameBuffer)[yy * VNC_MAX_X]);
-
-        if ((y + yy) >= 0 && (y + yy) < VNC_MAX_Y)
-            video_copy(p, &(buffer32->line[yy]), w * sizeof(uint32_t));
-    }
+    for (row = 0; row < h; ++row)
+        video_copy(&(((uint8_t *) rfb->frameBuffer)[row * 2048 * sizeof(uint32_t)]), &(buffer32->line[y + row][x]), w * sizeof(uint32_t));
 
     if (screenshots)
         video_screenshot((uint32_t *) rfb->frameBuffer, 0, 0, VNC_MAX_X);

From 06d4ae5595a9cd36a8610d43e363bfaec5929a7c Mon Sep 17 00:00:00 2001
From: OBattler <oubattler@gmail.com>
Date: Fri, 30 Dec 2022 06:05:57 +0100
Subject: [PATCH 10/25] Fixed VNC mouse, but the correct scale factor for X and
 Y has to be figured out.

---
 src/device/mouse.c        | 12 ++++++-
 src/include/86box/mouse.h |  1 +
 src/vnc.c                 | 72 ++++++++++++++++++++++++++-------------
 3 files changed, 61 insertions(+), 24 deletions(-)

diff --git a/src/device/mouse.c b/src/device/mouse.c
index 422161a83..f628d1efa 100644
--- a/src/device/mouse.c
+++ b/src/device/mouse.c
@@ -88,6 +88,7 @@ static const device_t *mouse_curr;
 static void           *mouse_priv;
 static int             mouse_nbut;
 static int (*mouse_dev_poll)(int x, int y, int z, int b, void *priv);
+static void (*mouse_poll_ex)(void) = NULL;
 
 #ifdef ENABLE_MOUSE_LOG
 int mouse_do_log = ENABLE_MOUSE_LOG;
@@ -164,13 +165,22 @@ mouse_set_buttons(int buttons)
     mouse_nbut = buttons;
 }
 
+void
+mouse_set_poll_ex(void (*poll_ex)(void))
+{
+    mouse_poll_ex = poll_ex;
+}
+
 void
 mouse_process(void)
 {
     if (mouse_curr == NULL)
         return;
 
-    mouse_poll();
+    if (mouse_poll_ex)
+        mouse_poll_ex();
+    else
+        mouse_poll();
 
     if ((mouse_dev_poll != NULL) || (mouse_curr->poll != NULL)) {
         if (mouse_curr->poll != NULL)
diff --git a/src/include/86box/mouse.h b/src/include/86box/mouse.h
index 434360589..aa046b81c 100644
--- a/src/include/86box/mouse.h
+++ b/src/include/86box/mouse.h
@@ -65,6 +65,7 @@ extern void mouse_init(void);
 extern void mouse_close(void);
 extern void mouse_reset(void);
 extern void mouse_set_buttons(int buttons);
+extern void mouse_set_poll_ex(void (*poll_ex)(void));
 extern void mouse_process(void);
 extern void mouse_set_poll(int (*f)(int, int, int, int, void *), void *);
 extern void mouse_poll(void);
diff --git a/src/vnc.c b/src/vnc.c
index ef2ac7639..ef388939a 100644
--- a/src/vnc.c
+++ b/src/vnc.c
@@ -44,6 +44,15 @@ static int              allowedX,
     allowedY;
 static int ptr_x, ptr_y, ptr_but;
 
+typedef struct {
+    int buttons;
+    int dx;
+    int dy;
+    int dwheel;
+} MOUSESTATE;
+
+static MOUSESTATE ms;
+
 #ifdef ENABLE_VNC_LOG
 int vnc_do_log = ENABLE_VNC_LOG;
 
@@ -71,29 +80,43 @@ vnc_kbdevent(rfbBool down, rfbKeySym k, rfbClientPtr cl)
     vnc_kbinput(down ? 1 : 0, (int) k);
 }
 
+void
+vnc_mouse_poll(void)
+{
+    static int b = 0;
+    if (ms.dx != 0 || ms.dy != 0) {
+        mouse_x += ms.dx;
+        mouse_y += ms.dy;
+
+        ms.dx     = 0;
+        ms.dy     = 0;
+
+        // pclog("dx=%d, dy=%d, dwheel=%d\n", mouse_x, mouse_y, mouse_z);
+    }
+
+    if (b != ms.buttons) {
+        mouse_buttons = ms.buttons;
+        b             = ms.buttons;
+    }
+}
+
 static void
 vnc_ptrevent(int but, int x, int y, rfbClientPtr cl)
 {
-    if (x >= 0 && x < allowedX && y >= 0 && y < allowedY) {
-        /* VNC uses absolute positions within the window, no deltas. */
-        if (x != ptr_x || y != ptr_y) {
-            mouse_x += (x - ptr_x) / 100;
-            mouse_y += (y - ptr_y) / 100;
-            ptr_x = x;
-            ptr_y = y;
-        }
+    ms.buttons = 0;
+    if (but & 0x01)
+        ms.buttons |= 0x01;
+    if (but & 0x02)
+        ms.buttons |= 0x04;
+    if (but & 0x04)
+        ms.buttons |= 0x02;
+    ptr_but = but;
 
-        if (but != ptr_but) {
-            mouse_buttons = 0;
-            if (but & 0x01)
-                mouse_buttons |= 0x01;
-            if (but & 0x02)
-                mouse_buttons |= 0x04;
-            if (but & 0x04)
-                mouse_buttons |= 0x02;
-            ptr_but = but;
-        }
-    }
+    /* VNC uses absolute positions within the window, no deltas. */
+    ms.dx += (x - ptr_x) / 0.96; /* TODO: Figure out the correct scale factor for X and Y. */
+    ms.dy += (y - ptr_y) / 0.96;
+    ptr_x = x;
+    ptr_y = y;
 
     rfbDefaultPtrAddEvent(but, x, y, cl);
 }
@@ -110,7 +133,8 @@ vnc_clientgone(rfbClientPtr cl)
         vnc_log("VNC: no clients, pausing..\n");
 
         /* Disable the mouse. */
-        plat_mouse_capture(0);
+        // plat_mouse_capture(0);
+        mouse_set_poll_ex(NULL);
 
         plat_pause(1);
     }
@@ -129,12 +153,14 @@ vnc_newclient(rfbClientPtr cl)
         ptr_y   = allowedY / 2;
         mouse_x = mouse_y = mouse_z = 0;
         mouse_buttons               = 0x00;
+        memset(&ms, 0, sizeof(MOUSESTATE));
 
         /* We now have clients, un-pause the emulator if needed. */
         vnc_log("VNC: unpausing..\n");
 
         /* Enable the mouse. */
-        plat_mouse_capture(1);
+        // plat_mouse_capture(1);
+        mouse_set_poll_ex(vnc_mouse_poll);
 
         plat_pause(0);
     }
@@ -162,7 +188,7 @@ vnc_blit(int x, int y, int w, int h, int monitor_index)
 {
     int       row;
 
-    if (monitor_index || (x < 0) || (y < 0) || (w <= 0) || (h <= 0) || (w > 2048) || (h > 2048) || (buffer32 == NULL)) {
+    if (monitor_index || (x < 0) || (y < 0) || (w < VNC_MIN_X) || (h < VNC_MIN_Y) || (w > VNC_MAX_X) || (h > VNC_MAX_Y) || (buffer32 == NULL)) {
         video_blit_complete_monitor(monitor_index);
         return;
     }
@@ -260,7 +286,7 @@ vnc_resize(int x, int y)
         return;
 
     /* TightVNC doesn't like certain sizes.. */
-    if (x < VNC_MIN_X || x > VNC_MAX_X || y < VNC_MIN_Y || y > VNC_MAX_Y) {
+    if ((x < VNC_MIN_X) || (x > VNC_MAX_X) || (y < VNC_MIN_Y) || (y > VNC_MAX_Y)) {
         vnc_log("VNC: invalid resoltion %dx%d requested!\n", x, y);
         return;
     }

From b73c442af0c8f2996a4840a18450bff994cc97a8 Mon Sep 17 00:00:00 2001
From: FreeFull <jazz2rulez@gmail.com>
Date: Fri, 30 Dec 2022 23:32:57 +0000
Subject: [PATCH 11/25] Fix keyboard input for British keyboard layout

Before this change, the `\|` key would be treated the same as the `/?` on a UK keyboard layout. With this change, it should behave properly, assuming the guest is also set to use a UK keyboard.
---
 src/qt/qt_mainwindow.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/qt/qt_mainwindow.cpp b/src/qt/qt_mainwindow.cpp
index d707fc7ea..c87348663 100644
--- a/src/qt/qt_mainwindow.cpp
+++ b/src/qt/qt_mainwindow.cpp
@@ -1070,7 +1070,7 @@ std::array<uint32_t, 256> x11_to_xt_2 {
     0x53,
     0x138,
     0x55,
-    0x35,
+    0x56,
     0x57,
     0x58,
     0x56,

From 9d09a206b4a925660a48af807ea0525f8fe392a2 Mon Sep 17 00:00:00 2001
From: Jasmine Iwanek <jasmine@iwanek.co.uk>
Date: Sat, 31 Dec 2022 14:06:01 -0500
Subject: [PATCH 12/25] Update version of ninja used for github actions

---
 .github/workflows/cmake.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
index c03b6b2b4..c1758ee50 100644
--- a/.github/workflows/cmake.yml
+++ b/.github/workflows/cmake.yml
@@ -168,7 +168,7 @@ jobs:
         run: echo "C:/Program Files/LLVM/bin" >> $env:GITHUB_PATH
       - name: Download Ninja
         run: >
-          Invoke-WebRequest https://github.com/ninja-build/ninja/releases/download/v1.10.2/ninja-win.zip -OutFile ninja-win.zip && 
+          Invoke-WebRequest https://github.com/ninja-build/ninja/releases/download/v1.11.1/ninja-win.zip -OutFile ninja-win.zip && 
           Expand-Archive ninja-win.zip -DestinationPath .
       - name: Setup NuGet Credentials
         run: >

From 4112d1b0c23b85b6579db5716e1c913b79c7a76c Mon Sep 17 00:00:00 2001
From: Jasmine Iwanek <jasmine@iwanek.co.uk>
Date: Sat, 31 Dec 2022 17:56:51 -0500
Subject: [PATCH 13/25] Add missing libvncserver dependencies

---
 .github/workflows/cmake.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
index c1758ee50..1c1a58e32 100644
--- a/.github/workflows/cmake.yml
+++ b/.github/workflows/cmake.yml
@@ -246,6 +246,7 @@ jobs:
           qtbase5-dev
           qttools5-dev
           libopenal-dev
+          libvncserver-dev
       - uses: actions/checkout@v3
       - name: Configure CMake
         run: >-
@@ -296,6 +297,7 @@ jobs:
           rtmidi
           qt@5
           openal-soft
+          libvncserver
       - uses: actions/checkout@v3
       - name: Configure CMake
         run: >-

From 3d5d37804e9ae105cc310a90567388e990ddf225 Mon Sep 17 00:00:00 2001
From: Dylan Morrison <dizzy@domad.science>
Date: Sat, 31 Dec 2022 21:50:40 -0500
Subject: [PATCH 14/25] Added support for bumpversion to bump version/date info
 for Debian changelog.

---
 bumpversion.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/bumpversion.sh b/bumpversion.sh
index ac6116bcc..ce3b7c4c8 100644
--- a/bumpversion.sh
+++ b/bumpversion.sh
@@ -73,3 +73,5 @@ patch_file src/unix/assets/*.spec '%global romver' 's/(^%global\ romver\s+)[0-9]
 patch_file src/unix/assets/*.spec 'changelog version' 's/(^[*]\s.*>\s+)[0-9].+/\1'"$newversion"-1'/'
 patch_file src/unix/assets/*.spec 'changelog date' 's/(^[*]\s)[a-zA-Z]{3}\s[a-zA-Z]{3}\s[0-9]{2}\s[0-9]{4}/\1'"$(pretty_date)"'/'
 patch_file src/unix/assets/*.metainfo.xml release 's/(<release version=")[^"]+(" date=")[^"]+/\1'"$newversion"'\2'"$(date +%Y-%m-%d)"'/'
+patch_file debian/changelog 'changelog date' 's/>  .+/>  '"$(date -R)"'/'
+patch_file debian/changelog 'changelog version' 's/86box \(.+\)/86box \('"$newversion"'\)/'

From 1e26ee7cdd447a85452f4d240e760067648a944e Mon Sep 17 00:00:00 2001
From: Jasmine Iwanek <jasmine@iwanek.co.uk>
Date: Sun, 1 Jan 2023 17:32:01 -0500
Subject: [PATCH 15/25] Add CodeQL checking

---
 .github/workflows/codeql.yml | 51 ++++++++++++++++++++++++++++++++++++
 1 file changed, 51 insertions(+)
 create mode 100644 .github/workflows/codeql.yml

diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
new file mode 100644
index 000000000..2cc36c6a6
--- /dev/null
+++ b/.github/workflows/codeql.yml
@@ -0,0 +1,51 @@
+name: "CodeQL"
+
+on: [ push, pull_request]
+
+jobs:
+  analyze:
+    name: Analyze
+
+    runs-on: ubuntu-latest
+
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ 'cpp' ]
+
+    steps:
+      - name: Install dependencies
+        run: >-
+          sudo apt update && sudo apt install
+          build-essential
+          ninja-build
+          libfreetype-dev
+          libsdl2-dev
+          libpng-dev
+          libc6-dev
+          librtmidi-dev
+          qtbase5-dev
+          qttools5-dev
+          libopenal-dev
+          libvncserver-dev
+
+      - name: Checkout repository
+        uses: actions/checkout@v3
+
+      - name: Initialize CodeQL
+        uses: github/codeql-action/init@v2
+        with:
+          languages: ${{ matrix.language }}
+
+      - name: Autobuild
+        uses: github/codeql-action/autobuild@v2
+
+      - name: Perform CodeQL Analysis
+        uses: github/codeql-action/analyze@v2
+        with:
+          category: "/language:${{matrix.language}}"

From 3738a83980981439e9fafa08f07f7b6cbf1eb265 Mon Sep 17 00:00:00 2001
From: Jasmine Iwanek <jasmine@iwanek.co.uk>
Date: Tue, 3 Jan 2023 16:01:45 -0500
Subject: [PATCH 16/25] Add Slot1 to Socket 8 slotket

One such example is the ASUS C-P6S1
---
 src/cpu/cpu.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/cpu/cpu.c b/src/cpu/cpu.c
index 4d1abcd05..380da450e 100644
--- a/src/cpu/cpu.c
+++ b/src/cpu/cpu.c
@@ -235,7 +235,7 @@ cpu_is_eligible(const cpu_family_t *cpu_family, int cpu, int machine)
     if (packages & CPU_PKG_SOCKET3)
         packages |= CPU_PKG_SOCKET1;
     else if (packages & CPU_PKG_SLOT1)
-        packages |= CPU_PKG_SOCKET370;
+        packages |= CPU_PKG_SOCKET370 | CPU_PKG_SOCKET8;
 
     /* Package type. */
     if (!(cpu_family->package & packages))

From 6291ae01a3b81b74aebbd67aa9cf27f3dd2ea62b Mon Sep 17 00:00:00 2001
From: Jasmine Iwanek <jasmine@iwanek.co.uk>
Date: Tue, 3 Jan 2023 18:15:20 -0500
Subject: [PATCH 17/25] Even more missed formatting

---
 src/cpu/x87_ops_arith.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/cpu/x87_ops_arith.h b/src/cpu/x87_ops_arith.h
index e2dbbdb8f..d38d584a8 100644
--- a/src/cpu/x87_ops_arith.h
+++ b/src/cpu/x87_ops_arith.h
@@ -130,7 +130,7 @@ opFPU(s, x87_ts, 16, t.i, geteal, t.s, _32)
 #ifndef FPU_8087
     opFPU(s, x87_ts, 32, t.i, geteal, t.s, _32)
 #endif
-    opFPU(d, x87_td, 16, t.i, geteaq, t.d, _64)
+opFPU(d, x87_td, 16, t.i, geteaq, t.d, _64)
 #ifndef FPU_8087
     opFPU(d, x87_td, 32, t.i, geteaq, t.d, _64)
 #endif
@@ -139,7 +139,7 @@ opFPU(iw, uint16_t, 16, t, geteaw, (double) (int16_t) t, _i16)
 #ifndef FPU_8087
     opFPU(iw, uint16_t, 32, t, geteaw, (double) (int16_t) t, _i16)
 #endif
-    opFPU(il, uint32_t, 16, t, geteal, (double) (int32_t) t, _i32)
+opFPU(il, uint32_t, 16, t, geteal, (double) (int32_t) t, _i32)
 #ifndef FPU_8087
     opFPU(il, uint32_t, 32, t, geteal, (double) (int32_t) t, _i32)
 #endif

From 6c3680f268b01176619951c23f45ffc9343e150f Mon Sep 17 00:00:00 2001
From: Jasmine Iwanek <jasmine@iwanek.co.uk>
Date: Tue, 3 Jan 2023 19:22:34 -0500
Subject: [PATCH 18/25] Create dependabot.yml

---
 .github/dependabot.yml | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 .github/dependabot.yml

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
new file mode 100644
index 000000000..0d9f70d96
--- /dev/null
+++ b/.github/dependabot.yml
@@ -0,0 +1,9 @@
+version: 2
+
+updates:
+
+  # Maintain dependencies for GitHub Actions
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"

From 9f8bada8763fe4843cc7934979e93a646004580f Mon Sep 17 00:00:00 2001
From: Jasmine Iwanek <jasmine@iwanek.co.uk>
Date: Tue, 3 Jan 2023 23:38:02 -0500
Subject: [PATCH 19/25] Use pacboy in mingw makefile builds too

---
 .github/workflows/c-cpp.yml | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml
index 8899d9943..282bfc602 100644
--- a/.github/workflows/c-cpp.yml
+++ b/.github/workflows/c-cpp.yml
@@ -62,15 +62,16 @@ jobs:
           msystem: ${{ matrix.environment.msystem }}
           install: >-
             make
-            ${{ matrix.environment.prefix }}-gcc
-            ${{ matrix.environment.prefix }}-pkg-config
-            ${{ matrix.environment.prefix }}-freetype
-            ${{ matrix.environment.prefix }}-SDL2
-            ${{ matrix.environment.prefix }}-zlib
-            ${{ matrix.environment.prefix }}-libpng
-            ${{ matrix.environment.prefix }}-openal
-            ${{ matrix.environment.prefix }}-rtmidi
-            ${{ matrix.environment.prefix }}-libvncserver
+          pacboy: >-
+            gcc:p
+            pkg-config:p
+            freetype:p
+            SDL2:p
+            zlib:p
+            libpng:p
+            openal:p
+            rtmidi:p
+            libvncserver:p
       - uses: actions/checkout@v3
       - name: make
         run: >-

From 7ac62e1ff87a21e0ffea824b417803f3b8ed44f2 Mon Sep 17 00:00:00 2001
From: Jasmine Iwanek <jasmine@iwanek.co.uk>
Date: Tue, 3 Jan 2023 23:38:53 -0500
Subject: [PATCH 20/25] Preparations for alternate UI builds in GHA

---
 .github/workflows/cmake.yml | 26 +++++++++++++++++++-------
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
index 1c1a58e32..24edc4073 100644
--- a/.github/workflows/cmake.yml
+++ b/.github/workflows/cmake.yml
@@ -210,7 +210,7 @@ jobs:
           path: build/artifacts/**
 
   linux:
-    name: "Linux GCC 11 (Qt GUI, ${{ matrix.build.name }}, ${{ matrix.dynarec.name }}, x86_64)"
+    name: "Linux GCC 11 (${{ matrix.ui.name }}, ${{ matrix.build.name }}, ${{ matrix.dynarec.name }}, x86_64)"
 
     runs-on: ubuntu-22.04
 
@@ -231,6 +231,13 @@ jobs:
           - name: NDR
             new: on
             slug: -NDR
+        ui:
+          - name: Qt GUI
+            qt: on
+            slug: -Qt
+            packages: >-
+              qtbase5-dev
+              qttools5-dev
 
     steps:
       - name: Install dependencies
@@ -243,10 +250,9 @@ jobs:
           libpng-dev
           libc6-dev
           librtmidi-dev
-          qtbase5-dev
-          qttools5-dev
           libopenal-dev
           libvncserver-dev
+          ${{ matrix.ui.packages }}
       - uses: actions/checkout@v3
       - name: Configure CMake
         run: >-
@@ -260,11 +266,11 @@ jobs:
         run: cmake --install build
       - uses: actions/upload-artifact@v3
         with:
-          name: '86Box-Qt${{ matrix.dynarec.slug }}${{ matrix.build.slug }}-UbuntuJammy-x86_64-gha${{ github.run_number }}'
+          name: '86Box-{{ matrix.ui.slug }}${{ matrix.dynarec.slug }}${{ matrix.build.slug }}-UbuntuJammy-x86_64-gha${{ github.run_number }}'
           path: build/artifacts/**
 
   macos11:
-    name: "macOS 11 (Qt GUI, ${{ matrix.build.name }}, ${{ matrix.dynarec.name }}, x86_64)"
+    name: "macOS 11 (${{ matrix.ui.name }}, ${{ matrix.build.name }}, ${{ matrix.dynarec.name }}, x86_64)"
 
     runs-on: macos-11
 
@@ -285,6 +291,12 @@ jobs:
           - name: NDR
             new: on
             slug: -NDR
+        ui:
+          - name: Qt GUI
+            qt: on
+            slug: -Qt
+            packages: >-
+              qt@5
 
     steps:
       - name: Install dependencies
@@ -295,9 +307,9 @@ jobs:
           sdl2
           libpng
           rtmidi
-          qt@5
           openal-soft
           libvncserver
+          ${{ matrix.ui.packages }}
       - uses: actions/checkout@v3
       - name: Configure CMake
         run: >-
@@ -314,5 +326,5 @@ jobs:
         run: cmake --install build
       - uses: actions/upload-artifact@v3
         with:
-          name: '86Box-Qt${{ matrix.dynarec.slug }}${{ matrix.build.slug }}-macOS-x86_64-gha${{ github.run_number }}'
+          name: '86Box-{{ matrix.ui.slug }}${{ matrix.dynarec.slug }}${{ matrix.build.slug }}-macOS-x86_64-gha${{ github.run_number }}'
           path: build/artifacts/**

From 0966e4bab0865209bea00acea335825dc60a43f0 Mon Sep 17 00:00:00 2001
From: Jasmine Iwanek <jasmine@iwanek.co.uk>
Date: Tue, 3 Jan 2023 23:39:09 -0500
Subject: [PATCH 21/25] Use pkgconf, not pkg-config, fixes a warning

---
 .github/workflows/cmake.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
index 24edc4073..e8fca5dd3 100644
--- a/.github/workflows/cmake.yml
+++ b/.github/workflows/cmake.yml
@@ -82,7 +82,7 @@ jobs:
             ninja:p
             cmake:p
             gcc:p
-            pkg-config:p
+            pkgconf:p
             freetype:p
             SDL2:p
             zlib:p

From 62817b55c99511e9d44dc0dfb7a263cd0896c6db Mon Sep 17 00:00:00 2001
From: Jasmine Iwanek <jasmine@iwanek.co.uk>
Date: Tue, 3 Jan 2023 23:39:30 -0500
Subject: [PATCH 22/25] release: false should speed up the msys2 builds a
 little

---
 .github/workflows/c-cpp.yml | 1 +
 .github/workflows/cmake.yml | 1 +
 2 files changed, 2 insertions(+)

diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml
index 282bfc602..5b2573dde 100644
--- a/.github/workflows/c-cpp.yml
+++ b/.github/workflows/c-cpp.yml
@@ -58,6 +58,7 @@ jobs:
       - name: Prepare MSYS2 environment
         uses: msys2/setup-msys2@v2
         with:
+          release: false
           update: true
           msystem: ${{ matrix.environment.msystem }}
           install: >-
diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
index e8fca5dd3..58f537d21 100644
--- a/.github/workflows/cmake.yml
+++ b/.github/workflows/cmake.yml
@@ -76,6 +76,7 @@ jobs:
       - name: Prepare MSYS2 environment
         uses: msys2/setup-msys2@v2
         with:
+          release: false
           update: true
           msystem: ${{ matrix.environment.msystem }}
           pacboy: >-

From d6b118a4fc89a6c5aa8be351dae0db8527f85335 Mon Sep 17 00:00:00 2001
From: Jasmine Iwanek <jasmine@iwanek.co.uk>
Date: Wed, 4 Jan 2023 00:26:07 -0500
Subject: [PATCH 23/25] Fix another warning

---
 src/discord.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/discord.c b/src/discord.c
index 55f6d1544..458688eaa 100644
--- a/src/discord.c
+++ b/src/discord.c
@@ -88,7 +88,7 @@ discord_update_activity(int paused)
         *(paren - 1) = '\0';
 
 #pragma GCC diagnostic push
-#if defined(__GNUC__)
+#if defined(__GNUC__) && !defined (__clang__)
 #    pragma GCC diagnostic ignored "-Wformat-truncation"
 #endif
     if (strlen(vm_name) < 100) {

From 48961b00a4046b9d90daca5394e00ffbfd3d2ff6 Mon Sep 17 00:00:00 2001
From: Jasmine Iwanek <jasmine@iwanek.co.uk>
Date: Wed, 4 Jan 2023 06:25:33 -0500
Subject: [PATCH 24/25] Missed bits

---
 .github/workflows/cmake.yml | 6 ++++--
 src/include/86box/device.h  | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
index 58f537d21..4596b51b8 100644
--- a/.github/workflows/cmake.yml
+++ b/.github/workflows/cmake.yml
@@ -261,13 +261,14 @@ jobs:
           --toolchain ./cmake/flags-gcc-x86_64.cmake
           -D NEW_DYNAREC=${{ matrix.dynarec.new }}
           -D CMAKE_INSTALL_PREFIX=./build/artifacts
+          -D QT=${{ matrix.ui.qt }}
       - name: Build
         run: cmake --build build
       - name: Generate package
         run: cmake --install build
       - uses: actions/upload-artifact@v3
         with:
-          name: '86Box-{{ matrix.ui.slug }}${{ matrix.dynarec.slug }}${{ matrix.build.slug }}-UbuntuJammy-x86_64-gha${{ github.run_number }}'
+          name: '86Box${{ matrix.ui.slug }}${{ matrix.dynarec.slug }}${{ matrix.build.slug }}-UbuntuJammy-x86_64-gha${{ github.run_number }}'
           path: build/artifacts/**
 
   macos11:
@@ -318,6 +319,7 @@ jobs:
           --toolchain ./cmake/flags-gcc-x86_64.cmake
           -D NEW_DYNAREC=${{ matrix.dynarec.new }}
           -D CMAKE_INSTALL_PREFIX=./build/artifacts
+          -D QT=${{ matrix.ui.qt }}
           -D Qt5_ROOT=$(brew --prefix qt@5)
           -D Qt5LinguistTools_ROOT=$(brew --prefix qt@5)
           -D OpenAL_ROOT=$(brew --prefix openal-soft)
@@ -327,5 +329,5 @@ jobs:
         run: cmake --install build
       - uses: actions/upload-artifact@v3
         with:
-          name: '86Box-{{ matrix.ui.slug }}${{ matrix.dynarec.slug }}${{ matrix.build.slug }}-macOS-x86_64-gha${{ github.run_number }}'
+          name: '86Box${{ matrix.ui.slug }}${{ matrix.dynarec.slug }}${{ matrix.build.slug }}-macOS-x86_64-gha${{ github.run_number }}'
           path: build/artifacts/**
diff --git a/src/include/86box/device.h b/src/include/86box/device.h
index ca4e6bdf2..9f0a5f864 100644
--- a/src/include/86box/device.h
+++ b/src/include/86box/device.h
@@ -108,7 +108,7 @@ typedef struct {
     const char                     *file_filter;
     const device_config_spinner_t   spinner;
     const device_config_selection_t selection[16];
-    const device_config_bios_t     bios[32];
+    const device_config_bios_t      bios[32];
 } device_config_t;
 
 typedef struct _device_ {

From 95cf08611c0148c1ef8b6fb98ec811b267252952 Mon Sep 17 00:00:00 2001
From: OBattler <oubattler@gmail.com>
Date: Thu, 5 Jan 2023 02:25:21 +0100
Subject: [PATCH 25/25] SCAT machines with PS/2 keyboard controller now
 actually have a PS/2 keyboard controller, fixes #3013.

---
 src/machine/m_at_286_386sx.c | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/machine/m_at_286_386sx.c b/src/machine/m_at_286_386sx.c
index 7cfec3735..ee117fa33 100644
--- a/src/machine/m_at_286_386sx.c
+++ b/src/machine/m_at_286_386sx.c
@@ -259,10 +259,17 @@ machine_at_scat_init(const machine_t *model, int is_v4, int is_ami)
 {
     machine_at_common_init(model);
 
-    if (is_ami)
-        device_add(&keyboard_at_ami_device);
-    else
-        device_add(&keyboard_at_device);
+    if (machines[machine].bus_flags & MACHINE_BUS_PS2) {
+        if (is_ami)
+            device_add(&keyboard_ps2_ami_device);
+        else
+            device_add(&keyboard_ps2_device);
+    } else {
+        if (is_ami)
+            device_add(&keyboard_at_ami_device);
+        else
+            device_add(&keyboard_at_device);
+    }
 
     if (is_v4)
         device_add(&scat_4_device);