Big bang winuae merge

CMakeLists.txt

@@ -78,6 +78,7 @@ add_executable(${PROJECT_NAME}
         src/blkdev_cdimage.cpp
         src/bsdsocket.cpp
         src/calc.cpp
+        src/catweasel.cpp
         src/cd32_fmv.cpp
         src/cd32_fmv_genlock.cpp
         src/cdrom.cpp
@@ -110,10 +111,12 @@ add_executable(${PROJECT_NAME}
         src/flashrom.cpp
         src/fpp.cpp
         src/fpp_native.cpp
+        src/framebufferboards.cpp
         src/fsdb.cpp
         src/fsusage.cpp
         src/gayle.cpp
         src/gfxboard.cpp
+        src/gfxlib.cpp
         src/gfxutil.cpp
         src/hardfile.cpp
         src/hrtmon.rom.cpp
@@ -125,21 +128,26 @@ add_executable(${PROJECT_NAME}
         src/inputrecord.cpp
         src/isofs.cpp
         src/keybuf.cpp
+        src/luascript.cpp
         src/main.cpp
         src/memory.cpp
         src/midiemu.cpp
         src/native2amiga.cpp
         src/ncr9x_scsi.cpp
         src/ncr_scsi.cpp
         src/parser.cpp
+        src/pci.cpp
         src/rommgr.cpp
         src/rtc.cpp
         src/sampler.cpp
+        src/sana2.cpp
         src/savestate.cpp
         src/scp.cpp
         src/scsi.cpp
         src/scsiemul.cpp
         src/scsitape.cpp
+        src/slirp_uae.cpp
+        src/sndboard.cpp
         src/specialmonitors.cpp
         src/statusline.cpp
         src/tabletlibrary.cpp
@@ -152,6 +160,7 @@ add_executable(${PROJECT_NAME}
         src/uaeresource.cpp
         src/uaeserial.cpp
         src/vm.cpp
+        src/x86.cpp
         src/zfile.cpp
         src/zfile_archive.cpp
         src/archivers/7z/7zAlloc.c
@@ -246,7 +255,11 @@ add_executable(${PROJECT_NAME}
         src/archivers/wrp/warp.cpp
         src/archivers/zip/unzip.cpp
         src/caps/caps_amiberry.cpp
+        src/dsp3210/dsp_glue.cpp
+        src/dsp3210/DSP3210_emulation.cpp
         src/machdep/support.cpp
+        src/mame/a2410.cpp
+        src/mame/tm34010/tms34010.cpp
         external/floppybridge/src/floppybridge_lib.cpp
         src/osdep/ahi_v1.cpp
         src/osdep/bsdsocket_host.cpp
@@ -276,6 +289,72 @@ add_executable(${PROJECT_NAME}
         src/osdep/socket.cpp
         src/osdep/retroarch.cpp
         src/osdep/vpar.cpp
+        src/pcem/386.cpp
+        src/pcem/386_common.cpp
+        src/pcem/386_dynarec.cpp
+        src/pcem/808x.cpp
+        src/pcem/cpu.cpp
+        src/pcem/dosbox/dbopl.cpp
+        src/pcem/dma.cpp
+        src/pcem/keyboard.cpp
+        src/pcem/keyboard_at.cpp
+        src/pcem/keyboard_at_draco.cpp
+        src/pcem/mem.cpp
+        src/pcem/mouse_ps2.cpp
+        src/pcem/mouse_serial.cpp
+        src/pcem/dosbox/nukedopl.cpp
+        src/pcem/nvr.cpp
+        src/pcem/pcemglue.cpp
+        src/pcem/pcemrtc.cpp
+        src/pcem/pic.cpp
+        src/pcem/pit.cpp
+        src/pcem/serial.cpp
+        src/pcem/sound_cms.cpp
+        src/pcem/sound_dbopl.cpp
+        src/pcem/sound_mpu401_uart.cpp
+        src/pcem/sound_opl.cpp
+        src/pcem/sound_sb.cpp
+        src/pcem/sound_sb_dsp.cpp
+        src/pcem/sound_speaker.cpp
+        src/pcem/timer.cpp
+        src/pcem/vid_bt482_ramdac.cpp
+        src/pcem/vid_cl5429.cpp
+        src/pcem/vid_et4000.cpp
+        src/pcem/vid_et4000w32.cpp
+        src/pcem/vid_inmos.cpp
+        src/pcem/vid_ncr.cpp
+        src/pcem/vid_permedia2.cpp
+        src/pcem/vid_s3.cpp
+        src/pcem/vid_s3_virge.cpp
+        src/pcem/vid_sc1502x_ramdac.cpp
+        src/pcem/vid_sdac_ramdac.cpp
+        src/pcem/vid_svga.cpp
+        src/pcem/vid_svga_render.cpp
+        src/pcem/vid_voodoo.cpp
+        src/pcem/vid_voodoo_banshee.cpp
+        src/pcem/vid_voodoo_banshee_blitter.cpp
+        src/pcem/vid_voodoo_blitter.cpp
+        src/pcem/vid_voodoo_display.cpp
+        src/pcem/vid_voodoo_fb.cpp
+        src/pcem/vid_voodoo_fifo.cpp
+        src/pcem/vid_voodoo_reg.cpp
+        src/pcem/vid_voodoo_render.cpp
+        src/pcem/vid_voodoo_setup.cpp
+        src/pcem/vid_voodoo_texture.cpp
+        src/pcem/x86seg.cpp
+        src/pcem/x87.cpp
+        src/pcem/x87_timings.cpp
+        src/ppc/ppc.cpp
+        src/ppc/ppcd.cpp
+        src/qemuvga/cirrus_vga.cpp
+        src/qemuvga/es1370.cpp
+        src/qemuvga/esp.cpp
+        src/qemuvga/lsi53c710.cpp
+        src/qemuvga/lsi53c895a.cpp
+        src/qemuvga/ne2000.cpp
+        src/qemuvga/qemu.cpp
+        src/qemuvga/qemuuaeglue.cpp
+        src/qemuvga/vga.cpp
         src/sounddep/sound.cpp
         src/threaddep/threading.cpp
         src/osdep/gui/ControllerMap.cpp
@@ -393,7 +472,7 @@ add_subdirectory(external/libguisan)
 # Add dependencies to ensure external libraries are built
 add_dependencies(${PROJECT_NAME} mt32emu floppybridge capsimage guisan)
 
-target_include_directories(${PROJECT_NAME} PRIVATE ${SDL2_INCLUDE_DIRS} src src/osdep src/include src/threaddep src/archivers external/libguisan/include external/mt32emu/src external/floppybridge/src)
+target_include_directories(${PROJECT_NAME} PRIVATE ${SDL2_INCLUDE_DIRS} src src/osdep src/include src/threaddep src/archivers src/ppc/pearpc external/libguisan/include external/mt32emu/src external/floppybridge/src)
 target_link_libraries(${PROJECT_NAME} PRIVATE SDL2 SDL2_image SDL2_ttf guisan mt32emu ${DBUS_LIBRARIES} FLAC portmidi png mpg123 mpeg2convert mpeg2 serialport z)
 target_link_options(${PROJECT_NAME} PRIVATE "LINKER:-as-needed,-no-pie")
 

Makefile

@@ -43,7 +43,7 @@ SDL_CONFIG ?= sdl2-config
 export SDL_CFLAGS := $(shell $(SDL_CONFIG) --cflags)
 export SDL_LDFLAGS := $(shell $(SDL_CONFIG) --libs)
 
-CPPFLAGS = -MD -MT $@ -MF $(@:%.o=%.d) $(SDL_CFLAGS) -Iexternal/libguisan/include -Isrc -Isrc/osdep -Isrc/threaddep -Isrc/include -Isrc/archivers -Iexternal/floppybridge/src -Iexternal/mt32emu/src -D_FILE_OFFSET_BITS=64
+CPPFLAGS = -MD -MT $@ -MF $(@:%.o=%.d) $(SDL_CFLAGS) -Iexternal/libguisan/include -Isrc -Isrc/osdep -Isrc/threaddep -Isrc/include -Isrc/archivers -Isrc/ppc/pearpc -Iexternal/floppybridge/src -Iexternal/mt32emu/src -D_FILE_OFFSET_BITS=64
 CFLAGS=-pipe -Wno-shift-overflow -Wno-narrowing -fno-pie
 
 LDFLAGS = $(SDL_LDFLAGS) -lSDL2_image -lSDL2_ttf -lserialport -lportmidi -lguisan -Lexternal/libguisan/lib -lmt32emu -Lexternal/mt32emu
@@ -420,6 +420,7 @@ OBJS = \
 	src/blkdev_cdimage.o \
 	src/bsdsocket.o \
 	src/calc.o \
+	src/catweasel.o \
 	src/cd32_fmv.o \
 	src/cd32_fmv_genlock.o \
 	src/cdrom.o \
@@ -452,10 +453,12 @@ OBJS = \
 	src/flashrom.o \
 	src/fpp.o \
 	src/fpp_native.o \
+	src/framebufferboards.o \
 	src/fsdb.o \
 	src/fsusage.o \
 	src/gayle.o \
 	src/gfxboard.o \
+	src/gfxlib.o \
 	src/gfxutil.o \
 	src/hardfile.o \
 	src/hrtmon.rom.o \
@@ -467,21 +470,26 @@ OBJS = \
 	src/inputrecord.o \
 	src/isofs.o \
 	src/keybuf.o \
+	src/luascript.o \
 	src/main.o \
 	src/memory.o \
 	src/midiemu.o \
 	src/native2amiga.o \
 	src/ncr9x_scsi.o \
 	src/ncr_scsi.o \
 	src/parser.o \
+	src/pci.o \
 	src/rommgr.o \
 	src/rtc.o \
 	src/sampler.o \
+	src/sana2.o \
 	src/savestate.o \
 	src/scp.o \
 	src/scsi.o \
 	src/scsiemul.o \
 	src/scsitape.o \
+	src/slirp_uae.o \
+	src/sndboard.o \
 	src/specialmonitors.o \
 	src/statusline.o \
 	src/tabletlibrary.o \
@@ -494,6 +502,7 @@ OBJS = \
 	src/uaeresource.o \
 	src/uaeserial.o \
 	src/vm.o \
+	src/x86.o \
 	src/zfile.o \
 	src/zfile_archive.o \
 	src/archivers/chd/avhuff.o \
@@ -549,7 +558,11 @@ OBJS = \
 	src/archivers/wrp/warp.o \
 	src/archivers/zip/unzip.o \
 	src/caps/caps_amiberry.o \
+	src/dsp3210/dsp_glue.o \
+    src/dsp3210/DSP3210_emulation.o \
 	src/machdep/support.o \
+	src/mame/a2410.o \
+	src/mame/tm34010/tms34010.o \
 	external/floppybridge/src/floppybridge_lib.o \
 	src/osdep/ahi_v1.o \
 	src/osdep/bsdsocket_host.o \
@@ -579,6 +592,72 @@ OBJS = \
 	src/osdep/socket.o \
 	src/osdep/retroarch.o \
 	src/osdep/vpar.o \
+	src/pcem/386.o \
+    src/pcem/386_common.o \
+    src/pcem/386_dynarec.o \
+    src/pcem/808x.o \
+    src/pcem/cpu.o \
+    src/pcem/dosbox/dbopl.o \
+    src/pcem/dma.o \
+    src/pcem/keyboard.o \
+    src/pcem/keyboard_at.o \
+    src/pcem/keyboard_at_draco.o \
+    src/pcem/mem.o \
+    src/pcem/mouse_ps2.o \
+    src/pcem/mouse_serial.o \
+    src/pcem/dosbox/nukedopl.o \
+    src/pcem/nvr.o \
+    src/pcem/pcemglue.o \
+    src/pcem/pcemrtc.o \
+    src/pcem/pic.o \
+    src/pcem/pit.o \
+    src/pcem/serial.o \
+    src/pcem/sound_cms.o \
+    src/pcem/sound_dbopl.o \
+    src/pcem/sound_mpu401_uart.o \
+    src/pcem/sound_opl.o \
+    src/pcem/sound_sb.o \
+    src/pcem/sound_sb_dsp.o \
+    src/pcem/sound_speaker.o \
+    src/pcem/timer.o \
+    src/pcem/vid_bt482_ramdac.o \
+    src/pcem/vid_cl5429.o \
+    src/pcem/vid_et4000.o \
+    src/pcem/vid_et4000w32.o \
+    src/pcem/vid_inmos.o \
+    src/pcem/vid_ncr.o \
+    src/pcem/vid_permedia2.o \
+    src/pcem/vid_s3.o \
+    src/pcem/vid_s3_virge.o \
+    src/pcem/vid_sc1502x_ramdac.o \
+    src/pcem/vid_sdac_ramdac.o \
+    src/pcem/vid_svga.o \
+    src/pcem/vid_svga_render.o \
+    src/pcem/vid_voodoo.o \
+    src/pcem/vid_voodoo_banshee.o \
+    src/pcem/vid_voodoo_banshee_blitter.o \
+    src/pcem/vid_voodoo_blitter.o \
+    src/pcem/vid_voodoo_display.o \
+    src/pcem/vid_voodoo_fb.o \
+    src/pcem/vid_voodoo_fifo.o \
+    src/pcem/vid_voodoo_reg.o \
+    src/pcem/vid_voodoo_render.o \
+    src/pcem/vid_voodoo_setup.o \
+    src/pcem/vid_voodoo_texture.o \
+    src/pcem/x86seg.o \
+    src/pcem/x87.o \
+    src/pcem/x87_timings.o \
+    src/ppc/ppc.o \
+    src/ppc/ppcd.o \
+    src/qemuvga/cirrus_vga.o \
+    src/qemuvga/es1370.o \
+    src/qemuvga/esp.o \
+    src/qemuvga/lsi53c710.o \
+    src/qemuvga/lsi53c895a.o \
+    src/qemuvga/ne2000.o \
+    src/qemuvga/qemu.o \
+    src/qemuvga/qemuuaeglue.o \
+    src/qemuvga/vga.o \
 	src/sounddep/sound.o \
 	src/threaddep/threading.o \
 	src/osdep/gui/ControllerMap.o \

external/libguisan/src/widgets/listbox.cpp

@@ -133,7 +133,7 @@ namespace gcn
             startRow = 0;
         }
 
-        const auto inactive_color = Color(170, 170, 170);
+        const auto inactive_color = getSelectionColor() - 0x303030;
 
         // The y coordinate where we start to draw the text is
         // simply the y coordinate multiplied with the font height.