diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 000000000..37eef816a --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,20 @@ +{ + "files.associations": { + "slirp.h": "c", + "midi_system.h": "c", + "midi.h": "c", + "snd_dbopl.h": "c", + "snd_mpu401.h": "c", + "snd_opl.h": "c", + "lzf.h": "c", + "hdd_ide_at.h": "c", + "sound.h": "c", + "snd_speaker.h": "c", + "keyboard.h": "c", + "snd_ps1.h": "c", + "snd_pssj.h": "c", + "snd_sn76489.h": "c", + "sio.h": "c", + "video.h": "c" + } +} \ No newline at end of file diff --git a/src/Makefile.mingw b/src/Makefile.mingw index 1b3d39603..868a23e30 100644 --- a/src/Makefile.mingw +++ b/src/Makefile.mingw @@ -81,14 +81,14 @@ endif ######################################################################### # Nothing should need changing from here on.. # ######################################################################### -VPATH = . CPU \ - HDD \ - SOUND \ - SOUND/munt SOUND/munt/c_interface SOUND/munt/sha1 \ - SOUND/munt/srchelper \ - SOUND/resid-fp \ - SCSI VIDEO lzf NETWORK NETWORK/slirp WIN -PLAT = WIN/ +VPATH = . cpu \ + hdd \ + sound \ + sound/munt sound/munt/c_interface sound/munt/sha1 \ + sound/munt/srchelper \ + sound/resid-fp \ + scsi video lzf network network/slirp win +PLAT = win/ ifeq ($(X64), y) CPP = g++.exe -m64 CC = gcc.exe -m64 @@ -370,48 +370,48 @@ clean: 86Box.res: 86Box.rc @echo Processing $< - @$(WINDRES) $(RFLAGS) $(EXTRAS) -i WIN/86Box.rc -o 86Box.res + @$(WINDRES) $(RFLAGS) $(EXTRAS) -i win/86Box.rc -o 86Box.res pcap_if.res: pcap_if.rc @echo Processing $< - @$(WINDRES) $(RFLAGS) -i WIN/pcap_if.rc -o pcap_if.res + @$(WINDRES) $(RFLAGS) -i win/pcap_if.rc -o pcap_if.res # Module dependencies. -acer386sx.o: ibm.h CPU/cpu.h io.h device.h model.h +acer386sx.o: ibm.h cpu/cpu.h io.h device.h model.h -ali1429.o: ibm.h CPU/cpu.h io.h mem.h device.h model.h +ali1429.o: ibm.h cpu/cpu.h io.h mem.h device.h model.h -amstrad.o: ibm.h CPU/cpu.h io.h device.h model.h keyboard.h lpt.h mouse.h +amstrad.o: ibm.h cpu/cpu.h io.h device.h model.h keyboard.h lpt.h mouse.h bugger.o: ibm.h io.h bugger.h -cdrom.o: 86box.h cdrom.h ibm.h HDD/hdd_ide_at.h piix.h SCSI/scsi.h timer.h \ - WIN/plat_iodev.h +cdrom.o: 86box.h cdrom.h ibm.h hdd/hdd_ide_at.h piix.h scsi/scsi.h timer.h \ + win/plat_iodev.h cdrom_dosbox.o: cdrom_dosbox.h cdrom_image.o: config.h cdrom_dosbox.h cdrom.h cdrom_image.h cdrom_null.h -cdrom_ioctl.o: ibm.h cdrom.h cdrom_ioctl.h SCSI/scsi.h +cdrom_ioctl.o: ibm.h cdrom.h cdrom_ioctl.h scsi/scsi.h cdrom_null.o: ibm.h cdrom.h cdrom_ioctl.h -compaq.o: ibm.h CPU/cpu.h mem.h device.h model.h +compaq.o: ibm.h cpu/cpu.h mem.h device.h model.h config.o: cdrom.h config.h device.h disc.h fdc.h fdd.h ibm.h \ - CPU/cpu.h gameport.h HDD/hdd_ide_at.h HDD/hdd.h model.h mouse.h \ - NETWORK/network.h nvr.h SCSI/scsi.h WIN/plat_joystick.h \ - WIN/plat_midi.h SOUND/snd_dbopl.h SOUND/snd_mpu401.h \ - SOUND/snd_opl.h SOUND/sound.h VIDEO/video.h WIN/win.h \ - WIN/resource.h WIN/win_language.h + cpu/cpu.h gameport.h hdd/hdd_ide_at.h hdd/hdd.h model.h mouse.h \ + network/network.h nvr.h scsi/scsi.h win/plat_joystick.h \ + win/plat_midi.h sound/snd_dbopl.h sound/snd_mpu401.h \ + sound/snd_opl.h sound/sound.h video/video.h win/win.h \ + win/resource.h win/win_language.h -device.o: ibm.h CPU/cpu.h config.h device.h model.h SOUND/sound.h +device.o: ibm.h cpu/cpu.h config.h device.h model.h sound/sound.h disc.o: ibm.h config.h disc.h disc_fdi.h disc_img.h disc_86f.h \ disc_td0.h disc_imd.h fdc.h fdd.h timer.h -disc_86f.o: LZF/lzf.h config.h dma.h disc.h disc_86f.h disc_random.h \ +disc_86f.o: lzf/lzf.h config.h dma.h disc.h disc_86f.h disc_random.h \ fdc.h fdd.h ibm.h disc_fdi.o: ibm.h disc.h disc_img.h disc_fdi.h fdc.h fdd.h fdi2raw.h \ @@ -422,67 +422,67 @@ disc_random.o: disc_random.h disc_td0.o: ibm.h disc.h disc_td0.h fdc.h fdd.h -dma.o: ibm.h CPU/x86.h mem.h io.h dma.h +dma.o: ibm.h cpu/x86.h mem.h io.h dma.h fdc.o: ibm.h disc.h dma.h fdc.h fdd.h io.h pic.h timer.h -fdc37c665.o: ibm.h disc.h fdc.h fdd.h HDD/hdd_ide_at.h io.h lpt.h serial.h \ - fdc37c665.h disc.h fdc.h fdd.h io.h HDD/hdd_ide_at.h \ +fdc37c665.o: ibm.h disc.h fdc.h fdd.h hdd/hdd_ide_at.h io.h lpt.h serial.h \ + fdc37c665.h disc.h fdc.h fdd.h io.h hdd/hdd_ide_at.h \ lpt.h serial.h fdc37c669.h -fdc37c932fr.o: ibm.h disc.h fdc.h fdd.h HDD/hdd_ide_at.h io.h lpt.h \ +fdc37c932fr.o: ibm.h disc.h fdc.h fdd.h hdd/hdd_ide_at.h io.h lpt.h \ serial.h fdc37c932fr.h fdd.o: ibm.h disc.h fdc.h fdd.h fdi2raw.o: fdi2raw.h ibm.h -gameport.o: ibm.h CPU/cpu.h device.h io.h timer.h gameport.h \ +gameport.o: ibm.h cpu/cpu.h device.h io.h timer.h gameport.h \ joystick_ch_flightstick_pro.h joystick_standard.h \ joystick_sw_pad.h joystick_tm_fcs.h plat_joystick.h -hdd.o: ibm.h CPU/cpu.h device.h HDD/hdd.h model.h HDD/hdd_esdi_at.h \ - HDD/hdd_esdi_mca.h HDD/hdd_mfm_at.h HDD/hdd_mfm_xebec.h HDD/hdd_ide_xt.h +hdd.o: ibm.h cpu/cpu.h device.h hdd/hdd.h model.h hdd/hdd_esdi_at.h \ + hdd/hdd_esdi_mca.h hdd/hdd_mfm_at.h hdd/hdd_mfm_xebec.h hdd/hdd_ide_xt.h -hdd_image.o: ibm.h HDD/hdd_ide_at.h HDD/hdd_image.h +hdd_image.o: ibm.h hdd/hdd_ide_at.h hdd/hdd_image.h hdd_esdi_at.o: ibm.h device.h hdd_image.h io.h mem.h pic.h rom.h timer.h \ - HDD/hdd_esdi_at.h + hdd/hdd_esdi_at.h -hdd_esdi_mca.o: ibm.h device.h dma.h HDD/hdd_image.h io.h mca.h mem.h \ - pic.h rom.h timer.h HDD/hdd_esdi_mca.h +hdd_esdi_mca.o: ibm.h device.h dma.h hdd/hdd_image.h io.h mca.h mem.h \ + pic.h rom.h timer.h hdd/hdd_esdi_mca.h -hdd_ide_at.o: 86box.h cdrom.h HDD/hdd_image.h ibm.h io.h pic.h timer.h \ - cdrom.h SCSI/scsi.h HDD/hdd_ide_at.h +hdd_ide_at.o: 86box.h cdrom.h hdd/hdd_image.h ibm.h io.h pic.h timer.h \ + cdrom.h scsi/scsi.h hdd/hdd_ide_at.h -hdd_ide_xt.o: ibm.h io.h mem.h rom.h device.h HDD/hdd_ide_at.h HDD/hdd_ide_xt.h +hdd_ide_xt.o: ibm.h io.h mem.h rom.h device.h hdd/hdd_ide_at.h hdd/hdd_ide_xt.h -hdd_mfm_at.o: ibm.h device.h HDD/hdd_image.h io.h pic.h timer.h HDD/hdd_mfm_at.h +hdd_mfm_at.o: ibm.h device.h hdd/hdd_image.h io.h pic.h timer.h hdd/hdd_mfm_at.h -hdd_mfm_xebec.o: ibm.h device.h dma.h HDD/hdd_image.h io.h mem.h pic.h rom.h \ - timer.h HDD/hdd_mfm_xebec.h +hdd_mfm_xebec.o: ibm.h device.h dma.h hdd/hdd_image.h io.h mem.h pic.h rom.h \ + timer.h hdd/hdd_mfm_xebec.h -headland.o: ibm.h CPU/cpu.h io.h mem.h device.h model.h +headland.o: ibm.h cpu/cpu.h io.h mem.h device.h model.h -i430fx.o: ibm.h CPU/cpu.h mem.h pci.h device.h model.h +i430fx.o: ibm.h cpu/cpu.h mem.h pci.h device.h model.h -i430hx.o: ibm.h CPU/cpu.h io.h mem.h pci.h device.h model.h +i430hx.o: ibm.h cpu/cpu.h io.h mem.h pci.h device.h model.h -i430lx.o: ibm.h CPU/cpu.h mem.h pci.h device.h model.h +i430lx.o: ibm.h cpu/cpu.h mem.h pci.h device.h model.h -i430nx.o: ibm.h CPU/cpu.h mem.h pci.h device.h model.h +i430nx.o: ibm.h cpu/cpu.h mem.h pci.h device.h model.h -i430vx.o: ibm.h CPU/cpu.h io.h mem.h pci.h device.h model.h +i430vx.o: ibm.h cpu/cpu.h io.h mem.h pci.h device.h model.h -i440fx.o: ibm.h CPU/cpu.h io.h mem.h pci.h device.h model.h +i440fx.o: ibm.h cpu/cpu.h io.h mem.h pci.h device.h model.h -intel.o: ibm.h CPU/cpu.h io.h mem.h pit.h timer.h intel.h +intel.o: ibm.h cpu/cpu.h io.h mem.h pit.h timer.h intel.h -intel_flash.o: ibm.h CPU/cpu.h device.h mem.h model.h rom.h +intel_flash.o: ibm.h cpu/cpu.h device.h mem.h model.h rom.h io.o: ibm.h io.h -jim.o: ibm.h CPU/cpu.h io.h device.h model.h +jim.o: ibm.h cpu/cpu.h io.h device.h model.h joystick_ch_flightstick_pro.o: ibm.h device.h timer.h gameport.h \ joystick_standard.h plat_joystick.h @@ -498,23 +498,23 @@ joystick_tm_fcs.o: ibm.h device.h timer.h gameport.h \ keyboard.o: ibm.h plat_keyboard.h keyboard.h -keyboard_amstrad.o: ibm.h io.h mem.h pic.h pit.h timer.h SOUND/sound.h \ - SOUND/snd_speaker.h keyboard.h keyboard_amstrad.h +keyboard_amstrad.o: ibm.h io.h mem.h pic.h pit.h timer.h sound/sound.h \ + sound/snd_speaker.h keyboard.h keyboard_amstrad.h keyboard_at.o: ibm.h io.h mem.h pic.h pit.h timer.h disc.h fdc.h \ - SOUND/sound.h SOUND/snd_speaker.h keyboard.h keyboard_at.h + sound/sound.h sound/snd_speaker.h keyboard.h keyboard_at.h keyboard_olim24.o: ibm.h io.h mem.h pic.h pit.h timer.h mouse.h \ - SOUND/sound.h SOUND/snd_speaker.h keyboard.h keyboard_olim24.h + sound/sound.h sound/snd_speaker.h keyboard.h keyboard_olim24.h keyboard_pcjr.o: ibm.h io.h mem.h nmi.h pic.h pit.h timer.h \ - device.h SOUND/sound.h SOUND/snd_speaker.h \ - SOUND/snd_sn76489.h keyboard.h keyboard_pcjr.h + device.h sound/sound.h sound/snd_speaker.h \ + sound/snd_sn76489.h keyboard.h keyboard_pcjr.h keyboard_xt.o: ibm.h io.h mem.h pic.h pit.h timer.h device.h tandy_eeprom.h \ - SOUND/sound.h SOUND/snd_speaker.h keyboard.h keyboard_xt.h + sound/sound.h sound/snd_speaker.h keyboard.h keyboard_xt.h -laserxt.o: ibm.h CPU/cpu.h io.h mem.h device.h model.h +laserxt.o: ibm.h cpu/cpu.h io.h mem.h device.h model.h lpt.o: ibm.h io.h lpt.h @@ -522,23 +522,23 @@ mca.o: ibm.h io.h mem.h mca.h mcr.o: ibm.h -mem.o: ibm.h CPU/cpu.h CPU/x86_ops.h CPU/x86.h config.h \ - io.h mem.h rom.h CPU/codegen.h VIDEO/video.h +mem.o: ibm.h cpu/cpu.h cpu/x86_ops.h cpu/x86.h config.h \ + io.h mem.h rom.h cpu/codegen.h video/video.h memregs.o: ibm.h io.h memregs.h -model.o: ibm.h io.h mem.h rom.h device.h model.h CPU/cpu.h \ +model.o: ibm.h io.h mem.h rom.h device.h model.h cpu/cpu.h \ mouse.h cdrom.h disc.h dma.h fdc.h fdc37c665.h fdc37c669.h \ - fdc37c932fr.h gameport.h HDD/hdd_ide_at.h intel.h intel_flash.h \ + fdc37c932fr.h gameport.h hdd/hdd_ide_at.h intel.h intel_flash.h \ keyboard_amstrad.h keyboard_at.h keyboard_olim24.h \ keyboard_pcjr.h keyboard_xt.h lpt.h mem.h memregs.h \ nmi.h nvr.h pc87306.h pci.h pic.h piix.h pit.h ps2_mca.h \ - serial.h sis85c471.h sio.h SOUND/snd_ps1.h SOUND/snd_pssj.h \ - SOUND/snd_sn76489.h tandy_eeprom.h tandy_rom.h \ - VIDEO/vid_pcjr.h VIDEO/vid_tandy.h w83877f.h wd76c10.h \ - HDD/hdd_ide_xt.h bugger.h + serial.h sis85c471.h sio.h sound/snd_ps1.h sound/snd_pssj.h \ + sound/snd_sn76489.h tandy_eeprom.h tandy_rom.h \ + video/vid_pcjr.h video/vid_tandy.h w83877f.h wd76c10.h \ + hdd/hdd_ide_xt.h bugger.h -mouse.o: ibm.h CPU/cpu.h device.h model.h mouse.h keyboard_olim24.h +mouse.o: ibm.h cpu/cpu.h device.h model.h mouse.h keyboard_olim24.h mouse_bus.o: ibm.h io.h pic.h timer.h mouse.h @@ -546,48 +546,48 @@ mouse_ps2.o: ibm.h keyboard_at.h mouse.h plat_mouse.h mouse_serial.o: ibm.h timer.h serial.h mouse.h -neat.o: ibm.h CPU/cpu.h io.h device.h model.h +neat.o: ibm.h cpu/cpu.h io.h device.h model.h nmi.o: ibm.h io.h nmi.h -nvr.o: ibm.h CPU/cpu.h device.h io.h mem.h model.h nvr.h \ +nvr.o: ibm.h cpu/cpu.h device.h io.h mem.h model.h nvr.h \ pic.h rom.h timer.h rtc.h -olivetti_m24.o: ibm.h CPU/cpu.h io.h device.h model.h +olivetti_m24.o: ibm.h cpu/cpu.h io.h device.h model.h -opti495.o: ibm.h CPU/cpu.h io.h mem.h device.h model.h +opti495.o: ibm.h cpu/cpu.h io.h mem.h device.h model.h -pc.o: 86box.h ibm.h mem.h CPU/cpu.h CPU/x86_ops.h CPU/codegen.h \ +pc.o: 86box.h ibm.h mem.h cpu/cpu.h cpu/x86_ops.h cpu/codegen.h \ dma.h nvr.h pic.h pit.h timer.h device.h model.h disc.h \ disc_86f.h disc_fdi.h disc_imd.h disc_img.h disc_td0.h \ disc_random.h config.h fdc.h fdd.h gameport.h plat_joystick.h \ - plat_midi.h HDD/hdd.h HDD/hdd_ide_at.h cdrom.h cdrom_ioctl.h \ - cdrom_image.h cdrom_null.h SCSI/scsi.h keyboard.h plat_keyboard.h \ - keyboard_at.h mouse.h plat_mouse.h NETWORK/network.h serial.h \ - SOUND/sound.h SOUND/snd_cms.h SOUND/snd_dbopl.h \ - SOUND/snd_mpu401.h SOUND/snd_opl.h SOUND/snd_gus.h \ - SOUND/snd_sb.h SOUND/snd_speaker.h SOUND/snd_ssi2001.h \ - VIDEO/video.h VIDEO/vid_voodoo.h WIN/plat_ui.h + plat_midi.h hdd/hdd.h hdd/hdd_ide_at.h cdrom.h cdrom_ioctl.h \ + cdrom_image.h cdrom_null.h scsi/scsi.h keyboard.h plat_keyboard.h \ + keyboard_at.h mouse.h plat_mouse.h network/network.h serial.h \ + sound/sound.h sound/snd_cms.h sound/snd_dbopl.h \ + sound/snd_mpu401.h sound/snd_opl.h sound/snd_gus.h \ + sound/snd_sb.h sound/snd_speaker.h sound/snd_ssi2001.h \ + video/video.h video/vid_voodoo.h win/plat_ui.h -pc87306.o: ibm.h disc.h fdc.h fdd.h HDD/hdd_ide_at.h io.h lpt.h serial.h \ +pc87306.o: ibm.h disc.h fdc.h fdd.h hdd/hdd_ide_at.h io.h lpt.h serial.h \ pc87306.h pci.o: ibm.h io.h mem.h pic.h pci.h pic.o: ibm.h io.h pic.h pit.h -piix.o: ibm.h dma.h HDD/hdd_ide_at.h io.h mem.h pci.h piix.h +piix.o: ibm.h dma.h hdd/hdd_ide_at.h io.h mem.h pci.h piix.h -pit.o: ibm.h CPU/cpu.h dma.h io.h pic.h pit.h device.h timer.h \ - model.h SOUND/snd_speaker.h VIDEO/video.h +pit.o: ibm.h cpu/cpu.h dma.h io.h pic.h pit.h device.h timer.h \ + model.h sound/snd_speaker.h video/video.h ppi.o: ibm.h pit.h plat_keyboard.h plat_mouse.h -ps1.o: ibm.h CPU/cpu.h io.h mem.h rom.h device.h model.h lpt.h serial.h +ps1.o: ibm.h cpu/cpu.h io.h mem.h rom.h device.h model.h lpt.h serial.h -ps2.o: ibm.h CPU/cpu.h io.h mem.h rom.h device.h model.h lpt.h serial.h +ps2.o: ibm.h cpu/cpu.h io.h mem.h rom.h device.h model.h lpt.h serial.h -ps2_mca.o: ibm.h CPU/cpu.h CPU/x86.h io.h mca.h mem.h rom.h device.h \ +ps2_mca.o: ibm.h cpu/cpu.h cpu/x86.h io.h mca.h mem.h rom.h device.h \ lpt.h ps2_mca.h ps2_nvr.h serial.h ps2_nvr.o: ibm.h device.h io.h mem.h rom.h ps2_nvr.h @@ -596,37 +596,37 @@ rom.o: config.h ibm.h mem.h rom.h rtc.o: nvr.h rtc.h -scat.o: ibm.h CPU/cpu.h io.h mem.h device.h model.h +scat.o: ibm.h cpu/cpu.h io.h mem.h device.h model.h -scsi.o: 86box.h ibm.h timer.h device.h cdrom.h SCSI/scsi.h \ - SCSI/scsi_aha154x.h SCSI/scsi_buslogic.h +scsi.o: 86box.h ibm.h timer.h device.h cdrom.h scsi/scsi.h \ + scsi/scsi_aha154x.h scsi/scsi_buslogic.h -scsi_bios_command.o: ibm.h dma.h SCSI/scsi.h SCSI/scsi_bios_command.h SCSI/scsi_device.h +scsi_bios_command.o: ibm.h dma.h scsi/scsi.h scsi/scsi_bios_command.h scsi/scsi_device.h -scsi_device.o: ibm.h SCSI/scsi.h SCSI/scsi_disk.h cdrom.h +scsi_device.o: ibm.h scsi/scsi.h scsi/scsi_disk.h cdrom.h scsi_aha154x.o: ibm.h io.h mca.h mem.h mca.h rom.h dma.h pic.h timer.h \ - device.h SCSI/scsi.h SCSI/scsi_bios_command.h SCSI/scsi_aha154x.h \ + device.h scsi/scsi.h scsi/scsi_bios_command.h scsi/scsi_aha154x.h \ scsi_buslogic.o: ibm.h io.h mem.h rom.h dma.h pic.h pci.h timer.h \ - device.h SCSI/scsi.h SCSI/scsi_bios_command.h SCSI/scsi_device.h \ - SCSI/scsi_buslogic.h + device.h scsi/scsi.h scsi/scsi_bios_command.h scsi/scsi_device.h \ + scsi/scsi_buslogic.h -scsi_disk.o: 86box.h cdrom.h HDD/hdd_image.h ibm.h HDD/hdd_ide_at.h piix.h SCSI/scsi.h \ - SCSI/scsi_disk.h timer.h WIN/plat_iodev.h +scsi_disk.o: 86box.h cdrom.h hdd/hdd_image.h ibm.h hdd/hdd_ide_at.h piix.h scsi/scsi.h \ + scsi/scsi_disk.h timer.h win/plat_iodev.h serial.o: ibm.h io.h pic.h timer.h serial.h plat_serial.h serial_old.o: ibm.h io.h mouse.h pic.h serial.h timer.h sio.o: ibm.h cdrom.h disc.h dma.h fdc.h keyboard_at.h io.h mem.h \ - HDD/hdd_ide_at.h pci.h sio.h + hdd/hdd_ide_at.h pci.h sio.h -sis496.o: ibm.h CPU/cpu.h io.h mem.h pci.h device.h model.h +sis496.o: ibm.h cpu/cpu.h io.h mem.h pci.h device.h model.h sis50x.o: ibm.h device.h io.h mem.h pci.h sis50x.h -sis85c471.o: ibm.h HDD/hdd_ide_at.h disc.h fdc.h fdd.h io.h lpt.h serial.h sis85c471.h +sis85c471.o: ibm.h hdd/hdd_ide_at.h disc.h fdc.h fdd.h io.h lpt.h serial.h sis85c471.h superio_detect.o: ibm.h io.h disc.h fdd.h fdc.h superio_detect.h @@ -642,289 +642,289 @@ w83877f.o: ibm.h disc.h fdc.h fdd.h io.h lpt.h serial.h w83877f.h wd76c10.o: ibm.h disc.h fdc.h io.h mem.h serial.h wd76c10.h -386.o: ibm.h CPU/cpu.h CPU/x86.h CPU/x87.h mem.h disc.h fdc.h pic.h timer.h CPU/386_common.h +386.o: ibm.h cpu/cpu.h cpu/x86.h cpu/x87.h mem.h disc.h fdc.h pic.h timer.h cpu/386_common.h -386_dynarec.o: ibm.h CPU/cpu.h CPU/x86.h CPU/x86_ops.h CPU/x87.h mem.h CPU/codegen.h disc.h fdc.h pic.h timer.h CPU/386_common.h \ - CPU/x86_ops.h CPU/x86seg.h CPU/x86_ops_arith.h CPU/x86_ops_atomic.h CPU/x86_ops_bcd.h CPU/x86_ops_bit.h \ - CPU/x86_ops_bitscan.h CPU/x86_ops_call.h CPU/x86_ops_flag.h CPU/x86_ops_fpu.h CPU/x86_ops_inc_dec.h CPU/x86_ops_int.h \ - CPU/x86_ops_io.h CPU/x86_ops_jump.h CPU/x86_ops_misc.h \ - CPU/x87_ops_arith.h CPU/x87_ops_misc.h CPU/x87_ops_loadstore.h \ - CPU/x87_ops.h CPU/x86_ops_i686.h CPU/x86_ops_mmx.h \ - CPU/x86_ops_mmx_arith.h CPU/x86_ops_mmx_cmp.h CPU/x86_ops_mmx_logic.h CPU/x86_ops_mmx_pack.h CPU/x86_ops_mmx_shift.h \ - CPU/x86_ops_mov.h CPU/x86_ops_mov_ctrl.h CPU/x86_ops_mov_seg.h CPU/x86_ops_movx.h CPU/x86_ops_msr.h CPU/x86_ops_mul.h \ - CPU/x86_ops_pmode.h CPU/x86_ops_prefix.h CPU/x86_ops_rep.h CPU/x86_ops_ret.h CPU/x86_ops_set.h CPU/x86_ops_shift.h \ - CPU/x86_ops_stack.h CPU/x86_ops_string.h CPU/x86_ops_xchg.h \ - CPU/386_ops.h +386_dynarec.o: ibm.h cpu/cpu.h cpu/x86.h cpu/x86_ops.h cpu/x87.h mem.h cpu/codegen.h disc.h fdc.h pic.h timer.h cpu/386_common.h \ + cpu/x86_ops.h cpu/x86seg.h cpu/x86_ops_arith.h cpu/x86_ops_atomic.h cpu/x86_ops_bcd.h cpu/x86_ops_bit.h \ + cpu/x86_ops_bitscan.h cpu/x86_ops_call.h cpu/x86_ops_flag.h cpu/x86_ops_fpu.h cpu/x86_ops_inc_dec.h cpu/x86_ops_int.h \ + cpu/x86_ops_io.h cpu/x86_ops_jump.h cpu/x86_ops_misc.h \ + cpu/x87_ops_arith.h cpu/x87_ops_misc.h cpu/x87_ops_loadstore.h \ + cpu/x87_ops.h cpu/x86_ops_i686.h cpu/x86_ops_mmx.h \ + cpu/x86_ops_mmx_arith.h cpu/x86_ops_mmx_cmp.h cpu/x86_ops_mmx_logic.h cpu/x86_ops_mmx_pack.h cpu/x86_ops_mmx_shift.h \ + cpu/x86_ops_mov.h cpu/x86_ops_mov_ctrl.h cpu/x86_ops_mov_seg.h cpu/x86_ops_movx.h cpu/x86_ops_msr.h cpu/x86_ops_mul.h \ + cpu/x86_ops_pmode.h cpu/x86_ops_prefix.h cpu/x86_ops_rep.h cpu/x86_ops_ret.h cpu/x86_ops_set.h cpu/x86_ops_shift.h \ + cpu/x86_ops_stack.h cpu/x86_ops_string.h cpu/x86_ops_xchg.h \ + cpu/386_ops.h -386_dynarec_ops.o: ibm.h CPU/cpu.h CPU/x86.h CPU/x86_ops.h CPU/x87.h CPU/x86_flags.h mem.h CPU/codegen.h pic.h CPU/386_common.h \ - CPU/x86_ops.h CPU/x86seg.h CPU/x86_ops_arith.h CPU/x86_ops_atomic.h CPU/x86_ops_bcd.h CPU/x86_ops_bit.h \ - CPU/x86_ops_bitscan.h CPU/x86_ops_call.h CPU/x86_ops_flag.h CPU/x86_ops_fpu.h CPU/x86_ops_inc_dec.h CPU/x86_ops_int.h \ - CPU/x86_ops_io.h CPU/x86_ops_jump.h CPU/x86_ops_misc.h \ - CPU/x87_ops_arith.h CPU/x87_ops_misc.h CPU/x87_ops_loadstore.h \ - CPU/x87_ops.h CPU/x86_ops_i686.h CPU/x86_ops_mmx.h \ - CPU/x86_ops_mmx_arith.h CPU/x86_ops_mmx_cmp.h CPU/x86_ops_mmx_logic.h CPU/x86_ops_mmx_pack.h CPU/x86_ops_mmx_shift.h \ - CPU/x86_ops_mov.h CPU/x86_ops_mov_ctrl.h CPU/x86_ops_mov_seg.h CPU/x86_ops_movx.h CPU/x86_ops_msr.h CPU/x86_ops_mul.h \ - CPU/x86_ops_pmode.h CPU/x86_ops_prefix.h CPU/x86_ops_rep.h CPU/x86_ops_ret.h CPU/x86_ops_set.h CPU/x86_ops_shift.h \ - CPU/x86_ops_stack.h CPU/x86_ops_string.h CPU/x86_ops_xchg.h \ - CPU/386_ops.h +386_dynarec_ops.o: ibm.h cpu/cpu.h cpu/x86.h cpu/x86_ops.h cpu/x87.h cpu/x86_flags.h mem.h cpu/codegen.h pic.h cpu/386_common.h \ + cpu/x86_ops.h cpu/x86seg.h cpu/x86_ops_arith.h cpu/x86_ops_atomic.h cpu/x86_ops_bcd.h cpu/x86_ops_bit.h \ + cpu/x86_ops_bitscan.h cpu/x86_ops_call.h cpu/x86_ops_flag.h cpu/x86_ops_fpu.h cpu/x86_ops_inc_dec.h cpu/x86_ops_int.h \ + cpu/x86_ops_io.h cpu/x86_ops_jump.h cpu/x86_ops_misc.h \ + cpu/x87_ops_arith.h cpu/x87_ops_misc.h cpu/x87_ops_loadstore.h \ + cpu/x87_ops.h cpu/x86_ops_i686.h cpu/x86_ops_mmx.h \ + cpu/x86_ops_mmx_arith.h cpu/x86_ops_mmx_cmp.h cpu/x86_ops_mmx_logic.h cpu/x86_ops_mmx_pack.h cpu/x86_ops_mmx_shift.h \ + cpu/x86_ops_mov.h cpu/x86_ops_mov_ctrl.h cpu/x86_ops_mov_seg.h cpu/x86_ops_movx.h cpu/x86_ops_msr.h cpu/x86_ops_mul.h \ + cpu/x86_ops_pmode.h cpu/x86_ops_prefix.h cpu/x86_ops_rep.h cpu/x86_ops_ret.h cpu/x86_ops_set.h cpu/x86_ops_shift.h \ + cpu/x86_ops_stack.h cpu/x86_ops_string.h cpu/x86_ops_xchg.h \ + cpu/386_ops.h -808x.o: ibm.h CPU/cpu.h CPU/x86.h keyboard.h mem.h nmi.h pic.h SCSI/scsi.h timer.h +808x.o: ibm.h cpu/cpu.h cpu/x86.h keyboard.h mem.h nmi.h pic.h scsi/scsi.h timer.h -codegen.o: ibm.h CPU/x86_ops.h mem.h CPU/codegen.h +codegen.o: ibm.h cpu/x86_ops.h mem.h cpu/codegen.h -codegen_ops.o: ibm.h mem.h CPU/x86.h CPU/x86_ops.h CPU/x86_flags.h CPU/x87.h CPU/386_common.h CPU/cpu.h CPU/codegen.h CPU/codegen_ops.h \ - CPU/$(CGOPS) CPU/codegen_ops_arith.h CPU/codegen_ops_fpu.h CPU/codegen_ops_jump.h CPU/codegen_ops_logic.h CPU/codegen_ops_misc.h \ - CPU/codegen_ops_mmx.h CPU/codegen_ops_mov.h CPU/codegen_ops_shift.h CPU/codegen_ops_stack.h CPU/codegen_ops_xchg.h +codegen_ops.o: ibm.h mem.h cpu/x86.h cpu/x86_ops.h cpu/x86_flags.h cpu/x87.h cpu/386_common.h cpu/cpu.h cpu/codegen.h cpu/codegen_ops.h \ + cpu/$(CGOPS) cpu/codegen_ops_arith.h cpu/codegen_ops_fpu.h cpu/codegen_ops_jump.h cpu/codegen_ops_logic.h cpu/codegen_ops_misc.h \ + cpu/codegen_ops_mmx.h cpu/codegen_ops_mov.h cpu/codegen_ops_shift.h cpu/codegen_ops_stack.h cpu/codegen_ops_xchg.h -codegen_timing_486.o: ibm.h CPU/cpu.h CPU/x86.h CPU/x87_ops.h CPU/x87.h mem.h CPU/codegen.h CPU/codegen_ops.h CPU/codegen_timing_common.h +codegen_timing_486.o: ibm.h cpu/cpu.h cpu/x86.h cpu/x87_ops.h cpu/x87.h mem.h cpu/codegen.h cpu/codegen_ops.h cpu/codegen_timing_common.h -codegen_timing_686.o: ibm.h CPU/cpu.h CPU/x86.h CPU/x87_ops.h CPU/x87.h mem.h CPU/codegen.h CPU/codegen_timing_common.h +codegen_timing_686.o: ibm.h cpu/cpu.h cpu/x86.h cpu/x87_ops.h cpu/x87.h mem.h cpu/codegen.h cpu/codegen_timing_common.h -codegen_timing_common.o: ibm.h CPU/codegen_timing_common.h +codegen_timing_common.o: ibm.h cpu/codegen_timing_common.h -codegen_timing_pentium.o: ibm.h CPU/cpu.h CPU/x86.h CPU/x87_ops.h CPU/x87.h mem.h CPU/codegen.h CPU/codegen_ops.h CPU/codegen_timing_common.h +codegen_timing_pentium.o: ibm.h cpu/cpu.h cpu/x86.h cpu/x87_ops.h cpu/x87.h mem.h cpu/codegen.h cpu/codegen_ops.h cpu/codegen_timing_common.h -codegen_timing_winchip.o: ibm.h CPU/cpu.h CPU/x86.h CPU/x87_ops.h CPU/x87.h mem.h CPU/codegen.h CPU/codegen_ops.h CPU/codegen_timing_common.h +codegen_timing_winchip.o: ibm.h cpu/cpu.h cpu/x86.h cpu/x87_ops.h cpu/x87.h mem.h cpu/codegen.h cpu/codegen_ops.h cpu/codegen_timing_common.h -codegen_x86.o: ibm.h CPU/cpu.h CPU/x86.h CPU/x86_flags.h CPU/x86_ops.h CPU/x87.h mem.h CPU/386_common.h CPU/codegen.h CPU/codegen_ops.h \ - CPU/codegen_ops_x86.h +codegen_x86.o: ibm.h cpu/cpu.h cpu/x86.h cpu/x86_flags.h cpu/x86_ops.h cpu/x87.h mem.h cpu/386_common.h cpu/codegen.h cpu/codegen_ops.h \ + cpu/codegen_ops_x86.h -codegen_x86-64.o: ibm.h mem.h CPU/cpu.h CPU/x86.h CPU/x86_flags.h CPU/x86_ops.h CPU/x87.h CPU/386_common.h CPU/codegen.h CPU/codegen_ops.h \ - CPU/codegen_ops_x86-64.h +codegen_x86-64.o: ibm.h mem.h cpu/cpu.h cpu/x86.h cpu/x86_flags.h cpu/x86_ops.h cpu/x87.h cpu/386_common.h cpu/codegen.h cpu/codegen_ops.h \ + cpu/codegen_ops_x86-64.h -cpu.o: ibm.h CPU/cpu.h device.h model.h io.h CPU/x86_ops.h mem.h pci.h CPU/codegen.h +cpu.o: ibm.h cpu/cpu.h device.h model.h io.h cpu/x86_ops.h mem.h pci.h cpu/codegen.h -x86seg.o: ibm.h mem.h nvr.h CPU/x86.h CPU/386.h CPU/386_common.h CPU/cpu.h +x86seg.o: ibm.h mem.h nvr.h cpu/x86.h cpu/386.h cpu/386_common.h cpu/cpu.h -x87.o: ibm.h pic.h CPU/x86.h CPU/x86_flags.h CPU/x86_ops.h CPU/x87.h CPU/386_common.h +x87.o: ibm.h pic.h cpu/x86.h cpu/x86_flags.h cpu/x86_ops.h cpu/x87.h cpu/386_common.h -net_ne2000.o: ibm.h io.h mem.h rom.h pci.h pic.h device.h config.h disc_random.h NETWORK/network.h NETWORK/net_ne2000.h NETWORK/bswap.h +net_ne2000.o: ibm.h io.h mem.h rom.h pci.h pic.h device.h config.h disc_random.h network/network.h network/net_ne2000.h network/bswap.h -net_pcap.o: ibm.h config.h device.h NETWORK/network.h WIN/plat_dynld.h WIN/plat_thread.h +net_pcap.o: ibm.h config.h device.h network/network.h win/plat_dynld.h win/plat_thread.h -net_slirp.o: NETWORK/slirp/slirp.h NETWORK/slirp/queue.h ibm.h config.h device.h NETWORK/network.h WIN/plat_thread.h +net_slirp.o: network/slirp/slirp.h network/slirp/queue.h ibm.h config.h device.h network/network.h win/plat_thread.h -network.o: ibm.h device.h NETWORK/network.h NETWORK/net_ne2000.h WIN/plat_ui.h +network.o: ibm.h device.h network/network.h network/net_ne2000.h win/plat_ui.h -dbopl.o: SOUND/dbopl.h +dbopl.o: sound/dbopl.h -midi.o: device.h SOUND/midi.h ibm.h WIN/plat_midi.h WIN/plat_ticks.h SOUND/midi_fluidsynth.h SOUND/midi_mt32.h SOUND/midi_system.h +midi.o: device.h sound/midi.h ibm.h win/plat_midi.h win/plat_ticks.h sound/midi_fluidsynth.h sound/midi_mt32.h sound/midi_system.h -midi_fluidsynth.o: config.h WIN/plat_dynld.h WIN/plat_thread.h WIN/plat_ui.h device.h SOUND/midi_fluidsynth.h SOUND/midi.h SOUND/sound.h +midi_fluidsynth.o: config.h win/plat_dynld.h win/plat_thread.h win/plat_ui.h device.h sound/midi_fluidsynth.h sound/midi.h sound/sound.h -midi_mt32.o: SOUND/munt/c_interface/c_interface.h WIN/plat_thread.h ibm.h device.h mem.h rom.h SOUND/midi_mt32.h SOUND/midi.h \ - SOUND/sound.h +midi_mt32.o: sound/munt/c_interface/c_interface.h win/plat_thread.h ibm.h device.h mem.h rom.h sound/midi_mt32.h sound/midi.h \ + sound/sound.h -midi_system.o: device.h WIN/plat_midi.h SOUND/midi_system.h SOUND/midi.h +midi_system.o: device.h win/plat_midi.h sound/midi_system.h sound/midi.h -nukedopl.o: SOUND/nukedopl.h +nukedopl.o: sound/nukedopl.h -openal.o: ibm.h SOUND/sound.h +openal.o: ibm.h sound/sound.h -snd_ad1848.o: ibm.h dma.h pic.h timer.h SOUND/sound.h SOUND/snd_ad1848.h +snd_ad1848.o: ibm.h dma.h pic.h timer.h sound/sound.h sound/snd_ad1848.h -snd_adlib.o: ibm.h io.h mca.h device.h SOUND/sound.h SOUND/snd_adlib.h SOUND/snd_opl.h +snd_adlib.o: ibm.h io.h mca.h device.h sound/sound.h sound/snd_adlib.h sound/snd_opl.h -snd_adlibgold.o: ibm.h io.h dma.h pic.h pit.h mem.h rom.h timer.h device.h SOUND/sound.h SOUND/filters.h SOUND/snd_opl.h SOUND/snd_ym7128.h +snd_adlibgold.o: ibm.h io.h dma.h pic.h pit.h mem.h rom.h timer.h device.h sound/sound.h sound/filters.h sound/snd_opl.h sound/snd_ym7128.h -snd_cms.o: ibm.h io.h device.h SOUND/sound.h SOUND/snd_cms.h +snd_cms.o: ibm.h io.h device.h sound/sound.h sound/snd_cms.h -snd_dbopl.o: SOUND/dbopl.h SOUND/nukedopl.h SOUND/snd_dbopl.h +snd_dbopl.o: sound/dbopl.h sound/nukedopl.h sound/snd_dbopl.h -snd_emu8k.o: ibm.h io.h mem.h rom.h timer.h device.h SOUND/sound.h SOUND/snd_emu8k.h +snd_emu8k.o: ibm.h io.h mem.h rom.h timer.h device.h sound/sound.h sound/snd_emu8k.h -snd_gus.o: ibm.h io.h pic.h dma.h timer.h device.h SOUND/sound.h SOUND/snd_gus.h +snd_gus.o: ibm.h io.h pic.h dma.h timer.h device.h sound/sound.h sound/snd_gus.h -snd_mpu401.o: ibm.h device.h io.h pic.h timer.h SOUND/midi.h SOUND/sound.h SOUND/snd_mpu401.h +snd_mpu401.o: ibm.h device.h io.h pic.h timer.h sound/midi.h sound/sound.h sound/snd_mpu401.h -snd_opl.o: ibm.h io.h timer.h SOUND/sound.h SOUND/snd_opl.h SOUND/snd_dbopl.h +snd_opl.o: ibm.h io.h timer.h sound/sound.h sound/snd_opl.h sound/snd_dbopl.h -snd_pas16.o: ibm.h io.h pic.h pit.h dma.h timer.h device.h SOUND/sound.h SOUND/snd_opl.h SOUND/snd_pas16.h SOUND/snd_sb_dsp.h \ +snd_pas16.o: ibm.h io.h pic.h pit.h dma.h timer.h device.h sound/sound.h sound/snd_opl.h sound/snd_pas16.h sound/snd_sb_dsp.h \ SOUND\filters.h -snd_ps1.o: ibm.h io.h pic.h timer.h device.h SOUND/sound.h SOUND/snd_ps1.h SOUND/snd_sn76489.h +snd_ps1.o: ibm.h io.h pic.h timer.h device.h sound/sound.h sound/snd_ps1.h sound/snd_sn76489.h -snd_pssj.o: ibm.h io.h dma.h pic.h timer.h device.h SOUND/sound.h SOUND/snd_pssj.h SOUND/snd_sn76489.h +snd_pssj.o: ibm.h io.h dma.h pic.h timer.h device.h sound/sound.h sound/snd_pssj.h sound/snd_sn76489.h -snd_resid.o: SOUND/resid-fp/sid.h SOUND/snd_resid.h +snd_resid.o: sound/resid-fp/sid.h sound/snd_resid.h -snd_sb.o: ibm.h io.h mca.h mem.h rom.h device.h SOUND/sound.h SOUND/snd_dbopl.h SOUND/snd_emu8k.h SOUND/snd_mpu401.h \ - SOUND/snd_opl.h SOUND/snd_sb.h SOUND/snd_sb_dsp.h SOUND/filters.h +snd_sb.o: ibm.h io.h mca.h mem.h rom.h device.h sound/sound.h sound/snd_dbopl.h sound/snd_emu8k.h sound/snd_mpu401.h \ + sound/snd_opl.h sound/snd_sb.h sound/snd_sb_dsp.h sound/filters.h -snd_sb_dsp.o: ibm.h io.h pic.h dma.h timer.h device.h SOUND/midi.h SOUND/sound.h SOUND/snd_mpu401.h SOUND/snd_sb_dsp.h +snd_sb_dsp.o: ibm.h io.h pic.h dma.h timer.h device.h sound/midi.h sound/sound.h sound/snd_mpu401.h sound/snd_sb_dsp.h -snd_sn76489.o: ibm.h io.h device.h SOUND/sound.h SOUND/snd_sn76489.h +snd_sn76489.o: ibm.h io.h device.h sound/sound.h sound/snd_sn76489.h -snd_speaker.o: ibm.h SOUND/sound.h SOUND/snd_speaker.h +snd_speaker.o: ibm.h sound/sound.h sound/snd_speaker.h -snd_ssi2001.o: ibm.h io.h device.h SOUND/sound.h SOUND/snd_resid.h SOUND/snd_ssi2001.h +snd_ssi2001.o: ibm.h io.h device.h sound/sound.h sound/snd_resid.h sound/snd_ssi2001.h -snd_wss.o: ibm.h io.h pic.h dma.h device.h SOUND/sound.h SOUND/snd_ad1848.h SOUND/snd_opl.h SOUND/snd_wss.h +snd_wss.o: ibm.h io.h pic.h dma.h device.h sound/sound.h sound/snd_ad1848.h sound/snd_opl.h sound/snd_wss.h -snd_ym7128.o: ibm.h SOUND/snd_ym7128.h +snd_ym7128.o: ibm.h sound/snd_ym7128.h -sound.o: ibm.h device.h timer.h cdrom.h WIN/plat_thread.h SOUND/midi.h SOUND/sound.h SOUND/snd_opl.h SOUND/snd_adlib.h \ - SOUND/snd_pas16.h SOUND/snd_sb.h SOUND/snd_sb_dsp.h SOUND/snd_wss.h SOUND/filters.h +sound.o: ibm.h device.h timer.h cdrom.h win/plat_thread.h sound/midi.h sound/sound.h sound/snd_opl.h sound/snd_adlib.h \ + sound/snd_pas16.h sound/snd_sb.h sound/snd_sb_dsp.h sound/snd_wss.h sound/filters.h -vid_ati_eeprom.o: ibm.h mem.h rom.h VIDEO/vid_ati_eeprom.h +vid_ati_eeprom.o: ibm.h mem.h rom.h video/vid_ati_eeprom.h -vid_ati_mach64.o: ibm.h device.h io.h mem.h pci.h rom.h WIN/plat_thread.h VIDEO/video.h VIDEO/vid_svga.h VIDEO/vid_svga_render.h \ - VIDEO/vid_ati68860_ramdac.h VIDEO/vid_ati_eeprom.h VIDEO/vid_ics2595.h +vid_ati_mach64.o: ibm.h device.h io.h mem.h pci.h rom.h win/plat_thread.h video/video.h video/vid_svga.h video/vid_svga_render.h \ + video/vid_ati68860_ramdac.h video/vid_ati_eeprom.h video/vid_ics2595.h -vid_ati18800.o: ibm.h io.h mem.h rom.h device.h VIDEO/video.h VIDEO/vid_ati18800.h VIDEO/vid_ati_eeprom.h VIDEO/vid_svga.h +vid_ati18800.o: ibm.h io.h mem.h rom.h device.h video/video.h video/vid_ati18800.h video/vid_ati_eeprom.h video/vid_svga.h -vid_ati28800.o: ibm.h io.h mem.h rom.h device.h timer.h VIDEO/video.h VIDEO/vid_ati28800.h VIDEO/vid_ati_eeprom.h VIDEO/vid_svga.h \ - VIDEO/vid_svga_render.h +vid_ati28800.o: ibm.h io.h mem.h rom.h device.h timer.h video/video.h video/vid_ati28800.h video/vid_ati_eeprom.h video/vid_svga.h \ + video/vid_svga_render.h -vid_ati68860_ramdac.o: ibm.h mem.h VIDEO/video.h VIDEO/vid_svga.h VIDEO/vid_ati68860_ramdac.h VIDEO/vid_svga_render.h +vid_ati68860_ramdac.o: ibm.h mem.h video/video.h video/vid_svga.h video/vid_ati68860_ramdac.h video/vid_svga_render.h -vid_cga.o: ibm.h io.h mem.h timer.h device.h VIDEO/video.h VIDEO/vid_cga.h VIDEO/vid_cga_comp.h WIN/win_cgapal.h +vid_cga.o: ibm.h io.h mem.h timer.h device.h video/video.h video/vid_cga.h video/vid_cga_comp.h win/win_cgapal.h -vid_cga_comp.o: ibm.h device.h mem.h VIDEO/vid_cga.h VIDEO/vid_cga_comp.h +vid_cga_comp.o: ibm.h device.h mem.h video/vid_cga.h video/vid_cga_comp.h -vid_cl_gd.o: ibm.h io.h mem.h rom.h device.h VIDEO/video.h VIDEO/vid_svga.h VIDEO/vid_svga_render.h VIDEO/vid_cl_ramdac.h \ - VIDEO/vid_cl_gd.h VIDEO/vid_cl_gd_blit.h +vid_cl_gd.o: ibm.h io.h mem.h rom.h device.h video/video.h video/vid_svga.h video/vid_svga_render.h video/vid_cl_ramdac.h \ + video/vid_cl_gd.h video/vid_cl_gd_blit.h -vid_cl_gd_blit.o: ibm.h io.h mem.h rom.h device.h VIDEO/video.h VIDEO/vid_svga.h VIDEO/vid_svga_render.h VIDEO/vid_cl_ramdac.h \ - VIDEO/vid_cl_gd.h VIDEO/vid_cl_gd_blit.h VIDEO/vid_cl_gd_vga_rop.h +vid_cl_gd_blit.o: ibm.h io.h mem.h rom.h device.h video/video.h video/vid_svga.h video/vid_svga_render.h video/vid_cl_ramdac.h \ + video/vid_cl_gd.h video/vid_cl_gd_blit.h video/vid_cl_gd_vga_rop.h -vid_cl_gd_ramdac.o: ibm.h mem.h rom.h device.h VIDEO/video.h VIDEO/vid_svga.h VIDEO/vid_cl_ramdac.h VIDEO/vid_cl_gd.h \ - VIDEO/vid_cl_gd_blit.h +vid_cl_gd_ramdac.o: ibm.h mem.h rom.h device.h video/video.h video/vid_svga.h video/vid_cl_ramdac.h video/vid_cl_gd.h \ + video/vid_cl_gd_blit.h -vid_colorplus.o: ibm.h io.h mem.h timer.h device.h VIDEO/video.h VIDEO/vid_cga.h VIDEO/vid_colorplus.h VIDEO/vid_cga_comp.h +vid_colorplus.o: ibm.h io.h mem.h timer.h device.h video/video.h video/vid_cga.h video/vid_colorplus.h video/vid_cga_comp.h -vid_ega.o: ibm.h io.h mem.h rom.h timer.h device.h VIDEO/video.h VIDEO/vid_ega.h VIDEO/vid_ega_render.h +vid_ega.o: ibm.h io.h mem.h rom.h timer.h device.h video/video.h video/vid_ega.h video/vid_ega_render.h -vid_ega_render.o: ibm.h device.h mem.h rom.h VIDEO/video.h VIDEO/vid_ega.h VIDEO/vid_ega_render.h +vid_ega_render.o: ibm.h device.h mem.h rom.h video/video.h video/vid_ega.h video/vid_ega_render.h -vid_et4000.o: ibm.h io.h mem.h rom.h device.h VIDEO/video.h VIDEO/vid_svga.h VIDEO/vid_sc1502x_ramdac.h VIDEO/vid_et4000.h +vid_et4000.o: ibm.h io.h mem.h rom.h device.h video/video.h video/vid_svga.h video/vid_sc1502x_ramdac.h video/vid_et4000.h -vid_et4000w32.o: ibm.h io.h mem.h pci.h rom.h device.h WIN/plat_thread.h VIDEO/video.h VIDEO/vid_svga.h VIDEO/vid_icd2061.h \ - VIDEO/vid_stg_ramdac.h +vid_et4000w32.o: ibm.h io.h mem.h pci.h rom.h device.h win/plat_thread.h video/video.h video/vid_svga.h video/vid_icd2061.h \ + video/vid_stg_ramdac.h -vid_genius.o: ibm.h io.h mem.h rom.h timer.h device.h VIDEO/video.h VIDEO/vid_genius.h +vid_genius.o: ibm.h io.h mem.h rom.h timer.h device.h video/video.h video/vid_genius.h -vid_hercules.o: ibm.h mem.h io.h timer.h device.h VIDEO/video.h VIDEO/vid_hercules.h WIN/win_cgapal.h +vid_hercules.o: ibm.h mem.h io.h timer.h device.h video/video.h video/vid_hercules.h win/win_cgapal.h -vid_herculesplus.o: ibm.h io.h mem.h timer.h device.h VIDEO/video.h VIDEO/vid_herculesplus.h +vid_herculesplus.o: ibm.h io.h mem.h timer.h device.h video/video.h video/vid_herculesplus.h -vid_icd2061.o: ibm.h VIDEO/vid_icd2061.h +vid_icd2061.o: ibm.h video/vid_icd2061.h -vid_ics2595.o: ibm.h VIDEO/vid_ics2595.h +vid_ics2595.o: ibm.h video/vid_ics2595.h -vid_incolor.o: ibm.h io.h mem.h timer.h device.h VIDEO/video.h VIDEO/vid_incolor.h +vid_incolor.o: ibm.h io.h mem.h timer.h device.h video/video.h video/vid_incolor.h -vid_mda.o: ibm.h io.h mem.h timer.h device.h VIDEO/video.h VIDEO/vid_mda.h WIN/win_cgapal.h +vid_mda.o: ibm.h io.h mem.h timer.h device.h video/video.h video/vid_mda.h win/win_cgapal.h -vid_nv_riva128.o: ibm.h io.h mem.h pci.h pic.h rom.h timer.h device.h WIN/plat_thread.h VIDEO/video.h VIDEO/vid_svga.h \ - VIDEO/vid_svga_render.h +vid_nv_riva128.o: ibm.h io.h mem.h pci.h pic.h rom.h timer.h device.h win/plat_thread.h video/video.h video/vid_svga.h \ + video/vid_svga_render.h -vid_olivetti_m24.o: ibm.h io.h mem.h timer.h device.h VIDEO/video.h VIDEO/vid_olivetti_m24.h +vid_olivetti_m24.o: ibm.h io.h mem.h timer.h device.h video/video.h video/vid_olivetti_m24.h -vid_oti067.o: ibm.h io.h mem.h rom.h device.h VIDEO/video.h VIDEO/vid_oti067.h VIDEO/vid_svga.h +vid_oti067.o: ibm.h io.h mem.h rom.h device.h video/video.h video/vid_oti067.h video/vid_svga.h -vid_paradise.o: ibm.h io.h mem.h rom.h device.h VIDEO/video.h VIDEO/vid_paradise.h VIDEO/vid_svga.h VIDEO/vid_svga_render.h +vid_paradise.o: ibm.h io.h mem.h rom.h device.h video/video.h video/vid_paradise.h video/vid_svga.h video/vid_svga_render.h -vid_pc200.o: ibm.h io.h mem.h timer.h device.h VIDEO/video.h VIDEO/vid_cga.h VIDEO/vid_pc200.h +vid_pc200.o: ibm.h io.h mem.h timer.h device.h video/video.h video/vid_cga.h video/vid_pc200.h -vid_pc1512.o: ibm.h io.h mem.h timer.h device.h VIDEO/video.h VIDEO/vid_pc1512.h +vid_pc1512.o: ibm.h io.h mem.h timer.h device.h video/video.h video/vid_pc1512.h -vid_pc1640.o: ibm.h io.h mem.h rom.h timer.h device.h VIDEO/video.h VIDEO/vid_cga.h VIDEO/vid_ega.h VIDEO/vid_pc1640.h +vid_pc1640.o: ibm.h io.h mem.h rom.h timer.h device.h video/video.h video/vid_cga.h video/vid_ega.h video/vid_pc1640.h -vid_pcjr.o: ibm.h io.h mem.h pic.h timer.h device.h VIDEO/video.h VIDEO/vid_cga_comp.h VIDEO/vid_pcjr.h +vid_pcjr.o: ibm.h io.h mem.h pic.h timer.h device.h video/video.h video/vid_cga_comp.h video/vid_pcjr.h -vid_ps1_svga.o: ibm.h io.h mem.h rom.h device.h VIDEO/video.h VIDEO/vid_svga.h VIDEO/vid_vga.h +vid_ps1_svga.o: ibm.h io.h mem.h rom.h device.h video/video.h video/vid_svga.h video/vid_vga.h -vid_s3.o: ibm.h device.h io.h mem.h pci.h rom.h WIN/plat_thread.h VIDEO/video.h VIDEO/vid_s3.h VIDEO/vid_svga.h \ - VIDEO/vid_svga_render.h VIDEO/vid_sdac_ramdac.h +vid_s3.o: ibm.h device.h io.h mem.h pci.h rom.h win/plat_thread.h video/video.h video/vid_s3.h video/vid_svga.h \ + video/vid_svga_render.h video/vid_sdac_ramdac.h -vid_s3_virge.o: ibm.h io.h mem.h pci.h rom.h device.h WIN/plat_thread.h VIDEO/video.h VIDEO/vid_s3_virge.h VIDEO/vid_svga.h \ - VIDEO/vid_svga_render.h +vid_s3_virge.o: ibm.h io.h mem.h pci.h rom.h device.h win/plat_thread.h video/video.h video/vid_s3_virge.h video/vid_svga.h \ + video/vid_svga_render.h -vid_sc1502x_ramdac.o: ibm.h mem.h VIDEO/video.h VIDEO/vid_svga.h VIDEO/vid_sc1502x_ramdac.h +vid_sc1502x_ramdac.o: ibm.h mem.h video/video.h video/vid_svga.h video/vid_sc1502x_ramdac.h -vid_sdac_ramdac.o: ibm.h mem.h VIDEO/video.h VIDEO/vid_svga.h VIDEO/vid_sdac_ramdac.h +vid_sdac_ramdac.o: ibm.h mem.h video/video.h video/vid_svga.h video/vid_sdac_ramdac.h -vid_stg_ramdac.o: ibm.h mem.h VIDEO/video.h VIDEO/vid_svga.h VIDEO/vid_stg_ramdac.h +vid_stg_ramdac.o: ibm.h mem.h video/video.h video/vid_svga.h video/vid_stg_ramdac.h -vid_svga.o: ibm.h io.h mem.h rom.h timer.h VIDEO/video.h VIDEO/vid_svga.h VIDEO/vid_svga_render.h +vid_svga.o: ibm.h io.h mem.h rom.h timer.h video/video.h video/vid_svga.h video/vid_svga_render.h -vid_svga_render.o: ibm.h mem.h VIDEO/video.h VIDEO/vid_svga.h VIDEO/vid_svga_render.h +vid_svga_render.o: ibm.h mem.h video/video.h video/vid_svga.h video/vid_svga_render.h -vid_tandy.o: ibm.h io.h mem.h timer.h device.h VIDEO/video.h VIDEO/vid_tandy.h VIDEO/vid_cga_comp.h +vid_tandy.o: ibm.h io.h mem.h timer.h device.h video/video.h video/vid_tandy.h video/vid_cga_comp.h -vid_tandysl.o: ibm.h io.h mem.h timer.h device.h VIDEO/video.h VIDEO/vid_tandysl.h +vid_tandysl.o: ibm.h io.h mem.h timer.h device.h video/video.h video/vid_tandysl.h -vid_tgui9440.o: ibm.h io.h mem.h pci.h rom.h device.h WIN/plat_thread.h VIDEO/video.h VIDEO/vid_svga.h VIDEO/vid_svga_render.h \ - VIDEO/vid_tkd8001_ramdac.h VIDEO/vid_tgui9440.h +vid_tgui9440.o: ibm.h io.h mem.h pci.h rom.h device.h win/plat_thread.h video/video.h video/vid_svga.h video/vid_svga_render.h \ + video/vid_tkd8001_ramdac.h video/vid_tgui9440.h -vid_tkd8001_ramdac.o: ibm.h mem.h VIDEO/video.h VIDEO/vid_svga.h VIDEO/vid_tkd8001_ramdac.h +vid_tkd8001_ramdac.o: ibm.h mem.h video/video.h video/vid_svga.h video/vid_tkd8001_ramdac.h -vid_tvga.o: ibm.h io.h mem.h rom.h device.h VIDEO/video.h VIDEO/vid_svga.h VIDEO/vid_svga_render.h VIDEO/vid_tkd8001_ramdac.h \ - VIDEO/vid_tvga.h +vid_tvga.o: ibm.h io.h mem.h rom.h device.h video/video.h video/vid_svga.h video/vid_svga_render.h video/vid_tkd8001_ramdac.h \ + video/vid_tvga.h -vid_vga.o: ibm.h io.h mem.h rom.h device.h VIDEO/video.h VIDEO/vid_svga.h VIDEO/vid_vga.h +vid_vga.o: ibm.h io.h mem.h rom.h device.h video/video.h video/vid_svga.h video/vid_vga.h -vid_voodoo.o: ibm.h CPU/cpu.h mem.h rom.h pci.h timer.h device.h WIN/plat_thread.h VIDEO/video.h VIDEO/vid_svga.h \ - VIDEO/vid_voodoo.h VIDEO/vid_voodoo_dither.h VIDEO/$(VCG) +vid_voodoo.o: ibm.h cpu/cpu.h mem.h rom.h pci.h timer.h device.h win/plat_thread.h video/video.h video/vid_svga.h \ + video/vid_voodoo.h video/vid_voodoo_dither.h video/$(VCG) -vid_wy700.o: ibm.h io.h mem.h timer.h device.h VIDEO/video.h VIDEO/vid_wy700.h +vid_wy700.o: ibm.h io.h mem.h timer.h device.h video/video.h video/vid_wy700.h -video.o: ibm.h CPU/cpu.h io.h mem.h rom.h config.h device.h timer.h WIN/plat_thread.h VIDEO/video.h VIDEO/vid_svga.h \ - WIN/resource.h WIN/win.h WIN/win_cgapal.h \ - VIDEO/vid_ati18800.h VIDEO/vid_ati28800.h VIDEO/vid_ati_mach64.h VIDEO/vid_cga.h \ - VIDEO/vid_cl_ramdac.h VIDEO/vid_cl_gd.h \ - VIDEO/vid_ega.h VIDEO/vid_et4000.h VIDEO/vid_et4000w32.h VIDEO/vid_genius.h VIDEO/vid_hercules.h \ - VIDEO/vid_herculesplus.h VIDEO/vid_incolor.h VIDEO/vid_colorplus.h VIDEO/vid_mda.h \ - VIDEO/vid_nv_riva128.h \ - VIDEO/vid_olivetti_m24.h VIDEO/vid_oti067.h VIDEO/vid_paradise.h VIDEO/vid_pc1512.h VIDEO/vid_pc1640.h \ - VIDEO/vid_pc200.h VIDEO/vid_pcjr.h VIDEO/vid_ps1_svga.h VIDEO/vid_s3.h VIDEO/vid_s3_virge.h VIDEO/vid_tandy.h \ - VIDEO/vid_tandysl.h VIDEO/vid_tgui9440.h VIDEO/vid_tvga.h VIDEO/vid_vga.h VIDEO/vid_wy700.h +video.o: ibm.h cpu/cpu.h io.h mem.h rom.h config.h device.h timer.h win/plat_thread.h video/video.h video/vid_svga.h \ + win/resource.h win/win.h win/win_cgapal.h \ + video/vid_ati18800.h video/vid_ati28800.h video/vid_ati_mach64.h video/vid_cga.h \ + video/vid_cl_ramdac.h video/vid_cl_gd.h \ + video/vid_ega.h video/vid_et4000.h video/vid_et4000w32.h video/vid_genius.h video/vid_hercules.h \ + video/vid_herculesplus.h video/vid_incolor.h video/vid_colorplus.h video/vid_mda.h \ + video/vid_nv_riva128.h \ + video/vid_olivetti_m24.h video/vid_oti067.h video/vid_paradise.h video/vid_pc1512.h video/vid_pc1640.h \ + video/vid_pc200.h video/vid_pcjr.h video/vid_ps1_svga.h video/vid_s3.h video/vid_s3_virge.h video/vid_tandy.h \ + video/vid_tandysl.h video/vid_tgui9440.h video/vid_tvga.h video/vid_vga.h video/vid_wy700.h -win.o: 86box.h device.h disc.h fdd.h hdd.h ibm.h CPU/cpu.h mem.h rom.h nvr.h config.h model.h HDD/hdd_ide_at.h cdrom.h cdrom_null.h \ - cdrom_ioctl.h cdrom_image.h SCSI/scsi.h scsi_disk.h VIDEO/video.h VIDEO/vid_ega.h mouse.h SOUND/sound.h SOUND/snd_dbopl.h \ - WIN/plat_keyboard.h WIN/plat_iodev.h WIN/plat_mouse.h WIN/plat_midi.h WIN/plat_thread.h WIN/plat_ticks.h WIN/plat_ui.h \ - WIN/resource.h WIN/win.h WIN/win_cgapal.h WIN/win_ddraw.h WIN/win_d3d.h WIN/win_language.h +win.o: 86box.h device.h disc.h fdd.h hdd.h ibm.h cpu/cpu.h mem.h rom.h nvr.h config.h model.h hdd/hdd_ide_at.h cdrom.h cdrom_null.h \ + cdrom_ioctl.h cdrom_image.h scsi/scsi.h scsi_disk.h video/video.h video/vid_ega.h mouse.h sound/sound.h sound/snd_dbopl.h \ + win/plat_keyboard.h win/plat_iodev.h win/plat_mouse.h win/plat_midi.h win/plat_thread.h win/plat_ticks.h win/plat_ui.h \ + win/resource.h win/win.h win/win_cgapal.h win/win_ddraw.h win/win_d3d.h win/win_language.h -win_d3d.o: VIDEO/video.h WIN/win.h WIN/resource.h WIN/win_d3d.h WIN/win_cgapal.h +win_d3d.o: video/video.h win/win.h win/resource.h win/win_d3d.h win/win_cgapal.h -win_d3d_fs.o: 86box.h VIDEO/video.h WIN/win.h WIN/resource.h WIN/win_d3d.h WIN/win_cgapal.h +win_d3d_fs.o: 86box.h video/video.h win/win.h win/resource.h win/win_d3d.h win/win_cgapal.h -win_ddraw.o: VIDEO/video.h WIN/resource.h WIN/win_ddraw.h WIN/win_cgapal.h +win_ddraw.o: video/video.h win/resource.h win/win_ddraw.h win/win_cgapal.h -win_ddraw_fs.o: VIDEO/video.h WIN/resource.h WIN/win_ddraw.h WIN/win_cgapal.h +win_ddraw_fs.o: video/video.h win/resource.h win/win_ddraw.h win/win_cgapal.h -win_ddraw_screenshot.o: VIDEO/video.h WIN/resource.h WIN/win.h WIN/win_ddraw.h WIN/win_language.h +win_ddraw_screenshot.o: video/video.h win/resource.h win/win.h win/win_ddraw.h win/win_language.h -win_deviceconfig.o: WIN/plat_midi.h WIN/resource.h WIN/win.h WIN/win_language.h +win_deviceconfig.o: win/plat_midi.h win/resource.h win/win.h win/win_language.h -win_dynld.o: WIN/plat_dynld.h WIN/resource.h ibm.h +win_dynld.o: win/plat_dynld.h win/resource.h ibm.h -win_iodev.o: ibm.h device.h cdrom.h cdrom_image.h cdrom_ioctl.h cdrom_null.h SCSI/scsi_disk.h WIN/plat_iodev.h WIN/resource.h WIN/win.h +win_iodev.o: ibm.h device.h cdrom.h cdrom_image.h cdrom_ioctl.h cdrom_null.h scsi/scsi_disk.h win/plat_iodev.h win/resource.h win/win.h -win_joystick.o: device.h gameport.h WIN/plat_joystick.h WIN/resource.h WIN/win.h +win_joystick.o: device.h gameport.h win/plat_joystick.h win/resource.h win/win.h -win_joystickconfig.o: ibm.h config.h device.h gameport.h WIN/plat_joystick.h WIN/resource.h WIN/win.h +win_joystickconfig.o: ibm.h config.h device.h gameport.h win/plat_joystick.h win/resource.h win/win.h -win_keyboard.o: device.h WIN/plat_keyboard.h WIN/resource.h WIN/win.h +win_keyboard.o: device.h win/plat_keyboard.h win/resource.h win/win.h -win_language.o: ibm.h device.h WIN/plat_ui.h WIN/resource.h WIN/win.h WIN/win_language.h +win_language.o: ibm.h device.h win/plat_ui.h win/resource.h win/win.h win/win_language.h -win_midi.o: ibm.h config.h SOUND/midi.h WIN/plat_midi.h WIN/resource.h +win_midi.o: ibm.h config.h sound/midi.h win/plat_midi.h win/resource.h -win_mouse.o: WIN/plat_mouse.h WIN/resource.h WIN/win.h +win_mouse.o: win/plat_mouse.h win/resource.h win/win.h -win_opendir.o: ibm.h WIN/plat_dir.h WIN/resource.h +win_opendir.o: ibm.h win/plat_dir.h win/resource.h -win_serial.o: WIN/plat_thread.h WIN/plat_serial.h WIN/resource.h +win_serial.o: win/plat_thread.h win/plat_serial.h win/resource.h -win_settings.o: ibm.h mem.h CPU/cpu.h nvr.h device.h model.h cdrom.h disc.h fdd.h HDD/hdd.h HDD/hdd_ide_at.h SCSI/scsi.h NETWORK/network.h SOUND/midi.h \ - SOUND/sound.h SOUND/snd_dbopl.h SOUND/snd_mpu401.h VIDEO/video.h VIDEO/vid_voodoo.h gameport.h mouse.h WIN/plat_midi.h \ - WIN/resource.h WIN/win.h WIN/win_language.h +win_settings.o: ibm.h mem.h cpu/cpu.h nvr.h device.h model.h cdrom.h disc.h fdd.h hdd/hdd.h hdd/hdd_ide_at.h scsi/scsi.h network/network.h sound/midi.h \ + sound/sound.h sound/snd_dbopl.h sound/snd_mpu401.h video/video.h video/vid_voodoo.h gameport.h mouse.h win/plat_midi.h \ + win/resource.h win/win.h win/win_language.h -win_status.o: ibm.h mem.h CPU/x86_ops.h CPU/codegen.h device.h WIN/resource.h WIN/win.h +win_status.o: ibm.h mem.h cpu/x86_ops.h cpu/codegen.h device.h win/resource.h win/win.h -win_video.o: VIDEO/video.h WIN/resource.h WIN/win_cgapal.h +win_video.o: video/video.h win/resource.h win/win_cgapal.h # End of Makefile.mingw. diff --git a/src/acer386sx.c b/src/acer386sx.c index 8f1547313..47f0cbca8 100644 --- a/src/acer386sx.c +++ b/src/acer386sx.c @@ -2,7 +2,7 @@ see COPYING for more details */ #include "ibm.h" -#include "CPU/cpu.h" +#include "cpu/cpu.h" #include "io.h" #include "device.h" #include "model.h" diff --git a/src/ali1429.c b/src/ali1429.c index f930fea3d..7c24efcb2 100644 --- a/src/ali1429.c +++ b/src/ali1429.c @@ -3,7 +3,7 @@ */ #include #include "ibm.h" -#include "CPU/cpu.h" +#include "cpu/cpu.h" #include "io.h" #include "mem.h" #include "device.h" diff --git a/src/amstrad.c b/src/amstrad.c index e3e6e1aba..cb18923d7 100644 --- a/src/amstrad.c +++ b/src/amstrad.c @@ -1,6 +1,6 @@ #include #include "ibm.h" -#include "CPU/cpu.h" +#include "cpu/cpu.h" #include "io.h" #include "device.h" #include "model.h" diff --git a/src/cdrom.c b/src/cdrom.c index faf954680..bdee7a516 100644 --- a/src/cdrom.c +++ b/src/cdrom.c @@ -23,10 +23,10 @@ #include "cdrom.h" #include "ibm.h" #include "piix.h" -#include "SCSI/scsi.h" +#include "scsi/scsi.h" #include "timer.h" -#include "HDD/hdd_ide_at.h" -#include "WIN/plat_iodev.h" +#include "hdd/hdd_ide_at.h" +#include "win/plat_iodev.h" /* Bits of 'status' */ #define ERR_STAT 0x01 diff --git a/src/cdrom_ioctl.c b/src/cdrom_ioctl.c index 17b0fe63d..0c2c30f3e 100644 --- a/src/cdrom_ioctl.c +++ b/src/cdrom_ioctl.c @@ -24,7 +24,7 @@ #include "ibm.h" #include "cdrom.h" #include "cdrom_ioctl.h" -#include "SCSI/scsi.h" +#include "scsi/scsi.h" #define MSFtoLBA(m,s,f) ((((m*60)+s)*75)+f) diff --git a/src/compaq.c b/src/compaq.c index 8eb44c0d3..b5dae9e7b 100644 --- a/src/compaq.c +++ b/src/compaq.c @@ -2,7 +2,7 @@ see COPYING for more details */ #include "ibm.h" -#include "CPU/cpu.h" +#include "cpu/cpu.h" #include "mem.h" #include "device.h" #include "model.h" diff --git a/src/config.c b/src/config.c index 5b139755e..bb19cd8eb 100644 --- a/src/config.c +++ b/src/config.c @@ -35,28 +35,28 @@ #include "fdc.h" #include "fdd.h" #include "ibm.h" -#include "CPU/cpu.h" +#include "cpu/cpu.h" #include "gameport.h" -#include "HDD/hdd.h" -#include "HDD/hdd_ide_at.h" +#include "hdd/hdd.h" +#include "hdd/hdd_ide_at.h" #include "model.h" #include "mouse.h" #ifdef USE_NETWORK -#include "NETWORK/network.h" +#include "network/network.h" #endif #include "nvr.h" -#include "SCSI/scsi.h" -#include "WIN/plat_joystick.h" -#include "WIN/plat_midi.h" -#include "SOUND/midi.h" -#include "SOUND/snd_dbopl.h" -#include "SOUND/snd_mpu401.h" -#include "SOUND/snd_opl.h" -#include "SOUND/sound.h" -#include "VIDEO/video.h" +#include "scsi/scsi.h" +#include "win/plat_joystick.h" +#include "win/plat_midi.h" +#include "sound/midi.h" +#include "sound/snd_dbopl.h" +#include "sound/snd_mpu401.h" +#include "sound/snd_opl.h" +#include "sound/sound.h" +#include "video/video.h" -#include "WIN/win.h" -#include "WIN/win_language.h" +#include "win/win.h" +#include "win/win_language.h" wchar_t config_file_default[256]; diff --git a/src/CPU/386.c b/src/cpu/386.c similarity index 100% rename from src/CPU/386.c rename to src/cpu/386.c diff --git a/src/CPU/386.h b/src/cpu/386.h similarity index 100% rename from src/CPU/386.h rename to src/cpu/386.h diff --git a/src/CPU/386_common.h b/src/cpu/386_common.h similarity index 100% rename from src/CPU/386_common.h rename to src/cpu/386_common.h diff --git a/src/CPU/386_dynarec.c b/src/cpu/386_dynarec.c similarity index 100% rename from src/CPU/386_dynarec.c rename to src/cpu/386_dynarec.c diff --git a/src/CPU/386_dynarec_ops.c b/src/cpu/386_dynarec_ops.c similarity index 100% rename from src/CPU/386_dynarec_ops.c rename to src/cpu/386_dynarec_ops.c diff --git a/src/CPU/386_ops.h b/src/cpu/386_ops.h similarity index 100% rename from src/CPU/386_ops.h rename to src/cpu/386_ops.h diff --git a/src/CPU/808x.c b/src/cpu/808x.c similarity index 99% rename from src/CPU/808x.c rename to src/cpu/808x.c index 8b8833c7f..d948031ba 100644 --- a/src/CPU/808x.c +++ b/src/cpu/808x.c @@ -35,7 +35,7 @@ #include "../nmi.h" #include "../pic.h" #include "../timer.h" -#include "../SCSI/scsi.h" +#include "../scsi/scsi.h" int xt_cpu_multi; int nmi = 0; @@ -255,13 +255,13 @@ r16(/r) AX CX DX BX SP BP SI DI r32(/r) EAX ECX EDX EBX ESP EBP ESI EDI /digit (Opcode) 0 1 2 3 4 5 6 7 REG = 000 001 010 011 100 101 110 111 - ÚÄÄÄAddress + ����Address disp8 denotes an 8-bit displacement following the ModR/M byte, to be sign-extended and added to the index. disp16 denotes a 16-bit displacement following the ModR/M byte, to be added to the index. Default segment register is SS for the effective addresses containing a BP index, DS for other effective addresses. - ÄÄ¿ ÚMod R/M¿ ÚÄÄÄÄÄÄÄÄModR/M Values in HexadecimalÄÄÄÄÄÄÄÄ¿ + �Ŀ �Mod R/M� ���������ModR/M Values in Hexadecimal�������Ŀ [BX + SI] 000 00 08 10 18 20 28 30 38 [BX + DI] 001 01 09 11 19 21 29 31 39 diff --git a/src/CPU/codegen.c b/src/cpu/codegen.c similarity index 100% rename from src/CPU/codegen.c rename to src/cpu/codegen.c diff --git a/src/CPU/codegen.h b/src/cpu/codegen.h similarity index 100% rename from src/CPU/codegen.h rename to src/cpu/codegen.h diff --git a/src/CPU/codegen_ops.c b/src/cpu/codegen_ops.c similarity index 100% rename from src/CPU/codegen_ops.c rename to src/cpu/codegen_ops.c diff --git a/src/CPU/codegen_ops.h b/src/cpu/codegen_ops.h similarity index 100% rename from src/CPU/codegen_ops.h rename to src/cpu/codegen_ops.h diff --git a/src/CPU/codegen_ops_arith.h b/src/cpu/codegen_ops_arith.h similarity index 100% rename from src/CPU/codegen_ops_arith.h rename to src/cpu/codegen_ops_arith.h diff --git a/src/CPU/codegen_ops_fpu.h b/src/cpu/codegen_ops_fpu.h similarity index 100% rename from src/CPU/codegen_ops_fpu.h rename to src/cpu/codegen_ops_fpu.h diff --git a/src/CPU/codegen_ops_jump.h b/src/cpu/codegen_ops_jump.h similarity index 100% rename from src/CPU/codegen_ops_jump.h rename to src/cpu/codegen_ops_jump.h diff --git a/src/CPU/codegen_ops_logic.h b/src/cpu/codegen_ops_logic.h similarity index 100% rename from src/CPU/codegen_ops_logic.h rename to src/cpu/codegen_ops_logic.h diff --git a/src/CPU/codegen_ops_misc.h b/src/cpu/codegen_ops_misc.h similarity index 100% rename from src/CPU/codegen_ops_misc.h rename to src/cpu/codegen_ops_misc.h diff --git a/src/CPU/codegen_ops_mmx.h b/src/cpu/codegen_ops_mmx.h similarity index 100% rename from src/CPU/codegen_ops_mmx.h rename to src/cpu/codegen_ops_mmx.h diff --git a/src/CPU/codegen_ops_mov.h b/src/cpu/codegen_ops_mov.h similarity index 100% rename from src/CPU/codegen_ops_mov.h rename to src/cpu/codegen_ops_mov.h diff --git a/src/CPU/codegen_ops_shift.h b/src/cpu/codegen_ops_shift.h similarity index 100% rename from src/CPU/codegen_ops_shift.h rename to src/cpu/codegen_ops_shift.h diff --git a/src/CPU/codegen_ops_stack.h b/src/cpu/codegen_ops_stack.h similarity index 100% rename from src/CPU/codegen_ops_stack.h rename to src/cpu/codegen_ops_stack.h diff --git a/src/CPU/codegen_ops_x86-64.h b/src/cpu/codegen_ops_x86-64.h similarity index 100% rename from src/CPU/codegen_ops_x86-64.h rename to src/cpu/codegen_ops_x86-64.h diff --git a/src/CPU/codegen_ops_x86.h b/src/cpu/codegen_ops_x86.h similarity index 100% rename from src/CPU/codegen_ops_x86.h rename to src/cpu/codegen_ops_x86.h diff --git a/src/CPU/codegen_ops_xchg.h b/src/cpu/codegen_ops_xchg.h similarity index 100% rename from src/CPU/codegen_ops_xchg.h rename to src/cpu/codegen_ops_xchg.h diff --git a/src/CPU/codegen_timing_486.c b/src/cpu/codegen_timing_486.c similarity index 100% rename from src/CPU/codegen_timing_486.c rename to src/cpu/codegen_timing_486.c diff --git a/src/CPU/codegen_timing_686.c b/src/cpu/codegen_timing_686.c similarity index 100% rename from src/CPU/codegen_timing_686.c rename to src/cpu/codegen_timing_686.c diff --git a/src/CPU/codegen_timing_common.c b/src/cpu/codegen_timing_common.c similarity index 100% rename from src/CPU/codegen_timing_common.c rename to src/cpu/codegen_timing_common.c diff --git a/src/CPU/codegen_timing_common.h b/src/cpu/codegen_timing_common.h similarity index 100% rename from src/CPU/codegen_timing_common.h rename to src/cpu/codegen_timing_common.h diff --git a/src/CPU/codegen_timing_pentium.c b/src/cpu/codegen_timing_pentium.c similarity index 100% rename from src/CPU/codegen_timing_pentium.c rename to src/cpu/codegen_timing_pentium.c diff --git a/src/CPU/codegen_timing_winchip.c b/src/cpu/codegen_timing_winchip.c similarity index 100% rename from src/CPU/codegen_timing_winchip.c rename to src/cpu/codegen_timing_winchip.c diff --git a/src/CPU/codegen_x86-64.c b/src/cpu/codegen_x86-64.c similarity index 100% rename from src/CPU/codegen_x86-64.c rename to src/cpu/codegen_x86-64.c diff --git a/src/CPU/codegen_x86-64.h b/src/cpu/codegen_x86-64.h similarity index 100% rename from src/CPU/codegen_x86-64.h rename to src/cpu/codegen_x86-64.h diff --git a/src/CPU/codegen_x86.c b/src/cpu/codegen_x86.c similarity index 100% rename from src/CPU/codegen_x86.c rename to src/cpu/codegen_x86.c diff --git a/src/CPU/codegen_x86.h b/src/cpu/codegen_x86.h similarity index 100% rename from src/CPU/codegen_x86.h rename to src/cpu/codegen_x86.h diff --git a/src/CPU/cpu.c b/src/cpu/cpu.c similarity index 100% rename from src/CPU/cpu.c rename to src/cpu/cpu.c diff --git a/src/CPU/cpu.h b/src/cpu/cpu.h similarity index 100% rename from src/CPU/cpu.h rename to src/cpu/cpu.h diff --git a/src/CPU/x86.h b/src/cpu/x86.h similarity index 100% rename from src/CPU/x86.h rename to src/cpu/x86.h diff --git a/src/CPU/x86_flags.h b/src/cpu/x86_flags.h similarity index 100% rename from src/CPU/x86_flags.h rename to src/cpu/x86_flags.h diff --git a/src/CPU/x86_ops.h b/src/cpu/x86_ops.h similarity index 100% rename from src/CPU/x86_ops.h rename to src/cpu/x86_ops.h diff --git a/src/CPU/x86_ops_arith.h b/src/cpu/x86_ops_arith.h similarity index 100% rename from src/CPU/x86_ops_arith.h rename to src/cpu/x86_ops_arith.h diff --git a/src/CPU/x86_ops_atomic.h b/src/cpu/x86_ops_atomic.h similarity index 100% rename from src/CPU/x86_ops_atomic.h rename to src/cpu/x86_ops_atomic.h diff --git a/src/CPU/x86_ops_bcd.h b/src/cpu/x86_ops_bcd.h similarity index 100% rename from src/CPU/x86_ops_bcd.h rename to src/cpu/x86_ops_bcd.h diff --git a/src/CPU/x86_ops_bit.h b/src/cpu/x86_ops_bit.h similarity index 100% rename from src/CPU/x86_ops_bit.h rename to src/cpu/x86_ops_bit.h diff --git a/src/CPU/x86_ops_bitscan.h b/src/cpu/x86_ops_bitscan.h similarity index 100% rename from src/CPU/x86_ops_bitscan.h rename to src/cpu/x86_ops_bitscan.h diff --git a/src/CPU/x86_ops_call.h b/src/cpu/x86_ops_call.h similarity index 100% rename from src/CPU/x86_ops_call.h rename to src/cpu/x86_ops_call.h diff --git a/src/CPU/x86_ops_flag.h b/src/cpu/x86_ops_flag.h similarity index 100% rename from src/CPU/x86_ops_flag.h rename to src/cpu/x86_ops_flag.h diff --git a/src/CPU/x86_ops_fpu.h b/src/cpu/x86_ops_fpu.h similarity index 100% rename from src/CPU/x86_ops_fpu.h rename to src/cpu/x86_ops_fpu.h diff --git a/src/CPU/x86_ops_i686.h b/src/cpu/x86_ops_i686.h similarity index 100% rename from src/CPU/x86_ops_i686.h rename to src/cpu/x86_ops_i686.h diff --git a/src/CPU/x86_ops_inc_dec.h b/src/cpu/x86_ops_inc_dec.h similarity index 100% rename from src/CPU/x86_ops_inc_dec.h rename to src/cpu/x86_ops_inc_dec.h diff --git a/src/CPU/x86_ops_int.h b/src/cpu/x86_ops_int.h similarity index 100% rename from src/CPU/x86_ops_int.h rename to src/cpu/x86_ops_int.h diff --git a/src/CPU/x86_ops_io.h b/src/cpu/x86_ops_io.h similarity index 100% rename from src/CPU/x86_ops_io.h rename to src/cpu/x86_ops_io.h diff --git a/src/CPU/x86_ops_jump.h b/src/cpu/x86_ops_jump.h similarity index 100% rename from src/CPU/x86_ops_jump.h rename to src/cpu/x86_ops_jump.h diff --git a/src/CPU/x86_ops_misc.h b/src/cpu/x86_ops_misc.h similarity index 100% rename from src/CPU/x86_ops_misc.h rename to src/cpu/x86_ops_misc.h diff --git a/src/CPU/x86_ops_mmx.h b/src/cpu/x86_ops_mmx.h similarity index 100% rename from src/CPU/x86_ops_mmx.h rename to src/cpu/x86_ops_mmx.h diff --git a/src/CPU/x86_ops_mmx_arith.h b/src/cpu/x86_ops_mmx_arith.h similarity index 100% rename from src/CPU/x86_ops_mmx_arith.h rename to src/cpu/x86_ops_mmx_arith.h diff --git a/src/CPU/x86_ops_mmx_cmp.h b/src/cpu/x86_ops_mmx_cmp.h similarity index 100% rename from src/CPU/x86_ops_mmx_cmp.h rename to src/cpu/x86_ops_mmx_cmp.h diff --git a/src/CPU/x86_ops_mmx_logic.h b/src/cpu/x86_ops_mmx_logic.h similarity index 100% rename from src/CPU/x86_ops_mmx_logic.h rename to src/cpu/x86_ops_mmx_logic.h diff --git a/src/CPU/x86_ops_mmx_mov.h b/src/cpu/x86_ops_mmx_mov.h similarity index 100% rename from src/CPU/x86_ops_mmx_mov.h rename to src/cpu/x86_ops_mmx_mov.h diff --git a/src/CPU/x86_ops_mmx_pack.h b/src/cpu/x86_ops_mmx_pack.h similarity index 100% rename from src/CPU/x86_ops_mmx_pack.h rename to src/cpu/x86_ops_mmx_pack.h diff --git a/src/CPU/x86_ops_mmx_shift.h b/src/cpu/x86_ops_mmx_shift.h similarity index 100% rename from src/CPU/x86_ops_mmx_shift.h rename to src/cpu/x86_ops_mmx_shift.h diff --git a/src/CPU/x86_ops_mov.h b/src/cpu/x86_ops_mov.h similarity index 100% rename from src/CPU/x86_ops_mov.h rename to src/cpu/x86_ops_mov.h diff --git a/src/CPU/x86_ops_mov_ctrl.h b/src/cpu/x86_ops_mov_ctrl.h similarity index 100% rename from src/CPU/x86_ops_mov_ctrl.h rename to src/cpu/x86_ops_mov_ctrl.h diff --git a/src/CPU/x86_ops_mov_seg.h b/src/cpu/x86_ops_mov_seg.h similarity index 100% rename from src/CPU/x86_ops_mov_seg.h rename to src/cpu/x86_ops_mov_seg.h diff --git a/src/CPU/x86_ops_movx.h b/src/cpu/x86_ops_movx.h similarity index 100% rename from src/CPU/x86_ops_movx.h rename to src/cpu/x86_ops_movx.h diff --git a/src/CPU/x86_ops_msr.h b/src/cpu/x86_ops_msr.h similarity index 100% rename from src/CPU/x86_ops_msr.h rename to src/cpu/x86_ops_msr.h diff --git a/src/CPU/x86_ops_mul.h b/src/cpu/x86_ops_mul.h similarity index 100% rename from src/CPU/x86_ops_mul.h rename to src/cpu/x86_ops_mul.h diff --git a/src/CPU/x86_ops_pmode.h b/src/cpu/x86_ops_pmode.h similarity index 100% rename from src/CPU/x86_ops_pmode.h rename to src/cpu/x86_ops_pmode.h diff --git a/src/CPU/x86_ops_prefix.h b/src/cpu/x86_ops_prefix.h similarity index 100% rename from src/CPU/x86_ops_prefix.h rename to src/cpu/x86_ops_prefix.h diff --git a/src/CPU/x86_ops_rep.h b/src/cpu/x86_ops_rep.h similarity index 100% rename from src/CPU/x86_ops_rep.h rename to src/cpu/x86_ops_rep.h diff --git a/src/CPU/x86_ops_ret.h b/src/cpu/x86_ops_ret.h similarity index 100% rename from src/CPU/x86_ops_ret.h rename to src/cpu/x86_ops_ret.h diff --git a/src/CPU/x86_ops_set.h b/src/cpu/x86_ops_set.h similarity index 100% rename from src/CPU/x86_ops_set.h rename to src/cpu/x86_ops_set.h diff --git a/src/CPU/x86_ops_shift.h b/src/cpu/x86_ops_shift.h similarity index 100% rename from src/CPU/x86_ops_shift.h rename to src/cpu/x86_ops_shift.h diff --git a/src/CPU/x86_ops_stack.h b/src/cpu/x86_ops_stack.h similarity index 100% rename from src/CPU/x86_ops_stack.h rename to src/cpu/x86_ops_stack.h diff --git a/src/CPU/x86_ops_string.h b/src/cpu/x86_ops_string.h similarity index 100% rename from src/CPU/x86_ops_string.h rename to src/cpu/x86_ops_string.h diff --git a/src/CPU/x86_ops_xchg.h b/src/cpu/x86_ops_xchg.h similarity index 100% rename from src/CPU/x86_ops_xchg.h rename to src/cpu/x86_ops_xchg.h diff --git a/src/CPU/x86seg.c b/src/cpu/x86seg.c similarity index 100% rename from src/CPU/x86seg.c rename to src/cpu/x86seg.c diff --git a/src/CPU/x86seg.h b/src/cpu/x86seg.h similarity index 100% rename from src/CPU/x86seg.h rename to src/cpu/x86seg.h diff --git a/src/CPU/x87.c b/src/cpu/x87.c similarity index 100% rename from src/CPU/x87.c rename to src/cpu/x87.c diff --git a/src/CPU/x87.h b/src/cpu/x87.h similarity index 100% rename from src/CPU/x87.h rename to src/cpu/x87.h diff --git a/src/CPU/x87_ops.h b/src/cpu/x87_ops.h similarity index 100% rename from src/CPU/x87_ops.h rename to src/cpu/x87_ops.h diff --git a/src/CPU/x87_ops_arith.h b/src/cpu/x87_ops_arith.h similarity index 100% rename from src/CPU/x87_ops_arith.h rename to src/cpu/x87_ops_arith.h diff --git a/src/CPU/x87_ops_loadstore.h b/src/cpu/x87_ops_loadstore.h similarity index 100% rename from src/CPU/x87_ops_loadstore.h rename to src/cpu/x87_ops_loadstore.h diff --git a/src/CPU/x87_ops_misc.h b/src/cpu/x87_ops_misc.h similarity index 100% rename from src/CPU/x87_ops_misc.h rename to src/cpu/x87_ops_misc.h diff --git a/src/device.c b/src/device.c index 3d60d33b4..5f0d50121 100644 --- a/src/device.c +++ b/src/device.c @@ -17,11 +17,11 @@ * Copyright 2016,2017 Miran Grca. */ #include "ibm.h" -#include "CPU/cpu.h" +#include "cpu/cpu.h" #include "config.h" #include "device.h" #include "model.h" -#include "SOUND/sound.h" +#include "sound/sound.h" #define DEVICE_MAX 256 /* max # of devices */ diff --git a/src/disc_86f.c b/src/disc_86f.c index dd2016591..99fc9a9c5 100644 --- a/src/disc_86f.c +++ b/src/disc_86f.c @@ -24,7 +24,7 @@ #include #include -#include "LZF/lzf.h" +#include "lzf/lzf.h" #include "config.h" #include "dma.h" diff --git a/src/dma.c b/src/dma.c index 9350d0197..1f7d73203 100644 --- a/src/dma.c +++ b/src/dma.c @@ -16,7 +16,7 @@ * Copyright 2016-2017 Miran Grca. */ #include "ibm.h" -#include "CPU/x86.h" +#include "cpu/x86.h" #include "mem.h" #include "io.h" #include "dma.h" diff --git a/src/fdc37c665.c b/src/fdc37c665.c index 60d198565..62d8b0e28 100644 --- a/src/fdc37c665.c +++ b/src/fdc37c665.c @@ -22,7 +22,7 @@ #include "io.h" #include "lpt.h" #include "serial.h" -#include "HDD/hdd_ide_at.h" +#include "hdd/hdd_ide_at.h" #include "fdc37c665.h" static uint8_t fdc37c665_lock[2]; diff --git a/src/fdc37c669.c b/src/fdc37c669.c index 1074573af..2fe23280f 100644 --- a/src/fdc37c669.c +++ b/src/fdc37c669.c @@ -20,7 +20,7 @@ #include "io.h" #include "lpt.h" #include "serial.h" -#include "HDD/hdd_ide_at.h" +#include "hdd/hdd_ide_at.h" #include "fdc37c669.h" static int fdc37c669_locked; diff --git a/src/fdc37c932fr.c b/src/fdc37c932fr.c index 37c81b419..f85fff22f 100644 --- a/src/fdc37c932fr.c +++ b/src/fdc37c932fr.c @@ -20,7 +20,7 @@ #include "io.h" #include "lpt.h" #include "serial.h" -#include "HDD/hdd_ide_at.h" +#include "hdd/hdd_ide_at.h" #include "fdc37c932fr.h" static int fdc37c932fr_locked; diff --git a/src/gameport.c b/src/gameport.c index 7de6913a1..7cb0e0142 100644 --- a/src/gameport.c +++ b/src/gameport.c @@ -4,7 +4,7 @@ #include #include #include "ibm.h" -#include "CPU/cpu.h" +#include "cpu/cpu.h" #include "device.h" #include "io.h" #include "timer.h" diff --git a/src/H b/src/h similarity index 100% rename from src/H rename to src/h diff --git a/src/HDD/hdd.c b/src/hdd/hdd.c similarity index 99% rename from src/HDD/hdd.c rename to src/hdd/hdd.c index 0caadd6b5..81b64de59 100644 --- a/src/HDD/hdd.c +++ b/src/hdd/hdd.c @@ -1,5 +1,5 @@ #include "../ibm.h" -#include "../CPU/cpu.h" +#include "../cpu/cpu.h" #include "../device.h" #include "../model.h" diff --git a/src/HDD/hdd.h b/src/hdd/hdd.h similarity index 100% rename from src/HDD/hdd.h rename to src/hdd/hdd.h diff --git a/src/HDD/hdd_esdi_at.c b/src/hdd/hdd_esdi_at.c similarity index 100% rename from src/HDD/hdd_esdi_at.c rename to src/hdd/hdd_esdi_at.c diff --git a/src/HDD/hdd_esdi_at.h b/src/hdd/hdd_esdi_at.h similarity index 100% rename from src/HDD/hdd_esdi_at.h rename to src/hdd/hdd_esdi_at.h diff --git a/src/HDD/hdd_esdi_mca.c b/src/hdd/hdd_esdi_mca.c similarity index 100% rename from src/HDD/hdd_esdi_mca.c rename to src/hdd/hdd_esdi_mca.c diff --git a/src/HDD/hdd_esdi_mca.h b/src/hdd/hdd_esdi_mca.h similarity index 100% rename from src/HDD/hdd_esdi_mca.h rename to src/hdd/hdd_esdi_mca.h diff --git a/src/HDD/hdd_ide_at.c b/src/hdd/hdd_ide_at.c similarity index 99% rename from src/HDD/hdd_ide_at.c rename to src/hdd/hdd_ide_at.c index 13ec7cd1b..0544d8610 100644 --- a/src/HDD/hdd_ide_at.c +++ b/src/hdd/hdd_ide_at.c @@ -30,7 +30,7 @@ #include "../pic.h" #include "../timer.h" #include "../cdrom.h" -#include "../SCSI/scsi.h" +#include "../scsi/scsi.h" #include "hdd_ide_at.h" /* Bits of 'atastat' */ diff --git a/src/HDD/hdd_ide_at.h b/src/hdd/hdd_ide_at.h similarity index 100% rename from src/HDD/hdd_ide_at.h rename to src/hdd/hdd_ide_at.h diff --git a/src/HDD/hdd_ide_xt.c b/src/hdd/hdd_ide_xt.c similarity index 100% rename from src/HDD/hdd_ide_xt.c rename to src/hdd/hdd_ide_xt.c diff --git a/src/HDD/hdd_ide_xt.h b/src/hdd/hdd_ide_xt.h similarity index 100% rename from src/HDD/hdd_ide_xt.h rename to src/hdd/hdd_ide_xt.h diff --git a/src/HDD/hdd_image.c b/src/hdd/hdd_image.c similarity index 100% rename from src/HDD/hdd_image.c rename to src/hdd/hdd_image.c diff --git a/src/HDD/hdd_image.h b/src/hdd/hdd_image.h similarity index 100% rename from src/HDD/hdd_image.h rename to src/hdd/hdd_image.h diff --git a/src/HDD/hdd_mfm_at.c b/src/hdd/hdd_mfm_at.c similarity index 100% rename from src/HDD/hdd_mfm_at.c rename to src/hdd/hdd_mfm_at.c diff --git a/src/HDD/hdd_mfm_at.h b/src/hdd/hdd_mfm_at.h similarity index 100% rename from src/HDD/hdd_mfm_at.h rename to src/hdd/hdd_mfm_at.h diff --git a/src/HDD/hdd_mfm_xebec.c b/src/hdd/hdd_mfm_xebec.c similarity index 100% rename from src/HDD/hdd_mfm_xebec.c rename to src/hdd/hdd_mfm_xebec.c diff --git a/src/HDD/hdd_mfm_xebec.h b/src/hdd/hdd_mfm_xebec.h similarity index 100% rename from src/HDD/hdd_mfm_xebec.h rename to src/hdd/hdd_mfm_xebec.h diff --git a/src/headland.c b/src/headland.c index ef5efb2bc..a80c1b876 100644 --- a/src/headland.c +++ b/src/headland.c @@ -2,7 +2,7 @@ see COPYING for more details */ #include "ibm.h" -#include "CPU/cpu.h" +#include "cpu/cpu.h" #include "io.h" #include "mem.h" #include "device.h" diff --git a/src/i430fx.c b/src/i430fx.c index fa9a8cb23..d56f06bd9 100644 --- a/src/i430fx.c +++ b/src/i430fx.c @@ -17,7 +17,7 @@ */ #include #include "ibm.h" -#include "CPU/cpu.h" +#include "cpu/cpu.h" #include "mem.h" #include "pci.h" #include "device.h" diff --git a/src/i430hx.c b/src/i430hx.c index f7412453a..860d9a814 100644 --- a/src/i430hx.c +++ b/src/i430hx.c @@ -17,7 +17,7 @@ */ #include #include "ibm.h" -#include "CPU/cpu.h" +#include "cpu/cpu.h" #include "io.h" #include "mem.h" #include "pci.h" diff --git a/src/i430lx.c b/src/i430lx.c index 935c9e6e7..8c4cb64ff 100644 --- a/src/i430lx.c +++ b/src/i430lx.c @@ -17,7 +17,7 @@ */ #include #include "ibm.h" -#include "CPU/cpu.h" +#include "cpu/cpu.h" #include "mem.h" #include "pci.h" #include "device.h" diff --git a/src/i430nx.c b/src/i430nx.c index 5ddd0df9f..0322edfb2 100644 --- a/src/i430nx.c +++ b/src/i430nx.c @@ -17,7 +17,7 @@ */ #include #include "ibm.h" -#include "CPU/cpu.h" +#include "cpu/cpu.h" #include "mem.h" #include "pci.h" #include "device.h" diff --git a/src/i430vx.c b/src/i430vx.c index 0e5c50117..8b39d09de 100644 --- a/src/i430vx.c +++ b/src/i430vx.c @@ -17,7 +17,7 @@ */ #include #include "ibm.h" -#include "CPU/cpu.h" +#include "cpu/cpu.h" #include "io.h" #include "mem.h" #include "pci.h" diff --git a/src/i440fx.c b/src/i440fx.c index bedcde6df..d47175a48 100644 --- a/src/i440fx.c +++ b/src/i440fx.c @@ -17,7 +17,7 @@ */ #include #include "ibm.h" -#include "CPU/cpu.h" +#include "cpu/cpu.h" #include "io.h" #include "mem.h" #include "pci.h" diff --git a/src/intel.c b/src/intel.c index 89d5d6b5b..01560852f 100644 --- a/src/intel.c +++ b/src/intel.c @@ -2,7 +2,7 @@ see COPYING for more details */ #include "ibm.h" -#include "CPU/cpu.h" +#include "cpu/cpu.h" #include "io.h" #include "mem.h" #include "pit.h" diff --git a/src/intel_flash.c b/src/intel_flash.c index 51d37897d..cc215ff90 100644 --- a/src/intel_flash.c +++ b/src/intel_flash.c @@ -18,7 +18,7 @@ #include #include "ibm.h" -#include "CPU/cpu.h" +#include "cpu/cpu.h" #include "device.h" #include "mem.h" #include "model.h" diff --git a/src/jim.c b/src/jim.c index 3b8465bae..f15cf07af 100644 --- a/src/jim.c +++ b/src/jim.c @@ -4,7 +4,7 @@ #include #include #include "ibm.h" -#include "CPU/cpu.h" +#include "cpu/cpu.h" #include "io.h" #include "device.h" #include "jim.h" diff --git a/src/keyboard_amstrad.c b/src/keyboard_amstrad.c index 42de0b029..96273fa20 100644 --- a/src/keyboard_amstrad.c +++ b/src/keyboard_amstrad.c @@ -8,8 +8,8 @@ #include "pic.h" #include "pit.h" #include "timer.h" -#include "SOUND/sound.h" -#include "SOUND/snd_speaker.h" +#include "sound/sound.h" +#include "sound/snd_speaker.h" #include "keyboard.h" #include "keyboard_amstrad.h" diff --git a/src/keyboard_at.c b/src/keyboard_at.c index 4af50ece7..99727bcc9 100644 --- a/src/keyboard_at.c +++ b/src/keyboard_at.c @@ -24,8 +24,8 @@ #include "timer.h" #include "disc.h" #include "fdc.h" -#include "SOUND/sound.h" -#include "SOUND/snd_speaker.h" +#include "sound/sound.h" +#include "sound/snd_speaker.h" #include "keyboard.h" #include "keyboard_at.h" diff --git a/src/keyboard_olim24.c b/src/keyboard_olim24.c index 16aacc041..3923483bf 100644 --- a/src/keyboard_olim24.c +++ b/src/keyboard_olim24.c @@ -6,8 +6,8 @@ #include "pit.h" #include "timer.h" #include "mouse.h" -#include "SOUND/sound.h" -#include "SOUND/snd_speaker.h" +#include "sound/sound.h" +#include "sound/snd_speaker.h" #include "keyboard.h" #include "keyboard_olim24.h" diff --git a/src/keyboard_pcjr.c b/src/keyboard_pcjr.c index e052a3a70..682c84ce7 100644 --- a/src/keyboard_pcjr.c +++ b/src/keyboard_pcjr.c @@ -10,9 +10,9 @@ #include "pit.h" #include "timer.h" #include "device.h" -#include "SOUND/sound.h" -#include "SOUND/snd_speaker.h" -#include "SOUND/snd_sn76489.h" +#include "sound/sound.h" +#include "sound/snd_speaker.h" +#include "sound/snd_sn76489.h" #include "keyboard.h" #include "keyboard_pcjr.h" diff --git a/src/keyboard_xt.c b/src/keyboard_xt.c index 58d31399e..e0784e1c4 100644 --- a/src/keyboard_xt.c +++ b/src/keyboard_xt.c @@ -10,8 +10,8 @@ #include "timer.h" #include "device.h" #include "tandy_eeprom.h" -#include "SOUND/sound.h" -#include "SOUND/Snd_speaker.h" +#include "sound/sound.h" +#include "sound/snd_speaker.h" #include "keyboard.h" #include "keyboard_xt.h" diff --git a/src/laserxt.c b/src/laserxt.c index da9a5695d..33afbce37 100644 --- a/src/laserxt.c +++ b/src/laserxt.c @@ -1,6 +1,6 @@ /*This is the chipset used in the LaserXT series model*/ #include "ibm.h" -#include "CPU/cpu.h" +#include "cpu/cpu.h" #include "io.h" #include "mem.h" #include "device.h" diff --git a/src/mem.c b/src/mem.c index a7170ae5f..7634c3622 100644 --- a/src/mem.c +++ b/src/mem.c @@ -10,15 +10,15 @@ #include #include #include "ibm.h" -#include "CPU/cpu.h" -#include "CPU/x86_ops.h" -#include "CPU/x86.h" +#include "cpu/cpu.h" +#include "cpu/x86_ops.h" +#include "cpu/x86.h" #include "config.h" #include "io.h" #include "mem.h" #include "rom.h" -#include "CPU/codegen.h" -#include "VIDEO/video.h" +#include "cpu/codegen.h" +#include "video/video.h" page_t *pages; diff --git a/src/model.c b/src/model.c index 45c1c8722..cd60ed9b6 100644 --- a/src/model.c +++ b/src/model.c @@ -18,7 +18,7 @@ #include #include #include "ibm.h" -#include "CPU/cpu.h" +#include "cpu/cpu.h" #include "io.h" #include "mem.h" #include "rom.h" @@ -35,7 +35,7 @@ #include "fdc37c932fr.h" #include "gameport.h" #include "i82335.h" -#include "HDD/hdd_ide_at.h" +#include "hdd/hdd_ide_at.h" #include "intel.h" #include "intel_flash.h" #include "keyboard_amstrad.h" @@ -57,20 +57,20 @@ #include "serial.h" #include "sis85c471.h" #include "sio.h" -#include "SOUND/snd_ps1.h" -#include "SOUND/snd_pssj.h" -#include "SOUND/snd_sn76489.h" +#include "sound/snd_ps1.h" +#include "sound/snd_pssj.h" +#include "sound/snd_sn76489.h" #if 0 #include "superio_detect.h" #endif #include "tandy_eeprom.h" #include "tandy_rom.h" #include "um8669f.h" -#include "VIDEO/vid_pcjr.h" -#include "VIDEO/vid_tandy.h" +#include "video/vid_pcjr.h" +#include "video/vid_tandy.h" #include "w83877f.h" #include "wd76c10.h" -#include "HDD/hdd_ide_xt.h" +#include "hdd/hdd_ide_xt.h" #include "bugger.h" diff --git a/src/mouse.c b/src/mouse.c index 5b1747197..338f219e8 100644 --- a/src/mouse.c +++ b/src/mouse.c @@ -18,7 +18,7 @@ * Copyright 2016-2017 Miran Grca. */ #include "ibm.h" -#include "CPU/cpu.h" +#include "cpu/cpu.h" #include "device.h" #include "mouse.h" #include "model.h" diff --git a/src/neat.c b/src/neat.c index a8feb6f05..85063e591 100644 --- a/src/neat.c +++ b/src/neat.c @@ -3,7 +3,7 @@ */ /*This is the chipset used in the AMI 286 clone model*/ #include "ibm.h" -#include "CPU/cpu.h" +#include "cpu/cpu.h" #include "io.h" #include "device.h" #include "model.h" diff --git a/src/NETWORK/bswap.h b/src/network/bswap.h similarity index 100% rename from src/NETWORK/bswap.h rename to src/network/bswap.h diff --git a/src/NETWORK/net_ne2000.c b/src/network/net_ne2000.c similarity index 100% rename from src/NETWORK/net_ne2000.c rename to src/network/net_ne2000.c diff --git a/src/NETWORK/net_ne2000.h b/src/network/net_ne2000.h similarity index 100% rename from src/NETWORK/net_ne2000.h rename to src/network/net_ne2000.h diff --git a/src/NETWORK/net_pcap.c b/src/network/net_pcap.c similarity index 99% rename from src/NETWORK/net_pcap.c rename to src/network/net_pcap.c index 21e2bac56..f7e3ebf9d 100644 --- a/src/NETWORK/net_pcap.c +++ b/src/network/net_pcap.c @@ -21,8 +21,8 @@ #include "../config.h" #include "../device.h" #include "network.h" -#include "../WIN/plat_dynld.h" -#include "../WIN/plat_thread.h" +#include "../win/plat_dynld.h" +#include "../win/plat_thread.h" static void *pcap_handle; /* handle to WinPcap DLL */ diff --git a/src/NETWORK/net_slirp.c b/src/network/net_slirp.c similarity index 98% rename from src/NETWORK/net_slirp.c rename to src/network/net_slirp.c index 16f74c3f4..473a50d88 100644 --- a/src/NETWORK/net_slirp.c +++ b/src/network/net_slirp.c @@ -16,13 +16,13 @@ #include #include #include -#include "SLIRP/slirp.h" -#include "SLIRP/queue.h" +#include "slirp/slirp.h" +#include "slirp/queue.h" #include "../ibm.h" #include "../config.h" #include "../device.h" #include "network.h" -#include "../WIN/plat_thread.h" +#include "../win/plat_thread.h" static queueADT slirpq; /* SLiRP library handle */ diff --git a/src/NETWORK/network.c b/src/network/network.c similarity index 99% rename from src/NETWORK/network.c rename to src/network/network.c index d475aea0c..03f781c88 100644 --- a/src/NETWORK/network.c +++ b/src/network/network.c @@ -24,7 +24,7 @@ #include "../device.h" #include "network.h" #include "net_ne2000.h" -#include "../WIN/plat_ui.h" +#include "../win/plat_ui.h" static netcard_t net_cards[] = { diff --git a/src/NETWORK/network.h b/src/network/network.h similarity index 100% rename from src/NETWORK/network.h rename to src/network/network.h diff --git a/src/NETWORK/pcap_if.c b/src/network/pcap_if.c similarity index 100% rename from src/NETWORK/pcap_if.c rename to src/network/pcap_if.c diff --git a/src/NETWORK/slirp/COPYRIGHT.txt b/src/network/slirp/COPYRIGHT.txt similarity index 100% rename from src/NETWORK/slirp/COPYRIGHT.txt rename to src/network/slirp/COPYRIGHT.txt diff --git a/src/NETWORK/slirp/VERSION.txt b/src/network/slirp/VERSION.txt similarity index 100% rename from src/NETWORK/slirp/VERSION.txt rename to src/network/slirp/VERSION.txt diff --git a/src/NETWORK/slirp/bootp.c b/src/network/slirp/bootp.c similarity index 100% rename from src/NETWORK/slirp/bootp.c rename to src/network/slirp/bootp.c diff --git a/src/NETWORK/slirp/bootp.h b/src/network/slirp/bootp.h similarity index 100% rename from src/NETWORK/slirp/bootp.h rename to src/network/slirp/bootp.h diff --git a/src/NETWORK/slirp/cksum.c b/src/network/slirp/cksum.c similarity index 100% rename from src/NETWORK/slirp/cksum.c rename to src/network/slirp/cksum.c diff --git a/src/NETWORK/slirp/config-host.h b/src/network/slirp/config-host.h similarity index 100% rename from src/NETWORK/slirp/config-host.h rename to src/network/slirp/config-host.h diff --git a/src/NETWORK/slirp/config.h b/src/network/slirp/config.h similarity index 100% rename from src/NETWORK/slirp/config.h rename to src/network/slirp/config.h diff --git a/src/NETWORK/slirp/ctl.h b/src/network/slirp/ctl.h similarity index 100% rename from src/NETWORK/slirp/ctl.h rename to src/network/slirp/ctl.h diff --git a/src/NETWORK/slirp/debug.c b/src/network/slirp/debug.c similarity index 100% rename from src/NETWORK/slirp/debug.c rename to src/network/slirp/debug.c diff --git a/src/NETWORK/slirp/debug.h b/src/network/slirp/debug.h similarity index 100% rename from src/NETWORK/slirp/debug.h rename to src/network/slirp/debug.h diff --git a/src/NETWORK/slirp/icmp_var.h b/src/network/slirp/icmp_var.h similarity index 100% rename from src/NETWORK/slirp/icmp_var.h rename to src/network/slirp/icmp_var.h diff --git a/src/NETWORK/slirp/if.c b/src/network/slirp/if.c similarity index 100% rename from src/NETWORK/slirp/if.c rename to src/network/slirp/if.c diff --git a/src/NETWORK/slirp/if.h b/src/network/slirp/if.h similarity index 100% rename from src/NETWORK/slirp/if.h rename to src/network/slirp/if.h diff --git a/src/NETWORK/slirp/ip.h b/src/network/slirp/ip.h similarity index 100% rename from src/NETWORK/slirp/ip.h rename to src/network/slirp/ip.h diff --git a/src/NETWORK/slirp/ip_icmp.c b/src/network/slirp/ip_icmp.c similarity index 100% rename from src/NETWORK/slirp/ip_icmp.c rename to src/network/slirp/ip_icmp.c diff --git a/src/NETWORK/slirp/ip_icmp.h b/src/network/slirp/ip_icmp.h similarity index 100% rename from src/NETWORK/slirp/ip_icmp.h rename to src/network/slirp/ip_icmp.h diff --git a/src/NETWORK/slirp/ip_input.c b/src/network/slirp/ip_input.c similarity index 100% rename from src/NETWORK/slirp/ip_input.c rename to src/network/slirp/ip_input.c diff --git a/src/NETWORK/slirp/ip_output.c b/src/network/slirp/ip_output.c similarity index 100% rename from src/NETWORK/slirp/ip_output.c rename to src/network/slirp/ip_output.c diff --git a/src/NETWORK/slirp/libslirp.h b/src/network/slirp/libslirp.h similarity index 100% rename from src/NETWORK/slirp/libslirp.h rename to src/network/slirp/libslirp.h diff --git a/src/NETWORK/slirp/main.h b/src/network/slirp/main.h similarity index 100% rename from src/NETWORK/slirp/main.h rename to src/network/slirp/main.h diff --git a/src/NETWORK/slirp/mbuf.c b/src/network/slirp/mbuf.c similarity index 100% rename from src/NETWORK/slirp/mbuf.c rename to src/network/slirp/mbuf.c diff --git a/src/NETWORK/slirp/mbuf.h b/src/network/slirp/mbuf.h similarity index 100% rename from src/NETWORK/slirp/mbuf.h rename to src/network/slirp/mbuf.h diff --git a/src/NETWORK/slirp/misc.c b/src/network/slirp/misc.c similarity index 100% rename from src/NETWORK/slirp/misc.c rename to src/network/slirp/misc.c diff --git a/src/NETWORK/slirp/misc.h b/src/network/slirp/misc.h similarity index 100% rename from src/NETWORK/slirp/misc.h rename to src/network/slirp/misc.h diff --git a/src/NETWORK/slirp/queue.c b/src/network/slirp/queue.c similarity index 100% rename from src/NETWORK/slirp/queue.c rename to src/network/slirp/queue.c diff --git a/src/NETWORK/slirp/queue.h b/src/network/slirp/queue.h similarity index 100% rename from src/NETWORK/slirp/queue.h rename to src/network/slirp/queue.h diff --git a/src/NETWORK/slirp/sbuf.c b/src/network/slirp/sbuf.c similarity index 100% rename from src/NETWORK/slirp/sbuf.c rename to src/network/slirp/sbuf.c diff --git a/src/NETWORK/slirp/sbuf.h b/src/network/slirp/sbuf.h similarity index 100% rename from src/NETWORK/slirp/sbuf.h rename to src/network/slirp/sbuf.h diff --git a/src/NETWORK/slirp/slirp.c b/src/network/slirp/slirp.c similarity index 100% rename from src/NETWORK/slirp/slirp.c rename to src/network/slirp/slirp.c diff --git a/src/NETWORK/slirp/slirp.h b/src/network/slirp/slirp.h similarity index 100% rename from src/NETWORK/slirp/slirp.h rename to src/network/slirp/slirp.h diff --git a/src/NETWORK/slirp/slirp_config.h b/src/network/slirp/slirp_config.h similarity index 100% rename from src/NETWORK/slirp/slirp_config.h rename to src/network/slirp/slirp_config.h diff --git a/src/NETWORK/slirp/socket.c b/src/network/slirp/socket.c similarity index 100% rename from src/NETWORK/slirp/socket.c rename to src/network/slirp/socket.c diff --git a/src/NETWORK/slirp/socket.h b/src/network/slirp/socket.h similarity index 100% rename from src/NETWORK/slirp/socket.h rename to src/network/slirp/socket.h diff --git a/src/NETWORK/slirp/tcp.h b/src/network/slirp/tcp.h similarity index 100% rename from src/NETWORK/slirp/tcp.h rename to src/network/slirp/tcp.h diff --git a/src/NETWORK/slirp/tcp_input.c b/src/network/slirp/tcp_input.c similarity index 100% rename from src/NETWORK/slirp/tcp_input.c rename to src/network/slirp/tcp_input.c diff --git a/src/NETWORK/slirp/tcp_output.c b/src/network/slirp/tcp_output.c similarity index 100% rename from src/NETWORK/slirp/tcp_output.c rename to src/network/slirp/tcp_output.c diff --git a/src/NETWORK/slirp/tcp_subr.c b/src/network/slirp/tcp_subr.c similarity index 100% rename from src/NETWORK/slirp/tcp_subr.c rename to src/network/slirp/tcp_subr.c diff --git a/src/NETWORK/slirp/tcp_timer.c b/src/network/slirp/tcp_timer.c similarity index 100% rename from src/NETWORK/slirp/tcp_timer.c rename to src/network/slirp/tcp_timer.c diff --git a/src/NETWORK/slirp/tcp_timer.h b/src/network/slirp/tcp_timer.h similarity index 100% rename from src/NETWORK/slirp/tcp_timer.h rename to src/network/slirp/tcp_timer.h diff --git a/src/NETWORK/slirp/tcp_var.h b/src/network/slirp/tcp_var.h similarity index 100% rename from src/NETWORK/slirp/tcp_var.h rename to src/network/slirp/tcp_var.h diff --git a/src/NETWORK/slirp/tcpip.h b/src/network/slirp/tcpip.h similarity index 100% rename from src/NETWORK/slirp/tcpip.h rename to src/network/slirp/tcpip.h diff --git a/src/NETWORK/slirp/tftp.c b/src/network/slirp/tftp.c similarity index 100% rename from src/NETWORK/slirp/tftp.c rename to src/network/slirp/tftp.c diff --git a/src/NETWORK/slirp/tftp.h b/src/network/slirp/tftp.h similarity index 100% rename from src/NETWORK/slirp/tftp.h rename to src/network/slirp/tftp.h diff --git a/src/NETWORK/slirp/udp.c b/src/network/slirp/udp.c similarity index 100% rename from src/NETWORK/slirp/udp.c rename to src/network/slirp/udp.c diff --git a/src/NETWORK/slirp/udp.h b/src/network/slirp/udp.h similarity index 100% rename from src/NETWORK/slirp/udp.h rename to src/network/slirp/udp.h diff --git a/src/nvr.c b/src/nvr.c index f8b22ef1b..4a920ccdb 100644 --- a/src/nvr.c +++ b/src/nvr.c @@ -22,7 +22,7 @@ #include #include #include "ibm.h" -#include "CPU/cpu.h" +#include "cpu/cpu.h" #include "device.h" #include "io.h" #include "jim.h" diff --git a/src/olivetti_m24.c b/src/olivetti_m24.c index 67e354fc3..3c9e24ba7 100644 --- a/src/olivetti_m24.c +++ b/src/olivetti_m24.c @@ -2,7 +2,7 @@ see COPYING for more details */ #include "ibm.h" -#include "CPU/cpu.h" +#include "cpu/cpu.h" #include "io.h" #include "device.h" #include "model.h" diff --git a/src/opti495.c b/src/opti495.c index 5a82251f4..b9a6e2e30 100644 --- a/src/opti495.c +++ b/src/opti495.c @@ -252,7 +252,7 @@ Note: the block address is forced to be a multiple of the block size by SeeAlso: #P0178,#P0187 */ #include "ibm.h" -#include "CPU/cpu.h" +#include "cpu/cpu.h" #include "io.h" #include "mem.h" #include "device.h" diff --git a/src/pc.c b/src/pc.c index 6b5504085..eb768affc 100644 --- a/src/pc.c +++ b/src/pc.c @@ -21,9 +21,9 @@ #include "86box.h" #include "ibm.h" #include "mem.h" -#include "CPU/cpu.h" -#include "CPU/x86_ops.h" -#include "CPU/codegen.h" +#include "cpu/cpu.h" +#include "cpu/x86_ops.h" +#include "cpu/codegen.h" #include "dma.h" #include "nvr.h" #include "pic.h" @@ -43,18 +43,18 @@ #include "fdc.h" #include "fdd.h" #include "gameport.h" -#include "HDD/hdd.h" -#include "HDD/hdd_ide_at.h" +#include "hdd/hdd.h" +#include "hdd/hdd_ide_at.h" #include "cdrom.h" #include "cdrom_ioctl.h" #include "cdrom_image.h" #include "cdrom_null.h" #include "keyboard.h" #include "keyboard_at.h" -#include "SOUND/midi.h" +#include "sound/midi.h" #include "mouse.h" #ifdef USE_NETWORK -#include "NETWORK/network.h" +#include "network/network.h" #endif #ifdef WALTJE # define UNICODE @@ -66,19 +66,19 @@ #include "plat_midi.h" #include "plat_mouse.h" #include "plat_ui.h" -#include "SCSI/scsi.h" +#include "scsi/scsi.h" #include "serial.h" -#include "SOUND/sound.h" -#include "SOUND/snd_cms.h" -#include "SOUND/snd_dbopl.h" -#include "SOUND/snd_mpu401.h" -#include "SOUND/snd_opl.h" -#include "SOUND/snd_gus.h" -#include "SOUND/snd_sb.h" -#include "SOUND/snd_speaker.h" -#include "SOUND/snd_ssi2001.h" -#include "VIDEO/video.h" -#include "VIDEO/vid_voodoo.h" +#include "sound/sound.h" +#include "sound/snd_cms.h" +#include "sound/snd_dbopl.h" +#include "sound/snd_mpu401.h" +#include "sound/snd_opl.h" +#include "sound/snd_gus.h" +#include "sound/snd_sb.h" +#include "sound/snd_speaker.h" +#include "sound/snd_ssi2001.h" +#include "video/video.h" +#include "video/vid_voodoo.h" wchar_t pcempath[512]; diff --git a/src/pc87306.c b/src/pc87306.c index 1beb23e10..6ac7ffb54 100644 --- a/src/pc87306.c +++ b/src/pc87306.c @@ -21,7 +21,7 @@ #include "io.h" #include "lpt.h" #include "serial.h" -#include "HDD/hdd_ide_at.h" +#include "hdd/hdd_ide_at.h" #include "pc87306.h" static int pc87306_curreg; diff --git a/src/piix.c b/src/piix.c index 4276e98c2..d10e77aad 100644 --- a/src/piix.c +++ b/src/piix.c @@ -28,7 +28,7 @@ #include "io.h" #include "mem.h" #include "pci.h" -#include "HDD/hdd_ide_at.h" +#include "hdd/hdd_ide_at.h" #include "piix.h" diff --git a/src/pit.c b/src/pit.c index 44d71531c..144630d5f 100644 --- a/src/pit.c +++ b/src/pit.c @@ -5,7 +5,7 @@ #include #include "ibm.h" -#include "CPU/cpu.h" +#include "cpu/cpu.h" #include "dma.h" #include "io.h" #include "pic.h" @@ -13,8 +13,8 @@ #include "device.h" #include "timer.h" #include "model.h" -#include "SOUND/snd_speaker.h" -#include "VIDEO/video.h" +#include "sound/snd_speaker.h" +#include "video/video.h" /*B0 to 40, two writes to 43, then two reads - value does not change!*/ diff --git a/src/ps1.c b/src/ps1.c index 782937bf9..3efcc500b 100644 --- a/src/ps1.c +++ b/src/ps1.c @@ -2,7 +2,7 @@ see COPYING for more details */ #include "ibm.h" -#include "CPU/cpu.h" +#include "cpu/cpu.h" #include "io.h" #include "mem.h" #include "rom.h" diff --git a/src/ps2.c b/src/ps2.c index b37a6de99..9042b12e8 100644 --- a/src/ps2.c +++ b/src/ps2.c @@ -1,5 +1,5 @@ #include "ibm.h" -#include "CPU/cpu.h" +#include "cpu/cpu.h" #include "io.h" #include "mem.h" #include "rom.h" diff --git a/src/ps2_mca.c b/src/ps2_mca.c index 9bf9c522f..1a31e07d5 100644 --- a/src/ps2_mca.c +++ b/src/ps2_mca.c @@ -1,6 +1,6 @@ #include "ibm.h" -#include "CPU/cpu.h" -#include "CPU/x86.h" +#include "cpu/cpu.h" +#include "cpu/x86.h" #include "io.h" #include "mca.h" #include "mem.h" diff --git a/src/scat.c b/src/scat.c index 95c396887..607d51fd6 100644 --- a/src/scat.c +++ b/src/scat.c @@ -1,11 +1,11 @@ /*This is the chipset used in the Award 286 clone model*/ #include "ibm.h" -#include "CPU/cpu.h" +#include "cpu/cpu.h" #include "io.h" #include "mem.h" #include "scat.h" -#include "CPU/x86.h" -#include "CPU/cpu.h" +#include "cpu/x86.h" +#include "cpu/cpu.h" static uint8_t scat_regs[256]; diff --git a/src/SCSI/scsi.c b/src/scsi/scsi.c similarity index 100% rename from src/SCSI/scsi.c rename to src/scsi/scsi.c diff --git a/src/SCSI/scsi.h b/src/scsi/scsi.h similarity index 100% rename from src/SCSI/scsi.h rename to src/scsi/scsi.h diff --git a/src/SCSI/scsi_aha154x.c b/src/scsi/scsi_aha154x.c similarity index 100% rename from src/SCSI/scsi_aha154x.c rename to src/scsi/scsi_aha154x.c diff --git a/src/SCSI/scsi_aha154x.h b/src/scsi/scsi_aha154x.h similarity index 100% rename from src/SCSI/scsi_aha154x.h rename to src/scsi/scsi_aha154x.h diff --git a/src/SCSI/scsi_bios_command.c b/src/scsi/scsi_bios_command.c similarity index 100% rename from src/SCSI/scsi_bios_command.c rename to src/scsi/scsi_bios_command.c diff --git a/src/SCSI/scsi_bios_command.h b/src/scsi/scsi_bios_command.h similarity index 100% rename from src/SCSI/scsi_bios_command.h rename to src/scsi/scsi_bios_command.h diff --git a/src/SCSI/scsi_buslogic.c b/src/scsi/scsi_buslogic.c similarity index 100% rename from src/SCSI/scsi_buslogic.c rename to src/scsi/scsi_buslogic.c diff --git a/src/SCSI/scsi_buslogic.h b/src/scsi/scsi_buslogic.h similarity index 100% rename from src/SCSI/scsi_buslogic.h rename to src/scsi/scsi_buslogic.h diff --git a/src/SCSI/scsi_device.c b/src/scsi/scsi_device.c similarity index 100% rename from src/SCSI/scsi_device.c rename to src/scsi/scsi_device.c diff --git a/src/SCSI/scsi_device.h b/src/scsi/scsi_device.h similarity index 100% rename from src/SCSI/scsi_device.h rename to src/scsi/scsi_device.h diff --git a/src/SCSI/scsi_disk.c b/src/scsi/scsi_disk.c similarity index 99% rename from src/SCSI/scsi_disk.c rename to src/scsi/scsi_disk.c index b776ff001..1bc92e3c2 100644 --- a/src/SCSI/scsi_disk.c +++ b/src/scsi/scsi_disk.c @@ -19,13 +19,13 @@ #include "../86box.h" #include "../cdrom.h" #include "../ibm.h" -#include "../HDD/hdd_image.h" -#include "../HDD/hdd_ide_at.h" +#include "../hdd/hdd_image.h" +#include "../hdd/hdd_ide_at.h" #include "../piix.h" #include "scsi.h" #include "scsi_disk.h" #include "../timer.h" -#include "../WIN/plat_iodev.h" +#include "../win/plat_iodev.h" /* Bits of 'status' */ diff --git a/src/SCSI/scsi_disk.h b/src/scsi/scsi_disk.h similarity index 100% rename from src/SCSI/scsi_disk.h rename to src/scsi/scsi_disk.h diff --git a/src/sio.c b/src/sio.c index 7804b1860..9f263cf8e 100644 --- a/src/sio.c +++ b/src/sio.c @@ -20,7 +20,7 @@ #include "dma.h" #include "fdc.h" #include "keyboard_at.h" -#include "HDD/hdd_ide_at.h" +#include "hdd/hdd_ide_at.h" #include "io.h" #include "mem.h" #include "pci.h" diff --git a/src/sis496.c b/src/sis496.c index 674c50180..aff1b3eaa 100644 --- a/src/sis496.c +++ b/src/sis496.c @@ -3,7 +3,7 @@ */ #include #include "ibm.h" -#include "CPU/cpu.h" +#include "cpu/cpu.h" #include "io.h" #include "mem.h" #include "pci.h" diff --git a/src/sis85c471.c b/src/sis85c471.c index a33ac2917..3b63ccd25 100644 --- a/src/sis85c471.c +++ b/src/sis85c471.c @@ -21,7 +21,7 @@ #include "fdc.h" #include "fdd.h" #include "serial.h" -#include "HDD/hdd_ide_at.h" +#include "hdd/hdd_ide_at.h" #include "sis85c471.h" diff --git a/src/SOUND/dbopl.cpp b/src/sound/dbopl.cpp similarity index 100% rename from src/SOUND/dbopl.cpp rename to src/sound/dbopl.cpp diff --git a/src/SOUND/dbopl.h b/src/sound/dbopl.h similarity index 100% rename from src/SOUND/dbopl.h rename to src/sound/dbopl.h diff --git a/src/SOUND/filters.h b/src/sound/filters.h similarity index 100% rename from src/SOUND/filters.h rename to src/sound/filters.h diff --git a/src/SOUND/midi.c b/src/sound/midi.c similarity index 99% rename from src/SOUND/midi.c rename to src/sound/midi.c index aca4810ed..476283853 100644 --- a/src/SOUND/midi.c +++ b/src/sound/midi.c @@ -6,8 +6,8 @@ #include "midi.h" #include "../ibm.h" -#include "../WIN/plat_midi.h" -#include "../WIN/plat_ticks.h" +#include "../win/plat_midi.h" +#include "../win/plat_ticks.h" #ifdef USE_FLUIDSYNTH # include "midi_fluidsynth.h" #endif diff --git a/src/SOUND/midi.h b/src/sound/midi.h similarity index 100% rename from src/SOUND/midi.h rename to src/sound/midi.h diff --git a/src/SOUND/midi_fluidsynth.c b/src/sound/midi_fluidsynth.c similarity index 99% rename from src/SOUND/midi_fluidsynth.c rename to src/sound/midi_fluidsynth.c index 7f4122d68..101f0dad1 100644 --- a/src/SOUND/midi_fluidsynth.c +++ b/src/sound/midi_fluidsynth.c @@ -7,9 +7,9 @@ #include #include #include "../config.h" -#include "../WIN/plat_dynld.h" -#include "../WIN/plat_thread.h" -#include "../WIN/plat_ui.h" +#include "../win/plat_dynld.h" +#include "../win/plat_thread.h" +#include "../win/plat_ui.h" #include "../device.h" #include "midi_fluidsynth.h" #include "midi.h" diff --git a/src/SOUND/midi_fluidsynth.h b/src/sound/midi_fluidsynth.h similarity index 100% rename from src/SOUND/midi_fluidsynth.h rename to src/sound/midi_fluidsynth.h diff --git a/src/SOUND/midi_mt32.c b/src/sound/midi_mt32.c similarity index 99% rename from src/SOUND/midi_mt32.c rename to src/sound/midi_mt32.c index 2e81c6265..c3ffe49e3 100644 --- a/src/SOUND/midi_mt32.c +++ b/src/sound/midi_mt32.c @@ -2,7 +2,7 @@ #include #include #include "munt/c_interface/c_interface.h" -#include "../WIN/plat_thread.h" +#include "../win/plat_thread.h" #include "../ibm.h" #include "../device.h" #include "../mem.h" diff --git a/src/SOUND/midi_mt32.h b/src/sound/midi_mt32.h similarity index 100% rename from src/SOUND/midi_mt32.h rename to src/sound/midi_mt32.h diff --git a/src/SOUND/midi_system.c b/src/sound/midi_system.c similarity index 97% rename from src/SOUND/midi_system.c rename to src/sound/midi_system.c index d69fc3a4b..f26c1dcbd 100644 --- a/src/SOUND/midi_system.c +++ b/src/sound/midi_system.c @@ -3,7 +3,7 @@ #include #include #include "../device.h" -#include "../WIN/plat_midi.h" +#include "../win/plat_midi.h" #include "midi_system.h" #include "midi.h" diff --git a/src/SOUND/midi_system.h b/src/sound/midi_system.h similarity index 100% rename from src/SOUND/midi_system.h rename to src/sound/midi_system.h diff --git a/src/SOUND/munt/Analog.cpp b/src/sound/munt/Analog.cpp similarity index 100% rename from src/SOUND/munt/Analog.cpp rename to src/sound/munt/Analog.cpp diff --git a/src/SOUND/munt/Analog.h b/src/sound/munt/Analog.h similarity index 100% rename from src/SOUND/munt/Analog.h rename to src/sound/munt/Analog.h diff --git a/src/SOUND/munt/BReverbModel.cpp b/src/sound/munt/BReverbModel.cpp similarity index 100% rename from src/SOUND/munt/BReverbModel.cpp rename to src/sound/munt/BReverbModel.cpp diff --git a/src/SOUND/munt/BReverbModel.h b/src/sound/munt/BReverbModel.h similarity index 100% rename from src/SOUND/munt/BReverbModel.h rename to src/sound/munt/BReverbModel.h diff --git a/src/SOUND/munt/Enumerations.h b/src/sound/munt/Enumerations.h similarity index 100% rename from src/SOUND/munt/Enumerations.h rename to src/sound/munt/Enumerations.h diff --git a/src/SOUND/munt/File.cpp b/src/sound/munt/File.cpp similarity index 100% rename from src/SOUND/munt/File.cpp rename to src/sound/munt/File.cpp diff --git a/src/SOUND/munt/File.h b/src/sound/munt/File.h similarity index 100% rename from src/SOUND/munt/File.h rename to src/sound/munt/File.h diff --git a/src/SOUND/munt/FileStream.cpp b/src/sound/munt/FileStream.cpp similarity index 100% rename from src/SOUND/munt/FileStream.cpp rename to src/sound/munt/FileStream.cpp diff --git a/src/SOUND/munt/FileStream.h b/src/sound/munt/FileStream.h similarity index 100% rename from src/SOUND/munt/FileStream.h rename to src/sound/munt/FileStream.h diff --git a/src/SOUND/munt/LA32FloatWaveGenerator.cpp b/src/sound/munt/LA32FloatWaveGenerator.cpp similarity index 100% rename from src/SOUND/munt/LA32FloatWaveGenerator.cpp rename to src/sound/munt/LA32FloatWaveGenerator.cpp diff --git a/src/SOUND/munt/LA32FloatWaveGenerator.h b/src/sound/munt/LA32FloatWaveGenerator.h similarity index 100% rename from src/SOUND/munt/LA32FloatWaveGenerator.h rename to src/sound/munt/LA32FloatWaveGenerator.h diff --git a/src/SOUND/munt/LA32Ramp.cpp b/src/sound/munt/LA32Ramp.cpp similarity index 100% rename from src/SOUND/munt/LA32Ramp.cpp rename to src/sound/munt/LA32Ramp.cpp diff --git a/src/SOUND/munt/LA32Ramp.h b/src/sound/munt/LA32Ramp.h similarity index 100% rename from src/SOUND/munt/LA32Ramp.h rename to src/sound/munt/LA32Ramp.h diff --git a/src/SOUND/munt/LA32WaveGenerator.cpp b/src/sound/munt/LA32WaveGenerator.cpp similarity index 100% rename from src/SOUND/munt/LA32WaveGenerator.cpp rename to src/sound/munt/LA32WaveGenerator.cpp diff --git a/src/SOUND/munt/LA32WaveGenerator.h b/src/sound/munt/LA32WaveGenerator.h similarity index 100% rename from src/SOUND/munt/LA32WaveGenerator.h rename to src/sound/munt/LA32WaveGenerator.h diff --git a/src/SOUND/munt/MemoryRegion.h b/src/sound/munt/MemoryRegion.h similarity index 100% rename from src/SOUND/munt/MemoryRegion.h rename to src/sound/munt/MemoryRegion.h diff --git a/src/SOUND/munt/MidiEventQueue.h b/src/sound/munt/MidiEventQueue.h similarity index 100% rename from src/SOUND/munt/MidiEventQueue.h rename to src/sound/munt/MidiEventQueue.h diff --git a/src/SOUND/munt/MidiStreamParser.cpp b/src/sound/munt/MidiStreamParser.cpp similarity index 100% rename from src/SOUND/munt/MidiStreamParser.cpp rename to src/sound/munt/MidiStreamParser.cpp diff --git a/src/SOUND/munt/MidiStreamParser.h b/src/sound/munt/MidiStreamParser.h similarity index 100% rename from src/SOUND/munt/MidiStreamParser.h rename to src/sound/munt/MidiStreamParser.h diff --git a/src/SOUND/munt/Part.cpp b/src/sound/munt/Part.cpp similarity index 100% rename from src/SOUND/munt/Part.cpp rename to src/sound/munt/Part.cpp diff --git a/src/SOUND/munt/Part.h b/src/sound/munt/Part.h similarity index 100% rename from src/SOUND/munt/Part.h rename to src/sound/munt/Part.h diff --git a/src/SOUND/munt/Partial.cpp b/src/sound/munt/Partial.cpp similarity index 100% rename from src/SOUND/munt/Partial.cpp rename to src/sound/munt/Partial.cpp diff --git a/src/SOUND/munt/Partial.h b/src/sound/munt/Partial.h similarity index 100% rename from src/SOUND/munt/Partial.h rename to src/sound/munt/Partial.h diff --git a/src/SOUND/munt/PartialManager.cpp b/src/sound/munt/PartialManager.cpp similarity index 100% rename from src/SOUND/munt/PartialManager.cpp rename to src/sound/munt/PartialManager.cpp diff --git a/src/SOUND/munt/PartialManager.h b/src/sound/munt/PartialManager.h similarity index 100% rename from src/SOUND/munt/PartialManager.h rename to src/sound/munt/PartialManager.h diff --git a/src/SOUND/munt/Poly.cpp b/src/sound/munt/Poly.cpp similarity index 100% rename from src/SOUND/munt/Poly.cpp rename to src/sound/munt/Poly.cpp diff --git a/src/SOUND/munt/Poly.h b/src/sound/munt/Poly.h similarity index 100% rename from src/SOUND/munt/Poly.h rename to src/sound/munt/Poly.h diff --git a/src/SOUND/munt/ROMInfo.cpp b/src/sound/munt/ROMInfo.cpp similarity index 100% rename from src/SOUND/munt/ROMInfo.cpp rename to src/sound/munt/ROMInfo.cpp diff --git a/src/SOUND/munt/ROMInfo.h b/src/sound/munt/ROMInfo.h similarity index 100% rename from src/SOUND/munt/ROMInfo.h rename to src/sound/munt/ROMInfo.h diff --git a/src/SOUND/munt/SampleRateConverter.cpp b/src/sound/munt/SampleRateConverter.cpp similarity index 100% rename from src/SOUND/munt/SampleRateConverter.cpp rename to src/sound/munt/SampleRateConverter.cpp diff --git a/src/SOUND/munt/SampleRateConverter.h b/src/sound/munt/SampleRateConverter.h similarity index 100% rename from src/SOUND/munt/SampleRateConverter.h rename to src/sound/munt/SampleRateConverter.h diff --git a/src/SOUND/munt/SampleRateConverter_dummy.cpp b/src/sound/munt/SampleRateConverter_dummy.cpp similarity index 100% rename from src/SOUND/munt/SampleRateConverter_dummy.cpp rename to src/sound/munt/SampleRateConverter_dummy.cpp diff --git a/src/SOUND/munt/Structures.h b/src/sound/munt/Structures.h similarity index 100% rename from src/SOUND/munt/Structures.h rename to src/sound/munt/Structures.h diff --git a/src/SOUND/munt/Synth.cpp b/src/sound/munt/Synth.cpp similarity index 100% rename from src/SOUND/munt/Synth.cpp rename to src/sound/munt/Synth.cpp diff --git a/src/SOUND/munt/Synth.h b/src/sound/munt/Synth.h similarity index 100% rename from src/SOUND/munt/Synth.h rename to src/sound/munt/Synth.h diff --git a/src/SOUND/munt/TVA.cpp b/src/sound/munt/TVA.cpp similarity index 100% rename from src/SOUND/munt/TVA.cpp rename to src/sound/munt/TVA.cpp diff --git a/src/SOUND/munt/TVA.h b/src/sound/munt/TVA.h similarity index 100% rename from src/SOUND/munt/TVA.h rename to src/sound/munt/TVA.h diff --git a/src/SOUND/munt/TVF.cpp b/src/sound/munt/TVF.cpp similarity index 100% rename from src/SOUND/munt/TVF.cpp rename to src/sound/munt/TVF.cpp diff --git a/src/SOUND/munt/TVF.h b/src/sound/munt/TVF.h similarity index 100% rename from src/SOUND/munt/TVF.h rename to src/sound/munt/TVF.h diff --git a/src/SOUND/munt/TVP.cpp b/src/sound/munt/TVP.cpp similarity index 100% rename from src/SOUND/munt/TVP.cpp rename to src/sound/munt/TVP.cpp diff --git a/src/SOUND/munt/TVP.h b/src/sound/munt/TVP.h similarity index 100% rename from src/SOUND/munt/TVP.h rename to src/sound/munt/TVP.h diff --git a/src/SOUND/munt/Tables.cpp b/src/sound/munt/Tables.cpp similarity index 100% rename from src/SOUND/munt/Tables.cpp rename to src/sound/munt/Tables.cpp diff --git a/src/SOUND/munt/Tables.h b/src/sound/munt/Tables.h similarity index 100% rename from src/SOUND/munt/Tables.h rename to src/sound/munt/Tables.h diff --git a/src/SOUND/munt/Types.h b/src/sound/munt/Types.h similarity index 100% rename from src/SOUND/munt/Types.h rename to src/sound/munt/Types.h diff --git a/src/SOUND/munt/c_interface/c_interface.cpp b/src/sound/munt/c_interface/c_interface.cpp similarity index 100% rename from src/SOUND/munt/c_interface/c_interface.cpp rename to src/sound/munt/c_interface/c_interface.cpp diff --git a/src/SOUND/munt/c_interface/c_interface.h b/src/sound/munt/c_interface/c_interface.h similarity index 100% rename from src/SOUND/munt/c_interface/c_interface.h rename to src/sound/munt/c_interface/c_interface.h diff --git a/src/SOUND/munt/c_interface/c_types.h b/src/sound/munt/c_interface/c_types.h similarity index 100% rename from src/SOUND/munt/c_interface/c_types.h rename to src/sound/munt/c_interface/c_types.h diff --git a/src/SOUND/munt/c_interface/cpp_interface.h b/src/sound/munt/c_interface/cpp_interface.h similarity index 100% rename from src/SOUND/munt/c_interface/cpp_interface.h rename to src/sound/munt/c_interface/cpp_interface.h diff --git a/src/SOUND/munt/config.h b/src/sound/munt/config.h similarity index 100% rename from src/SOUND/munt/config.h rename to src/sound/munt/config.h diff --git a/src/SOUND/munt/globals.h b/src/sound/munt/globals.h similarity index 100% rename from src/SOUND/munt/globals.h rename to src/sound/munt/globals.h diff --git a/src/SOUND/munt/internals.h b/src/sound/munt/internals.h similarity index 100% rename from src/SOUND/munt/internals.h rename to src/sound/munt/internals.h diff --git a/src/SOUND/munt/mmath.h b/src/sound/munt/mmath.h similarity index 100% rename from src/SOUND/munt/mmath.h rename to src/sound/munt/mmath.h diff --git a/src/SOUND/munt/mt32emu.h b/src/sound/munt/mt32emu.h similarity index 100% rename from src/SOUND/munt/mt32emu.h rename to src/sound/munt/mt32emu.h diff --git a/src/SOUND/munt/sha1/sha1.cpp b/src/sound/munt/sha1/sha1.cpp similarity index 100% rename from src/SOUND/munt/sha1/sha1.cpp rename to src/sound/munt/sha1/sha1.cpp diff --git a/src/SOUND/munt/sha1/sha1.h b/src/sound/munt/sha1/sha1.h similarity index 100% rename from src/SOUND/munt/sha1/sha1.h rename to src/sound/munt/sha1/sha1.h diff --git a/src/SOUND/munt/srchelper/InternalResampler.cpp b/src/sound/munt/srchelper/InternalResampler.cpp similarity index 100% rename from src/SOUND/munt/srchelper/InternalResampler.cpp rename to src/sound/munt/srchelper/InternalResampler.cpp diff --git a/src/SOUND/munt/srchelper/InternalResampler.h b/src/sound/munt/srchelper/InternalResampler.h similarity index 100% rename from src/SOUND/munt/srchelper/InternalResampler.h rename to src/sound/munt/srchelper/InternalResampler.h diff --git a/src/SOUND/munt/srchelper/SamplerateAdapter.cpp b/src/sound/munt/srchelper/SamplerateAdapter.cpp similarity index 100% rename from src/SOUND/munt/srchelper/SamplerateAdapter.cpp rename to src/sound/munt/srchelper/SamplerateAdapter.cpp diff --git a/src/SOUND/munt/srchelper/SamplerateAdapter.h b/src/sound/munt/srchelper/SamplerateAdapter.h similarity index 100% rename from src/SOUND/munt/srchelper/SamplerateAdapter.h rename to src/sound/munt/srchelper/SamplerateAdapter.h diff --git a/src/SOUND/munt/srchelper/SoxrAdapter.cpp b/src/sound/munt/srchelper/SoxrAdapter.cpp similarity index 100% rename from src/SOUND/munt/srchelper/SoxrAdapter.cpp rename to src/sound/munt/srchelper/SoxrAdapter.cpp diff --git a/src/SOUND/munt/srchelper/SoxrAdapter.h b/src/sound/munt/srchelper/SoxrAdapter.h similarity index 100% rename from src/SOUND/munt/srchelper/SoxrAdapter.h rename to src/sound/munt/srchelper/SoxrAdapter.h diff --git a/src/SOUND/munt/srchelper/srctools/include/FIRResampler.h b/src/sound/munt/srchelper/srctools/include/FIRResampler.h similarity index 100% rename from src/SOUND/munt/srchelper/srctools/include/FIRResampler.h rename to src/sound/munt/srchelper/srctools/include/FIRResampler.h diff --git a/src/SOUND/munt/srchelper/srctools/include/FloatSampleProvider.h b/src/sound/munt/srchelper/srctools/include/FloatSampleProvider.h similarity index 100% rename from src/SOUND/munt/srchelper/srctools/include/FloatSampleProvider.h rename to src/sound/munt/srchelper/srctools/include/FloatSampleProvider.h diff --git a/src/SOUND/munt/srchelper/srctools/include/IIR2xResampler.h b/src/sound/munt/srchelper/srctools/include/IIR2xResampler.h similarity index 100% rename from src/SOUND/munt/srchelper/srctools/include/IIR2xResampler.h rename to src/sound/munt/srchelper/srctools/include/IIR2xResampler.h diff --git a/src/SOUND/munt/srchelper/srctools/include/LinearResampler.h b/src/sound/munt/srchelper/srctools/include/LinearResampler.h similarity index 100% rename from src/SOUND/munt/srchelper/srctools/include/LinearResampler.h rename to src/sound/munt/srchelper/srctools/include/LinearResampler.h diff --git a/src/SOUND/munt/srchelper/srctools/include/ResamplerModel.h b/src/sound/munt/srchelper/srctools/include/ResamplerModel.h similarity index 100% rename from src/SOUND/munt/srchelper/srctools/include/ResamplerModel.h rename to src/sound/munt/srchelper/srctools/include/ResamplerModel.h diff --git a/src/SOUND/munt/srchelper/srctools/include/ResamplerStage.h b/src/sound/munt/srchelper/srctools/include/ResamplerStage.h similarity index 100% rename from src/SOUND/munt/srchelper/srctools/include/ResamplerStage.h rename to src/sound/munt/srchelper/srctools/include/ResamplerStage.h diff --git a/src/SOUND/munt/srchelper/srctools/include/SincResampler.h b/src/sound/munt/srchelper/srctools/include/SincResampler.h similarity index 100% rename from src/SOUND/munt/srchelper/srctools/include/SincResampler.h rename to src/sound/munt/srchelper/srctools/include/SincResampler.h diff --git a/src/SOUND/munt/srchelper/srctools/src/FIRResampler.cpp b/src/sound/munt/srchelper/srctools/src/FIRResampler.cpp similarity index 100% rename from src/SOUND/munt/srchelper/srctools/src/FIRResampler.cpp rename to src/sound/munt/srchelper/srctools/src/FIRResampler.cpp diff --git a/src/SOUND/munt/srchelper/srctools/src/IIR2xResampler.cpp b/src/sound/munt/srchelper/srctools/src/IIR2xResampler.cpp similarity index 100% rename from src/SOUND/munt/srchelper/srctools/src/IIR2xResampler.cpp rename to src/sound/munt/srchelper/srctools/src/IIR2xResampler.cpp diff --git a/src/SOUND/munt/srchelper/srctools/src/LinearResampler.cpp b/src/sound/munt/srchelper/srctools/src/LinearResampler.cpp similarity index 100% rename from src/SOUND/munt/srchelper/srctools/src/LinearResampler.cpp rename to src/sound/munt/srchelper/srctools/src/LinearResampler.cpp diff --git a/src/SOUND/munt/srchelper/srctools/src/ResamplerModel.cpp b/src/sound/munt/srchelper/srctools/src/ResamplerModel.cpp similarity index 100% rename from src/SOUND/munt/srchelper/srctools/src/ResamplerModel.cpp rename to src/sound/munt/srchelper/srctools/src/ResamplerModel.cpp diff --git a/src/SOUND/munt/srchelper/srctools/src/SincResampler.cpp b/src/sound/munt/srchelper/srctools/src/SincResampler.cpp similarity index 100% rename from src/SOUND/munt/srchelper/srctools/src/SincResampler.cpp rename to src/sound/munt/srchelper/srctools/src/SincResampler.cpp diff --git a/src/SOUND/nukedopl.cpp b/src/sound/nukedopl.cpp similarity index 100% rename from src/SOUND/nukedopl.cpp rename to src/sound/nukedopl.cpp diff --git a/src/SOUND/nukedopl.h b/src/sound/nukedopl.h similarity index 100% rename from src/SOUND/nukedopl.h rename to src/sound/nukedopl.h diff --git a/src/SOUND/openal.c b/src/sound/openal.c similarity index 100% rename from src/SOUND/openal.c rename to src/sound/openal.c diff --git a/src/SOUND/resid-fp/AUTHORS b/src/sound/resid-fp/AUTHORS similarity index 100% rename from src/SOUND/resid-fp/AUTHORS rename to src/sound/resid-fp/AUTHORS diff --git a/src/SOUND/resid-fp/COPYING b/src/sound/resid-fp/COPYING similarity index 100% rename from src/SOUND/resid-fp/COPYING rename to src/sound/resid-fp/COPYING diff --git a/src/SOUND/resid-fp/ChangeLog b/src/sound/resid-fp/ChangeLog similarity index 100% rename from src/SOUND/resid-fp/ChangeLog rename to src/sound/resid-fp/ChangeLog diff --git a/src/SOUND/resid-fp/INSTALL b/src/sound/resid-fp/INSTALL similarity index 100% rename from src/SOUND/resid-fp/INSTALL rename to src/sound/resid-fp/INSTALL diff --git a/src/SOUND/resid-fp/Makefile.am b/src/sound/resid-fp/Makefile.am similarity index 100% rename from src/SOUND/resid-fp/Makefile.am rename to src/sound/resid-fp/Makefile.am diff --git a/src/SOUND/resid-fp/Makefile.in b/src/sound/resid-fp/Makefile.in similarity index 100% rename from src/SOUND/resid-fp/Makefile.in rename to src/sound/resid-fp/Makefile.in diff --git a/src/SOUND/resid-fp/NEWS b/src/sound/resid-fp/NEWS similarity index 100% rename from src/SOUND/resid-fp/NEWS rename to src/sound/resid-fp/NEWS diff --git a/src/SOUND/resid-fp/README b/src/sound/resid-fp/README similarity index 100% rename from src/SOUND/resid-fp/README rename to src/sound/resid-fp/README diff --git a/src/SOUND/resid-fp/README.VICE b/src/sound/resid-fp/README.VICE similarity index 100% rename from src/SOUND/resid-fp/README.VICE rename to src/sound/resid-fp/README.VICE diff --git a/src/SOUND/resid-fp/aclocal.m4 b/src/sound/resid-fp/aclocal.m4 similarity index 100% rename from src/SOUND/resid-fp/aclocal.m4 rename to src/sound/resid-fp/aclocal.m4 diff --git a/src/SOUND/resid-fp/configure b/src/sound/resid-fp/configure similarity index 100% rename from src/SOUND/resid-fp/configure rename to src/sound/resid-fp/configure diff --git a/src/SOUND/resid-fp/configure.in b/src/sound/resid-fp/configure.in similarity index 100% rename from src/SOUND/resid-fp/configure.in rename to src/sound/resid-fp/configure.in diff --git a/src/SOUND/resid-fp/convolve-sse.cc b/src/sound/resid-fp/convolve-sse.cc similarity index 100% rename from src/SOUND/resid-fp/convolve-sse.cc rename to src/sound/resid-fp/convolve-sse.cc diff --git a/src/SOUND/resid-fp/convolve.cc b/src/sound/resid-fp/convolve.cc similarity index 100% rename from src/SOUND/resid-fp/convolve.cc rename to src/sound/resid-fp/convolve.cc diff --git a/src/SOUND/resid-fp/envelope.cc b/src/sound/resid-fp/envelope.cc similarity index 100% rename from src/SOUND/resid-fp/envelope.cc rename to src/sound/resid-fp/envelope.cc diff --git a/src/SOUND/resid-fp/envelope.h b/src/sound/resid-fp/envelope.h similarity index 100% rename from src/SOUND/resid-fp/envelope.h rename to src/sound/resid-fp/envelope.h diff --git a/src/SOUND/resid-fp/extfilt.cc b/src/sound/resid-fp/extfilt.cc similarity index 100% rename from src/SOUND/resid-fp/extfilt.cc rename to src/sound/resid-fp/extfilt.cc diff --git a/src/SOUND/resid-fp/extfilt.h b/src/sound/resid-fp/extfilt.h similarity index 100% rename from src/SOUND/resid-fp/extfilt.h rename to src/sound/resid-fp/extfilt.h diff --git a/src/SOUND/resid-fp/filter.cc b/src/sound/resid-fp/filter.cc similarity index 100% rename from src/SOUND/resid-fp/filter.cc rename to src/sound/resid-fp/filter.cc diff --git a/src/SOUND/resid-fp/filter.h b/src/sound/resid-fp/filter.h similarity index 100% rename from src/SOUND/resid-fp/filter.h rename to src/sound/resid-fp/filter.h diff --git a/src/SOUND/resid-fp/pot.cc b/src/sound/resid-fp/pot.cc similarity index 100% rename from src/SOUND/resid-fp/pot.cc rename to src/sound/resid-fp/pot.cc diff --git a/src/SOUND/resid-fp/pot.h b/src/sound/resid-fp/pot.h similarity index 100% rename from src/SOUND/resid-fp/pot.h rename to src/sound/resid-fp/pot.h diff --git a/src/SOUND/resid-fp/samp2src.pl b/src/sound/resid-fp/samp2src.pl similarity index 100% rename from src/SOUND/resid-fp/samp2src.pl rename to src/sound/resid-fp/samp2src.pl diff --git a/src/SOUND/resid-fp/sid.cc b/src/sound/resid-fp/sid.cc similarity index 100% rename from src/SOUND/resid-fp/sid.cc rename to src/sound/resid-fp/sid.cc diff --git a/src/SOUND/resid-fp/sid.h b/src/sound/resid-fp/sid.h similarity index 100% rename from src/SOUND/resid-fp/sid.h rename to src/sound/resid-fp/sid.h diff --git a/src/SOUND/resid-fp/siddefs-fp.h b/src/sound/resid-fp/siddefs-fp.h similarity index 100% rename from src/SOUND/resid-fp/siddefs-fp.h rename to src/sound/resid-fp/siddefs-fp.h diff --git a/src/SOUND/resid-fp/siddefs-fp.h.in b/src/sound/resid-fp/siddefs-fp.h.in similarity index 100% rename from src/SOUND/resid-fp/siddefs-fp.h.in rename to src/sound/resid-fp/siddefs-fp.h.in diff --git a/src/SOUND/resid-fp/version.cc b/src/sound/resid-fp/version.cc similarity index 100% rename from src/SOUND/resid-fp/version.cc rename to src/sound/resid-fp/version.cc diff --git a/src/SOUND/resid-fp/voice.cc b/src/sound/resid-fp/voice.cc similarity index 100% rename from src/SOUND/resid-fp/voice.cc rename to src/sound/resid-fp/voice.cc diff --git a/src/SOUND/resid-fp/voice.h b/src/sound/resid-fp/voice.h similarity index 100% rename from src/SOUND/resid-fp/voice.h rename to src/sound/resid-fp/voice.h diff --git a/src/SOUND/resid-fp/wave.cc b/src/sound/resid-fp/wave.cc similarity index 100% rename from src/SOUND/resid-fp/wave.cc rename to src/sound/resid-fp/wave.cc diff --git a/src/SOUND/resid-fp/wave.h b/src/sound/resid-fp/wave.h similarity index 100% rename from src/SOUND/resid-fp/wave.h rename to src/sound/resid-fp/wave.h diff --git a/src/SOUND/resid-fp/wave6581_PST.cc b/src/sound/resid-fp/wave6581_PST.cc similarity index 100% rename from src/SOUND/resid-fp/wave6581_PST.cc rename to src/sound/resid-fp/wave6581_PST.cc diff --git a/src/SOUND/resid-fp/wave6581_PST.dat b/src/sound/resid-fp/wave6581_PST.dat similarity index 100% rename from src/SOUND/resid-fp/wave6581_PST.dat rename to src/sound/resid-fp/wave6581_PST.dat diff --git a/src/SOUND/resid-fp/wave6581_PS_.cc b/src/sound/resid-fp/wave6581_PS_.cc similarity index 100% rename from src/SOUND/resid-fp/wave6581_PS_.cc rename to src/sound/resid-fp/wave6581_PS_.cc diff --git a/src/SOUND/resid-fp/wave6581_PS_.dat b/src/sound/resid-fp/wave6581_PS_.dat similarity index 100% rename from src/SOUND/resid-fp/wave6581_PS_.dat rename to src/sound/resid-fp/wave6581_PS_.dat diff --git a/src/SOUND/resid-fp/wave6581_P_T.cc b/src/sound/resid-fp/wave6581_P_T.cc similarity index 100% rename from src/SOUND/resid-fp/wave6581_P_T.cc rename to src/sound/resid-fp/wave6581_P_T.cc diff --git a/src/SOUND/resid-fp/wave6581_P_T.dat b/src/sound/resid-fp/wave6581_P_T.dat similarity index 100% rename from src/SOUND/resid-fp/wave6581_P_T.dat rename to src/sound/resid-fp/wave6581_P_T.dat diff --git a/src/SOUND/resid-fp/wave6581__ST.cc b/src/sound/resid-fp/wave6581__ST.cc similarity index 100% rename from src/SOUND/resid-fp/wave6581__ST.cc rename to src/sound/resid-fp/wave6581__ST.cc diff --git a/src/SOUND/resid-fp/wave6581__ST.dat b/src/sound/resid-fp/wave6581__ST.dat similarity index 100% rename from src/SOUND/resid-fp/wave6581__ST.dat rename to src/sound/resid-fp/wave6581__ST.dat diff --git a/src/SOUND/resid-fp/wave8580_PST.cc b/src/sound/resid-fp/wave8580_PST.cc similarity index 100% rename from src/SOUND/resid-fp/wave8580_PST.cc rename to src/sound/resid-fp/wave8580_PST.cc diff --git a/src/SOUND/resid-fp/wave8580_PST.dat b/src/sound/resid-fp/wave8580_PST.dat similarity index 100% rename from src/SOUND/resid-fp/wave8580_PST.dat rename to src/sound/resid-fp/wave8580_PST.dat diff --git a/src/SOUND/resid-fp/wave8580_PS_.cc b/src/sound/resid-fp/wave8580_PS_.cc similarity index 100% rename from src/SOUND/resid-fp/wave8580_PS_.cc rename to src/sound/resid-fp/wave8580_PS_.cc diff --git a/src/SOUND/resid-fp/wave8580_PS_.dat b/src/sound/resid-fp/wave8580_PS_.dat similarity index 100% rename from src/SOUND/resid-fp/wave8580_PS_.dat rename to src/sound/resid-fp/wave8580_PS_.dat diff --git a/src/SOUND/resid-fp/wave8580_P_T.cc b/src/sound/resid-fp/wave8580_P_T.cc similarity index 100% rename from src/SOUND/resid-fp/wave8580_P_T.cc rename to src/sound/resid-fp/wave8580_P_T.cc diff --git a/src/SOUND/resid-fp/wave8580_P_T.dat b/src/sound/resid-fp/wave8580_P_T.dat similarity index 100% rename from src/SOUND/resid-fp/wave8580_P_T.dat rename to src/sound/resid-fp/wave8580_P_T.dat diff --git a/src/SOUND/resid-fp/wave8580__ST.cc b/src/sound/resid-fp/wave8580__ST.cc similarity index 100% rename from src/SOUND/resid-fp/wave8580__ST.cc rename to src/sound/resid-fp/wave8580__ST.cc diff --git a/src/SOUND/resid-fp/wave8580__ST.dat b/src/sound/resid-fp/wave8580__ST.dat similarity index 100% rename from src/SOUND/resid-fp/wave8580__ST.dat rename to src/sound/resid-fp/wave8580__ST.dat diff --git a/src/SOUND/snd_ad1848.c b/src/sound/snd_ad1848.c similarity index 100% rename from src/SOUND/snd_ad1848.c rename to src/sound/snd_ad1848.c diff --git a/src/SOUND/snd_ad1848.h b/src/sound/snd_ad1848.h similarity index 100% rename from src/SOUND/snd_ad1848.h rename to src/sound/snd_ad1848.h diff --git a/src/SOUND/snd_adlib.c b/src/sound/snd_adlib.c similarity index 100% rename from src/SOUND/snd_adlib.c rename to src/sound/snd_adlib.c diff --git a/src/SOUND/snd_adlib.h b/src/sound/snd_adlib.h similarity index 100% rename from src/SOUND/snd_adlib.h rename to src/sound/snd_adlib.h diff --git a/src/SOUND/snd_adlibgold.c b/src/sound/snd_adlibgold.c similarity index 100% rename from src/SOUND/snd_adlibgold.c rename to src/sound/snd_adlibgold.c diff --git a/src/SOUND/snd_adlibgold.h b/src/sound/snd_adlibgold.h similarity index 100% rename from src/SOUND/snd_adlibgold.h rename to src/sound/snd_adlibgold.h diff --git a/src/SOUND/snd_cms.c b/src/sound/snd_cms.c similarity index 100% rename from src/SOUND/snd_cms.c rename to src/sound/snd_cms.c diff --git a/src/SOUND/snd_cms.h b/src/sound/snd_cms.h similarity index 100% rename from src/SOUND/snd_cms.h rename to src/sound/snd_cms.h diff --git a/src/SOUND/snd_dbopl.cc b/src/sound/snd_dbopl.cc similarity index 100% rename from src/SOUND/snd_dbopl.cc rename to src/sound/snd_dbopl.cc diff --git a/src/SOUND/snd_dbopl.h b/src/sound/snd_dbopl.h similarity index 100% rename from src/SOUND/snd_dbopl.h rename to src/sound/snd_dbopl.h diff --git a/src/SOUND/snd_emu8k.c b/src/sound/snd_emu8k.c similarity index 100% rename from src/SOUND/snd_emu8k.c rename to src/sound/snd_emu8k.c diff --git a/src/SOUND/snd_emu8k.h b/src/sound/snd_emu8k.h similarity index 100% rename from src/SOUND/snd_emu8k.h rename to src/sound/snd_emu8k.h diff --git a/src/SOUND/snd_gus.c b/src/sound/snd_gus.c similarity index 100% rename from src/SOUND/snd_gus.c rename to src/sound/snd_gus.c diff --git a/src/SOUND/snd_gus.h b/src/sound/snd_gus.h similarity index 100% rename from src/SOUND/snd_gus.h rename to src/sound/snd_gus.h diff --git a/src/SOUND/snd_mpu401.c b/src/sound/snd_mpu401.c similarity index 100% rename from src/SOUND/snd_mpu401.c rename to src/sound/snd_mpu401.c diff --git a/src/SOUND/snd_mpu401.h b/src/sound/snd_mpu401.h similarity index 100% rename from src/SOUND/snd_mpu401.h rename to src/sound/snd_mpu401.h diff --git a/src/SOUND/snd_opl.c b/src/sound/snd_opl.c similarity index 100% rename from src/SOUND/snd_opl.c rename to src/sound/snd_opl.c diff --git a/src/SOUND/snd_opl.h b/src/sound/snd_opl.h similarity index 100% rename from src/SOUND/snd_opl.h rename to src/sound/snd_opl.h diff --git a/src/SOUND/snd_pas16.c b/src/sound/snd_pas16.c similarity index 100% rename from src/SOUND/snd_pas16.c rename to src/sound/snd_pas16.c diff --git a/src/SOUND/snd_pas16.h b/src/sound/snd_pas16.h similarity index 100% rename from src/SOUND/snd_pas16.h rename to src/sound/snd_pas16.h diff --git a/src/SOUND/snd_ps1.c b/src/sound/snd_ps1.c similarity index 100% rename from src/SOUND/snd_ps1.c rename to src/sound/snd_ps1.c diff --git a/src/SOUND/snd_ps1.h b/src/sound/snd_ps1.h similarity index 100% rename from src/SOUND/snd_ps1.h rename to src/sound/snd_ps1.h diff --git a/src/SOUND/snd_pssj.c b/src/sound/snd_pssj.c similarity index 100% rename from src/SOUND/snd_pssj.c rename to src/sound/snd_pssj.c diff --git a/src/SOUND/snd_pssj.h b/src/sound/snd_pssj.h similarity index 100% rename from src/SOUND/snd_pssj.h rename to src/sound/snd_pssj.h diff --git a/src/SOUND/snd_resid.cc b/src/sound/snd_resid.cc similarity index 100% rename from src/SOUND/snd_resid.cc rename to src/sound/snd_resid.cc diff --git a/src/SOUND/snd_resid.h b/src/sound/snd_resid.h similarity index 100% rename from src/SOUND/snd_resid.h rename to src/sound/snd_resid.h diff --git a/src/SOUND/snd_sb.c b/src/sound/snd_sb.c similarity index 100% rename from src/SOUND/snd_sb.c rename to src/sound/snd_sb.c diff --git a/src/SOUND/snd_sb.h b/src/sound/snd_sb.h similarity index 100% rename from src/SOUND/snd_sb.h rename to src/sound/snd_sb.h diff --git a/src/SOUND/snd_sb_dsp.c b/src/sound/snd_sb_dsp.c similarity index 100% rename from src/SOUND/snd_sb_dsp.c rename to src/sound/snd_sb_dsp.c diff --git a/src/SOUND/snd_sb_dsp.h b/src/sound/snd_sb_dsp.h similarity index 100% rename from src/SOUND/snd_sb_dsp.h rename to src/sound/snd_sb_dsp.h diff --git a/src/SOUND/snd_sn76489.c b/src/sound/snd_sn76489.c similarity index 100% rename from src/SOUND/snd_sn76489.c rename to src/sound/snd_sn76489.c diff --git a/src/SOUND/snd_sn76489.h b/src/sound/snd_sn76489.h similarity index 100% rename from src/SOUND/snd_sn76489.h rename to src/sound/snd_sn76489.h diff --git a/src/SOUND/snd_speaker.c b/src/sound/snd_speaker.c similarity index 100% rename from src/SOUND/snd_speaker.c rename to src/sound/snd_speaker.c diff --git a/src/SOUND/snd_speaker.h b/src/sound/snd_speaker.h similarity index 100% rename from src/SOUND/snd_speaker.h rename to src/sound/snd_speaker.h diff --git a/src/SOUND/snd_ssi2001.c b/src/sound/snd_ssi2001.c similarity index 100% rename from src/SOUND/snd_ssi2001.c rename to src/sound/snd_ssi2001.c diff --git a/src/SOUND/snd_ssi2001.h b/src/sound/snd_ssi2001.h similarity index 100% rename from src/SOUND/snd_ssi2001.h rename to src/sound/snd_ssi2001.h diff --git a/src/SOUND/snd_wss.c b/src/sound/snd_wss.c similarity index 100% rename from src/SOUND/snd_wss.c rename to src/sound/snd_wss.c diff --git a/src/SOUND/snd_wss.h b/src/sound/snd_wss.h similarity index 100% rename from src/SOUND/snd_wss.h rename to src/sound/snd_wss.h diff --git a/src/SOUND/snd_ym7128.c b/src/sound/snd_ym7128.c similarity index 100% rename from src/SOUND/snd_ym7128.c rename to src/sound/snd_ym7128.c diff --git a/src/SOUND/snd_ym7128.h b/src/sound/snd_ym7128.h similarity index 100% rename from src/SOUND/snd_ym7128.h rename to src/sound/snd_ym7128.h diff --git a/src/SOUND/sound.c b/src/sound/sound.c similarity index 100% rename from src/SOUND/sound.c rename to src/sound/sound.c diff --git a/src/SOUND/sound.h b/src/sound/sound.h similarity index 100% rename from src/SOUND/sound.h rename to src/sound/sound.h diff --git a/src/VIDEO/vid_ati18800.c b/src/video/vid_ati18800.c similarity index 100% rename from src/VIDEO/vid_ati18800.c rename to src/video/vid_ati18800.c diff --git a/src/VIDEO/vid_ati18800.h b/src/video/vid_ati18800.h similarity index 100% rename from src/VIDEO/vid_ati18800.h rename to src/video/vid_ati18800.h diff --git a/src/VIDEO/vid_ati28800.c b/src/video/vid_ati28800.c similarity index 100% rename from src/VIDEO/vid_ati28800.c rename to src/video/vid_ati28800.c diff --git a/src/VIDEO/vid_ati28800.h b/src/video/vid_ati28800.h similarity index 100% rename from src/VIDEO/vid_ati28800.h rename to src/video/vid_ati28800.h diff --git a/src/VIDEO/vid_ati68860_ramdac.c b/src/video/vid_ati68860_ramdac.c similarity index 100% rename from src/VIDEO/vid_ati68860_ramdac.c rename to src/video/vid_ati68860_ramdac.c diff --git a/src/VIDEO/vid_ati68860_ramdac.h b/src/video/vid_ati68860_ramdac.h similarity index 100% rename from src/VIDEO/vid_ati68860_ramdac.h rename to src/video/vid_ati68860_ramdac.h diff --git a/src/VIDEO/vid_ati_eeprom.c b/src/video/vid_ati_eeprom.c similarity index 100% rename from src/VIDEO/vid_ati_eeprom.c rename to src/video/vid_ati_eeprom.c diff --git a/src/VIDEO/vid_ati_eeprom.h b/src/video/vid_ati_eeprom.h similarity index 100% rename from src/VIDEO/vid_ati_eeprom.h rename to src/video/vid_ati_eeprom.h diff --git a/src/VIDEO/vid_ati_mach64.c b/src/video/vid_ati_mach64.c similarity index 100% rename from src/VIDEO/vid_ati_mach64.c rename to src/video/vid_ati_mach64.c diff --git a/src/VIDEO/vid_ati_mach64.h b/src/video/vid_ati_mach64.h similarity index 100% rename from src/VIDEO/vid_ati_mach64.h rename to src/video/vid_ati_mach64.h diff --git a/src/VIDEO/vid_bt485_ramdac.c b/src/video/vid_bt485_ramdac.c similarity index 100% rename from src/VIDEO/vid_bt485_ramdac.c rename to src/video/vid_bt485_ramdac.c diff --git a/src/VIDEO/vid_bt485_ramdac.h b/src/video/vid_bt485_ramdac.h similarity index 100% rename from src/VIDEO/vid_bt485_ramdac.h rename to src/video/vid_bt485_ramdac.h diff --git a/src/VIDEO/vid_cga.c b/src/video/vid_cga.c similarity index 100% rename from src/VIDEO/vid_cga.c rename to src/video/vid_cga.c diff --git a/src/VIDEO/vid_cga.h b/src/video/vid_cga.h similarity index 100% rename from src/VIDEO/vid_cga.h rename to src/video/vid_cga.h diff --git a/src/VIDEO/vid_cga_comp.c b/src/video/vid_cga_comp.c similarity index 100% rename from src/VIDEO/vid_cga_comp.c rename to src/video/vid_cga_comp.c diff --git a/src/VIDEO/vid_cga_comp.h b/src/video/vid_cga_comp.h similarity index 100% rename from src/VIDEO/vid_cga_comp.h rename to src/video/vid_cga_comp.h diff --git a/src/VIDEO/vid_cl5429.h b/src/video/vid_cl5429.h similarity index 100% rename from src/VIDEO/vid_cl5429.h rename to src/video/vid_cl5429.h diff --git a/src/VIDEO/vid_cl_gd.c b/src/video/vid_cl_gd.c similarity index 100% rename from src/VIDEO/vid_cl_gd.c rename to src/video/vid_cl_gd.c diff --git a/src/VIDEO/vid_cl_gd.h b/src/video/vid_cl_gd.h similarity index 100% rename from src/VIDEO/vid_cl_gd.h rename to src/video/vid_cl_gd.h diff --git a/src/VIDEO/vid_cl_gd_blit.c b/src/video/vid_cl_gd_blit.c similarity index 100% rename from src/VIDEO/vid_cl_gd_blit.c rename to src/video/vid_cl_gd_blit.c diff --git a/src/VIDEO/vid_cl_gd_blit.h b/src/video/vid_cl_gd_blit.h similarity index 100% rename from src/VIDEO/vid_cl_gd_blit.h rename to src/video/vid_cl_gd_blit.h diff --git a/src/VIDEO/vid_cl_gd_vga_rop.h b/src/video/vid_cl_gd_vga_rop.h similarity index 100% rename from src/VIDEO/vid_cl_gd_vga_rop.h rename to src/video/vid_cl_gd_vga_rop.h diff --git a/src/VIDEO/vid_cl_gd_vga_rop2.h b/src/video/vid_cl_gd_vga_rop2.h similarity index 100% rename from src/VIDEO/vid_cl_gd_vga_rop2.h rename to src/video/vid_cl_gd_vga_rop2.h diff --git a/src/VIDEO/vid_cl_ramdac.c b/src/video/vid_cl_ramdac.c similarity index 100% rename from src/VIDEO/vid_cl_ramdac.c rename to src/video/vid_cl_ramdac.c diff --git a/src/VIDEO/vid_cl_ramdac.h b/src/video/vid_cl_ramdac.h similarity index 100% rename from src/VIDEO/vid_cl_ramdac.h rename to src/video/vid_cl_ramdac.h diff --git a/src/VIDEO/vid_colorplus.c b/src/video/vid_colorplus.c similarity index 100% rename from src/VIDEO/vid_colorplus.c rename to src/video/vid_colorplus.c diff --git a/src/VIDEO/vid_colorplus.h b/src/video/vid_colorplus.h similarity index 100% rename from src/VIDEO/vid_colorplus.h rename to src/video/vid_colorplus.h diff --git a/src/VIDEO/vid_ega.c b/src/video/vid_ega.c similarity index 100% rename from src/VIDEO/vid_ega.c rename to src/video/vid_ega.c diff --git a/src/VIDEO/vid_ega.h b/src/video/vid_ega.h similarity index 100% rename from src/VIDEO/vid_ega.h rename to src/video/vid_ega.h diff --git a/src/VIDEO/vid_ega_render.c b/src/video/vid_ega_render.c similarity index 100% rename from src/VIDEO/vid_ega_render.c rename to src/video/vid_ega_render.c diff --git a/src/VIDEO/vid_ega_render.h b/src/video/vid_ega_render.h similarity index 100% rename from src/VIDEO/vid_ega_render.h rename to src/video/vid_ega_render.h diff --git a/src/VIDEO/vid_et4000.c b/src/video/vid_et4000.c similarity index 100% rename from src/VIDEO/vid_et4000.c rename to src/video/vid_et4000.c diff --git a/src/VIDEO/vid_et4000.h b/src/video/vid_et4000.h similarity index 100% rename from src/VIDEO/vid_et4000.h rename to src/video/vid_et4000.h diff --git a/src/VIDEO/vid_et4000w32.c b/src/video/vid_et4000w32.c similarity index 100% rename from src/VIDEO/vid_et4000w32.c rename to src/video/vid_et4000w32.c diff --git a/src/VIDEO/vid_et4000w32.h b/src/video/vid_et4000w32.h similarity index 100% rename from src/VIDEO/vid_et4000w32.h rename to src/video/vid_et4000w32.h diff --git a/src/VIDEO/vid_et4000w32i.c b/src/video/vid_et4000w32i.c similarity index 100% rename from src/VIDEO/vid_et4000w32i.c rename to src/video/vid_et4000w32i.c diff --git a/src/VIDEO/vid_genius.c b/src/video/vid_genius.c similarity index 100% rename from src/VIDEO/vid_genius.c rename to src/video/vid_genius.c diff --git a/src/VIDEO/vid_genius.h b/src/video/vid_genius.h similarity index 100% rename from src/VIDEO/vid_genius.h rename to src/video/vid_genius.h diff --git a/src/VIDEO/vid_hercules.c b/src/video/vid_hercules.c similarity index 100% rename from src/VIDEO/vid_hercules.c rename to src/video/vid_hercules.c diff --git a/src/VIDEO/vid_hercules.h b/src/video/vid_hercules.h similarity index 100% rename from src/VIDEO/vid_hercules.h rename to src/video/vid_hercules.h diff --git a/src/VIDEO/vid_herculesplus.c b/src/video/vid_herculesplus.c similarity index 100% rename from src/VIDEO/vid_herculesplus.c rename to src/video/vid_herculesplus.c diff --git a/src/VIDEO/vid_herculesplus.h b/src/video/vid_herculesplus.h similarity index 100% rename from src/VIDEO/vid_herculesplus.h rename to src/video/vid_herculesplus.h diff --git a/src/VIDEO/vid_icd2061.c b/src/video/vid_icd2061.c similarity index 100% rename from src/VIDEO/vid_icd2061.c rename to src/video/vid_icd2061.c diff --git a/src/VIDEO/vid_icd2061.h b/src/video/vid_icd2061.h similarity index 100% rename from src/VIDEO/vid_icd2061.h rename to src/video/vid_icd2061.h diff --git a/src/VIDEO/vid_ics2595.c b/src/video/vid_ics2595.c similarity index 100% rename from src/VIDEO/vid_ics2595.c rename to src/video/vid_ics2595.c diff --git a/src/VIDEO/vid_ics2595.h b/src/video/vid_ics2595.h similarity index 100% rename from src/VIDEO/vid_ics2595.h rename to src/video/vid_ics2595.h diff --git a/src/VIDEO/vid_incolor.c b/src/video/vid_incolor.c similarity index 100% rename from src/VIDEO/vid_incolor.c rename to src/video/vid_incolor.c diff --git a/src/VIDEO/vid_incolor.h b/src/video/vid_incolor.h similarity index 100% rename from src/VIDEO/vid_incolor.h rename to src/video/vid_incolor.h diff --git a/src/VIDEO/vid_mda.c b/src/video/vid_mda.c similarity index 100% rename from src/VIDEO/vid_mda.c rename to src/video/vid_mda.c diff --git a/src/VIDEO/vid_mda.h b/src/video/vid_mda.h similarity index 100% rename from src/VIDEO/vid_mda.h rename to src/video/vid_mda.h diff --git a/src/VIDEO/vid_nv_riva128.c b/src/video/vid_nv_riva128.c similarity index 100% rename from src/VIDEO/vid_nv_riva128.c rename to src/video/vid_nv_riva128.c diff --git a/src/VIDEO/vid_nv_riva128.h b/src/video/vid_nv_riva128.h similarity index 100% rename from src/VIDEO/vid_nv_riva128.h rename to src/video/vid_nv_riva128.h diff --git a/src/VIDEO/vid_olivetti_m24.c b/src/video/vid_olivetti_m24.c similarity index 100% rename from src/VIDEO/vid_olivetti_m24.c rename to src/video/vid_olivetti_m24.c diff --git a/src/VIDEO/vid_olivetti_m24.h b/src/video/vid_olivetti_m24.h similarity index 100% rename from src/VIDEO/vid_olivetti_m24.h rename to src/video/vid_olivetti_m24.h diff --git a/src/VIDEO/vid_oti067.c b/src/video/vid_oti067.c similarity index 100% rename from src/VIDEO/vid_oti067.c rename to src/video/vid_oti067.c diff --git a/src/VIDEO/vid_oti067.h b/src/video/vid_oti067.h similarity index 100% rename from src/VIDEO/vid_oti067.h rename to src/video/vid_oti067.h diff --git a/src/VIDEO/vid_paradise.c b/src/video/vid_paradise.c similarity index 100% rename from src/VIDEO/vid_paradise.c rename to src/video/vid_paradise.c diff --git a/src/VIDEO/vid_paradise.h b/src/video/vid_paradise.h similarity index 100% rename from src/VIDEO/vid_paradise.h rename to src/video/vid_paradise.h diff --git a/src/VIDEO/vid_pc1512.c b/src/video/vid_pc1512.c similarity index 100% rename from src/VIDEO/vid_pc1512.c rename to src/video/vid_pc1512.c diff --git a/src/VIDEO/vid_pc1512.h b/src/video/vid_pc1512.h similarity index 100% rename from src/VIDEO/vid_pc1512.h rename to src/video/vid_pc1512.h diff --git a/src/VIDEO/vid_pc1640.c b/src/video/vid_pc1640.c similarity index 100% rename from src/VIDEO/vid_pc1640.c rename to src/video/vid_pc1640.c diff --git a/src/VIDEO/vid_pc1640.h b/src/video/vid_pc1640.h similarity index 100% rename from src/VIDEO/vid_pc1640.h rename to src/video/vid_pc1640.h diff --git a/src/VIDEO/vid_pc200.c b/src/video/vid_pc200.c similarity index 100% rename from src/VIDEO/vid_pc200.c rename to src/video/vid_pc200.c diff --git a/src/VIDEO/vid_pc200.h b/src/video/vid_pc200.h similarity index 100% rename from src/VIDEO/vid_pc200.h rename to src/video/vid_pc200.h diff --git a/src/VIDEO/vid_pcjr.c b/src/video/vid_pcjr.c similarity index 100% rename from src/VIDEO/vid_pcjr.c rename to src/video/vid_pcjr.c diff --git a/src/VIDEO/vid_pcjr.h b/src/video/vid_pcjr.h similarity index 100% rename from src/VIDEO/vid_pcjr.h rename to src/video/vid_pcjr.h diff --git a/src/VIDEO/vid_ps1_svga.c b/src/video/vid_ps1_svga.c similarity index 100% rename from src/VIDEO/vid_ps1_svga.c rename to src/video/vid_ps1_svga.c diff --git a/src/VIDEO/vid_ps1_svga.h b/src/video/vid_ps1_svga.h similarity index 100% rename from src/VIDEO/vid_ps1_svga.h rename to src/video/vid_ps1_svga.h diff --git a/src/VIDEO/vid_s3.c b/src/video/vid_s3.c similarity index 99% rename from src/VIDEO/vid_s3.c rename to src/video/vid_s3.c index 909d70699..b587f6630 100644 --- a/src/VIDEO/vid_s3.c +++ b/src/video/vid_s3.c @@ -6,7 +6,7 @@ #include "../mem.h" #include "../pci.h" #include "../rom.h" -#include "../WIN/plat_thread.h" +#include "../win/plat_thread.h" #include "video.h" #include "vid_s3.h" #include "vid_svga.h" diff --git a/src/VIDEO/vid_s3.h b/src/video/vid_s3.h similarity index 100% rename from src/VIDEO/vid_s3.h rename to src/video/vid_s3.h diff --git a/src/VIDEO/vid_s3_virge.c b/src/video/vid_s3_virge.c similarity index 100% rename from src/VIDEO/vid_s3_virge.c rename to src/video/vid_s3_virge.c diff --git a/src/VIDEO/vid_s3_virge.h b/src/video/vid_s3_virge.h similarity index 100% rename from src/VIDEO/vid_s3_virge.h rename to src/video/vid_s3_virge.h diff --git a/src/VIDEO/vid_sc1502x_ramdac.c b/src/video/vid_sc1502x_ramdac.c similarity index 100% rename from src/VIDEO/vid_sc1502x_ramdac.c rename to src/video/vid_sc1502x_ramdac.c diff --git a/src/VIDEO/vid_sc1502x_ramdac.h b/src/video/vid_sc1502x_ramdac.h similarity index 100% rename from src/VIDEO/vid_sc1502x_ramdac.h rename to src/video/vid_sc1502x_ramdac.h diff --git a/src/VIDEO/vid_sdac_ramdac.c b/src/video/vid_sdac_ramdac.c similarity index 100% rename from src/VIDEO/vid_sdac_ramdac.c rename to src/video/vid_sdac_ramdac.c diff --git a/src/VIDEO/vid_sdac_ramdac.h b/src/video/vid_sdac_ramdac.h similarity index 100% rename from src/VIDEO/vid_sdac_ramdac.h rename to src/video/vid_sdac_ramdac.h diff --git a/src/VIDEO/vid_stg_ramdac.c b/src/video/vid_stg_ramdac.c similarity index 100% rename from src/VIDEO/vid_stg_ramdac.c rename to src/video/vid_stg_ramdac.c diff --git a/src/VIDEO/vid_stg_ramdac.h b/src/video/vid_stg_ramdac.h similarity index 100% rename from src/VIDEO/vid_stg_ramdac.h rename to src/video/vid_stg_ramdac.h diff --git a/src/VIDEO/vid_svga.c b/src/video/vid_svga.c similarity index 100% rename from src/VIDEO/vid_svga.c rename to src/video/vid_svga.c diff --git a/src/VIDEO/vid_svga.h b/src/video/vid_svga.h similarity index 100% rename from src/VIDEO/vid_svga.h rename to src/video/vid_svga.h diff --git a/src/VIDEO/vid_svga_render.c b/src/video/vid_svga_render.c similarity index 100% rename from src/VIDEO/vid_svga_render.c rename to src/video/vid_svga_render.c diff --git a/src/VIDEO/vid_svga_render.h b/src/video/vid_svga_render.h similarity index 100% rename from src/VIDEO/vid_svga_render.h rename to src/video/vid_svga_render.h diff --git a/src/VIDEO/vid_tandy.c b/src/video/vid_tandy.c similarity index 100% rename from src/VIDEO/vid_tandy.c rename to src/video/vid_tandy.c diff --git a/src/VIDEO/vid_tandy.h b/src/video/vid_tandy.h similarity index 100% rename from src/VIDEO/vid_tandy.h rename to src/video/vid_tandy.h diff --git a/src/VIDEO/vid_tandysl.c b/src/video/vid_tandysl.c similarity index 100% rename from src/VIDEO/vid_tandysl.c rename to src/video/vid_tandysl.c diff --git a/src/VIDEO/vid_tandysl.h b/src/video/vid_tandysl.h similarity index 100% rename from src/VIDEO/vid_tandysl.h rename to src/video/vid_tandysl.h diff --git a/src/VIDEO/vid_tgui9440.c b/src/video/vid_tgui9440.c similarity index 100% rename from src/VIDEO/vid_tgui9440.c rename to src/video/vid_tgui9440.c diff --git a/src/VIDEO/vid_tgui9440.h b/src/video/vid_tgui9440.h similarity index 100% rename from src/VIDEO/vid_tgui9440.h rename to src/video/vid_tgui9440.h diff --git a/src/VIDEO/vid_tkd8001_ramdac.c b/src/video/vid_tkd8001_ramdac.c similarity index 100% rename from src/VIDEO/vid_tkd8001_ramdac.c rename to src/video/vid_tkd8001_ramdac.c diff --git a/src/VIDEO/vid_tkd8001_ramdac.h b/src/video/vid_tkd8001_ramdac.h similarity index 100% rename from src/VIDEO/vid_tkd8001_ramdac.h rename to src/video/vid_tkd8001_ramdac.h diff --git a/src/VIDEO/vid_tvga.c b/src/video/vid_tvga.c similarity index 100% rename from src/VIDEO/vid_tvga.c rename to src/video/vid_tvga.c diff --git a/src/VIDEO/vid_tvga.h b/src/video/vid_tvga.h similarity index 100% rename from src/VIDEO/vid_tvga.h rename to src/video/vid_tvga.h diff --git a/src/VIDEO/vid_vga.c b/src/video/vid_vga.c similarity index 100% rename from src/VIDEO/vid_vga.c rename to src/video/vid_vga.c diff --git a/src/VIDEO/vid_vga.h b/src/video/vid_vga.h similarity index 100% rename from src/VIDEO/vid_vga.h rename to src/video/vid_vga.h diff --git a/src/VIDEO/vid_voodoo.c b/src/video/vid_voodoo.c similarity index 100% rename from src/VIDEO/vid_voodoo.c rename to src/video/vid_voodoo.c diff --git a/src/VIDEO/vid_voodoo.h b/src/video/vid_voodoo.h similarity index 100% rename from src/VIDEO/vid_voodoo.h rename to src/video/vid_voodoo.h diff --git a/src/VIDEO/vid_voodoo_codegen_x86-64.h b/src/video/vid_voodoo_codegen_x86-64.h similarity index 100% rename from src/VIDEO/vid_voodoo_codegen_x86-64.h rename to src/video/vid_voodoo_codegen_x86-64.h diff --git a/src/VIDEO/vid_voodoo_codegen_x86.h b/src/video/vid_voodoo_codegen_x86.h similarity index 100% rename from src/VIDEO/vid_voodoo_codegen_x86.h rename to src/video/vid_voodoo_codegen_x86.h diff --git a/src/VIDEO/vid_voodoo_dither.h b/src/video/vid_voodoo_dither.h similarity index 100% rename from src/VIDEO/vid_voodoo_dither.h rename to src/video/vid_voodoo_dither.h diff --git a/src/VIDEO/vid_wy700.c b/src/video/vid_wy700.c similarity index 100% rename from src/VIDEO/vid_wy700.c rename to src/video/vid_wy700.c diff --git a/src/VIDEO/vid_wy700.h b/src/video/vid_wy700.h similarity index 100% rename from src/VIDEO/vid_wy700.h rename to src/video/vid_wy700.h diff --git a/src/VIDEO/video.c b/src/video/video.c similarity index 100% rename from src/VIDEO/video.c rename to src/video/video.c diff --git a/src/VIDEO/video.h b/src/video/video.h similarity index 100% rename from src/VIDEO/video.h rename to src/video/video.h diff --git a/src/WIN/86Box.manifest b/src/win/86Box.manifest similarity index 100% rename from src/WIN/86Box.manifest rename to src/win/86Box.manifest diff --git a/src/WIN/86Box.rc b/src/win/86Box.rc similarity index 93% rename from src/WIN/86Box.rc rename to src/win/86Box.rc index 91961534d..dd38744a7 100644 --- a/src/WIN/86Box.rc +++ b/src/win/86Box.rc @@ -504,49 +504,49 @@ END // remains consistent on all systems. #ifdef RELEASE_BUILD /* Icon by Devcore - https://commons.wikimedia.org/wiki/File:Icon_PC_256x256.png */ -100 ICON DISCARDABLE "WIN/ICONS/86Box-RB.ico" +100 ICON DISCARDABLE "win/icons/86Box-RB.ico" #else /* Icon by Devcore - https://commons.wikimedia.org/wiki/File:Icon_PC2_256x256.png */ -100 ICON DISCARDABLE "WIN/ICONS/86Box.ico" +100 ICON DISCARDABLE "win/icons/86Box.ico" #endif -128 ICON DISCARDABLE "WIN/ICONS/floppy_525.ico" -129 ICON DISCARDABLE "WIN/ICONS/floppy_525_active.ico" -144 ICON DISCARDABLE "WIN/ICONS/floppy_35.ico" -145 ICON DISCARDABLE "WIN/ICONS/floppy_35_active.ico" -160 ICON DISCARDABLE "WIN/ICONS/cdrom.ico" -161 ICON DISCARDABLE "WIN/ICONS/cdrom_active.ico" -176 ICON DISCARDABLE "WIN/ICONS/removable_disk.ico" -177 ICON DISCARDABLE "WIN/ICONS/removable_disk_active.ico" -192 ICON DISCARDABLE "WIN/ICONS/hard_disk.ico" -193 ICON DISCARDABLE "WIN/ICONS/hard_disk_active.ico" +128 ICON DISCARDABLE "win/icons/floppy_525.ico" +129 ICON DISCARDABLE "win/icons/floppy_525_active.ico" +144 ICON DISCARDABLE "win/icons/floppy_35.ico" +145 ICON DISCARDABLE "win/icons/floppy_35_active.ico" +160 ICON DISCARDABLE "win/icons/cdrom.ico" +161 ICON DISCARDABLE "win/icons/cdrom_active.ico" +176 ICON DISCARDABLE "win/icons/removable_disk.ico" +177 ICON DISCARDABLE "win/icons/removable_disk_active.ico" +192 ICON DISCARDABLE "win/icons/hard_disk.ico" +193 ICON DISCARDABLE "win/icons/hard_disk_active.ico" #ifdef USE_NETWORK -208 ICON DISCARDABLE "WIN/ICONS/network.ico" -209 ICON DISCARDABLE "WIN/ICONS/network_active.ico" +208 ICON DISCARDABLE "win/icons/network.ico" +209 ICON DISCARDABLE "win/icons/network_active.ico" #endif -256 ICON DISCARDABLE "WIN/ICONS/machine.ico" -257 ICON DISCARDABLE "WIN/ICONS/display.ico" -258 ICON DISCARDABLE "WIN/ICONS/input_devices.ico" -259 ICON DISCARDABLE "WIN/ICONS/sound.ico" +256 ICON DISCARDABLE "win/icons/machine.ico" +257 ICON DISCARDABLE "win/icons/display.ico" +258 ICON DISCARDABLE "win/icons/input_devices.ico" +259 ICON DISCARDABLE "win/icons/sound.ico" #ifdef USE_NETWORK -260 ICON DISCARDABLE "WIN/ICONS/network.ico" -261 ICON DISCARDABLE "WIN/ICONS/other_peripherals.ico" -262 ICON DISCARDABLE "WIN/ICONS/hard_disk.ico" -263 ICON DISCARDABLE "WIN/ICONS/removable_devices.ico" +260 ICON DISCARDABLE "win/icons/network.ico" +261 ICON DISCARDABLE "win/icons/other_peripherals.ico" +262 ICON DISCARDABLE "win/icons/hard_disk.ico" +263 ICON DISCARDABLE "win/icons/removable_devices.ico" #else -260 ICON DISCARDABLE "WIN/ICONS/other_peripherals.ico" -261 ICON DISCARDABLE "WIN/ICONS/hard_disk.ico" -262 ICON DISCARDABLE "WIN/ICONS/removable_devices.ico" +260 ICON DISCARDABLE "win/icons/other_peripherals.ico" +261 ICON DISCARDABLE "win/icons/hard_disk.ico" +262 ICON DISCARDABLE "win/icons/removable_devices.ico" #endif -384 ICON DISCARDABLE "WIN/ICONS/floppy_525_empty.ico" -385 ICON DISCARDABLE "WIN/ICONS/floppy_525_empty_active.ico" -400 ICON DISCARDABLE "WIN/ICONS/floppy_35_empty.ico" -401 ICON DISCARDABLE "WIN/ICONS/floppy_35_empty_active.ico" -416 ICON DISCARDABLE "WIN/ICONS/cdrom_empty.ico" -417 ICON DISCARDABLE "WIN/ICONS/cdrom_empty_active.ico" -432 ICON DISCARDABLE "WIN/ICONS/removable_disk_empty.ico" -433 ICON DISCARDABLE "WIN/ICONS/removable_disk_empty_active.ico" -512 ICON DISCARDABLE "WIN/ICONS/floppy_disabled.ico" -514 ICON DISCARDABLE "WIN/ICONS/cdrom_disabled.ico" +384 ICON DISCARDABLE "win/icons/floppy_525_empty.ico" +385 ICON DISCARDABLE "win/icons/floppy_525_empty_active.ico" +400 ICON DISCARDABLE "win/icons/floppy_35_empty.ico" +401 ICON DISCARDABLE "win/icons/floppy_35_empty_active.ico" +416 ICON DISCARDABLE "win/icons/cdrom_empty.ico" +417 ICON DISCARDABLE "win/icons/cdrom_empty_active.ico" +432 ICON DISCARDABLE "win/icons/removable_disk_empty.ico" +433 ICON DISCARDABLE "win/icons/removable_disk_empty_active.ico" +512 ICON DISCARDABLE "win/icons/floppy_disabled.ico" +514 ICON DISCARDABLE "win/icons/cdrom_disabled.ico" #ifdef APSTUDIO_INVOKED ///////////////////////////////////////////////////////////////////////////// diff --git a/src/WIN/ICONS/86Box-RB.ico b/src/win/icons/86Box-RB.ico similarity index 100% rename from src/WIN/ICONS/86Box-RB.ico rename to src/win/icons/86Box-RB.ico diff --git a/src/WIN/ICONS/86Box.ico b/src/win/icons/86Box.ico similarity index 100% rename from src/WIN/ICONS/86Box.ico rename to src/win/icons/86Box.ico diff --git a/src/WIN/ICONS/cdrom.ico b/src/win/icons/cdrom.ico similarity index 100% rename from src/WIN/ICONS/cdrom.ico rename to src/win/icons/cdrom.ico diff --git a/src/WIN/ICONS/cdrom_active.ico b/src/win/icons/cdrom_active.ico similarity index 100% rename from src/WIN/ICONS/cdrom_active.ico rename to src/win/icons/cdrom_active.ico diff --git a/src/WIN/ICONS/cdrom_disabled.ico b/src/win/icons/cdrom_disabled.ico similarity index 100% rename from src/WIN/ICONS/cdrom_disabled.ico rename to src/win/icons/cdrom_disabled.ico diff --git a/src/WIN/ICONS/cdrom_empty.ico b/src/win/icons/cdrom_empty.ico similarity index 100% rename from src/WIN/ICONS/cdrom_empty.ico rename to src/win/icons/cdrom_empty.ico diff --git a/src/WIN/ICONS/cdrom_empty_active.ico b/src/win/icons/cdrom_empty_active.ico similarity index 100% rename from src/WIN/ICONS/cdrom_empty_active.ico rename to src/win/icons/cdrom_empty_active.ico diff --git a/src/WIN/ICONS/display.ico b/src/win/icons/display.ico similarity index 100% rename from src/WIN/ICONS/display.ico rename to src/win/icons/display.ico diff --git a/src/WIN/ICONS/floppy_35.ico b/src/win/icons/floppy_35.ico similarity index 100% rename from src/WIN/ICONS/floppy_35.ico rename to src/win/icons/floppy_35.ico diff --git a/src/WIN/ICONS/floppy_35_active.ico b/src/win/icons/floppy_35_active.ico similarity index 100% rename from src/WIN/ICONS/floppy_35_active.ico rename to src/win/icons/floppy_35_active.ico diff --git a/src/WIN/ICONS/floppy_35_empty.ico b/src/win/icons/floppy_35_empty.ico similarity index 100% rename from src/WIN/ICONS/floppy_35_empty.ico rename to src/win/icons/floppy_35_empty.ico diff --git a/src/WIN/ICONS/floppy_35_empty_active.ico b/src/win/icons/floppy_35_empty_active.ico similarity index 100% rename from src/WIN/ICONS/floppy_35_empty_active.ico rename to src/win/icons/floppy_35_empty_active.ico diff --git a/src/WIN/ICONS/floppy_525.ico b/src/win/icons/floppy_525.ico similarity index 100% rename from src/WIN/ICONS/floppy_525.ico rename to src/win/icons/floppy_525.ico diff --git a/src/WIN/ICONS/floppy_525_active.ico b/src/win/icons/floppy_525_active.ico similarity index 100% rename from src/WIN/ICONS/floppy_525_active.ico rename to src/win/icons/floppy_525_active.ico diff --git a/src/WIN/ICONS/floppy_525_empty.ico b/src/win/icons/floppy_525_empty.ico similarity index 100% rename from src/WIN/ICONS/floppy_525_empty.ico rename to src/win/icons/floppy_525_empty.ico diff --git a/src/WIN/ICONS/floppy_525_empty_active.ico b/src/win/icons/floppy_525_empty_active.ico similarity index 100% rename from src/WIN/ICONS/floppy_525_empty_active.ico rename to src/win/icons/floppy_525_empty_active.ico diff --git a/src/WIN/ICONS/floppy_disabled.ico b/src/win/icons/floppy_disabled.ico similarity index 100% rename from src/WIN/ICONS/floppy_disabled.ico rename to src/win/icons/floppy_disabled.ico diff --git a/src/WIN/ICONS/hard_disk.ico b/src/win/icons/hard_disk.ico similarity index 100% rename from src/WIN/ICONS/hard_disk.ico rename to src/win/icons/hard_disk.ico diff --git a/src/WIN/ICONS/hard_disk_active.ico b/src/win/icons/hard_disk_active.ico similarity index 100% rename from src/WIN/ICONS/hard_disk_active.ico rename to src/win/icons/hard_disk_active.ico diff --git a/src/WIN/ICONS/input_devices.ico b/src/win/icons/input_devices.ico similarity index 100% rename from src/WIN/ICONS/input_devices.ico rename to src/win/icons/input_devices.ico diff --git a/src/WIN/ICONS/machine.ico b/src/win/icons/machine.ico similarity index 100% rename from src/WIN/ICONS/machine.ico rename to src/win/icons/machine.ico diff --git a/src/WIN/ICONS/network.ico b/src/win/icons/network.ico similarity index 100% rename from src/WIN/ICONS/network.ico rename to src/win/icons/network.ico diff --git a/src/WIN/ICONS/network_active.ico b/src/win/icons/network_active.ico similarity index 100% rename from src/WIN/ICONS/network_active.ico rename to src/win/icons/network_active.ico diff --git a/src/WIN/ICONS/other_peripherals.ico b/src/win/icons/other_peripherals.ico similarity index 100% rename from src/WIN/ICONS/other_peripherals.ico rename to src/win/icons/other_peripherals.ico diff --git a/src/WIN/ICONS/removable_devices.ico b/src/win/icons/removable_devices.ico similarity index 100% rename from src/WIN/ICONS/removable_devices.ico rename to src/win/icons/removable_devices.ico diff --git a/src/WIN/ICONS/removable_disk.ico b/src/win/icons/removable_disk.ico similarity index 100% rename from src/WIN/ICONS/removable_disk.ico rename to src/win/icons/removable_disk.ico diff --git a/src/WIN/ICONS/removable_disk_active.ico b/src/win/icons/removable_disk_active.ico similarity index 100% rename from src/WIN/ICONS/removable_disk_active.ico rename to src/win/icons/removable_disk_active.ico diff --git a/src/WIN/ICONS/removable_disk_empty.ico b/src/win/icons/removable_disk_empty.ico similarity index 100% rename from src/WIN/ICONS/removable_disk_empty.ico rename to src/win/icons/removable_disk_empty.ico diff --git a/src/WIN/ICONS/removable_disk_empty_active.ico b/src/win/icons/removable_disk_empty_active.ico similarity index 100% rename from src/WIN/ICONS/removable_disk_empty_active.ico rename to src/win/icons/removable_disk_empty_active.ico diff --git a/src/WIN/ICONS/sound.ico b/src/win/icons/sound.ico similarity index 100% rename from src/WIN/ICONS/sound.ico rename to src/win/icons/sound.ico diff --git a/src/WIN/pcap_if.rc b/src/win/pcap_if.rc similarity index 90% rename from src/WIN/pcap_if.rc rename to src/win/pcap_if.rc index dd4a8f120..acc6d25c4 100644 --- a/src/WIN/pcap_if.rc +++ b/src/win/pcap_if.rc @@ -10,9 +10,9 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US * - https://commons.wikimedia.org/wiki/File:Icon_PC_256x256.png */ #ifdef RELEASE_BUILD -100 ICON DISCARDABLE "WIN/ICONS/86Box-RB.ico" +100 ICON DISCARDABLE "win/icons/86Box-RB.ico" #else -100 ICON DISCARDABLE "WIN/ICONS/86Box.ico" +100 ICON DISCARDABLE "win/icons/86Box.ico" #endif diff --git a/src/WIN/plat_dinput.h b/src/win/plat_dinput.h similarity index 100% rename from src/WIN/plat_dinput.h rename to src/win/plat_dinput.h diff --git a/src/WIN/plat_dir.h b/src/win/plat_dir.h similarity index 100% rename from src/WIN/plat_dir.h rename to src/win/plat_dir.h diff --git a/src/WIN/plat_dynld.h b/src/win/plat_dynld.h similarity index 100% rename from src/WIN/plat_dynld.h rename to src/win/plat_dynld.h diff --git a/src/WIN/plat_iodev.h b/src/win/plat_iodev.h similarity index 100% rename from src/WIN/plat_iodev.h rename to src/win/plat_iodev.h diff --git a/src/WIN/plat_joystick.h b/src/win/plat_joystick.h similarity index 100% rename from src/WIN/plat_joystick.h rename to src/win/plat_joystick.h diff --git a/src/WIN/plat_keyboard.h b/src/win/plat_keyboard.h similarity index 100% rename from src/WIN/plat_keyboard.h rename to src/win/plat_keyboard.h diff --git a/src/WIN/plat_midi.h b/src/win/plat_midi.h similarity index 100% rename from src/WIN/plat_midi.h rename to src/win/plat_midi.h diff --git a/src/WIN/plat_mouse.h b/src/win/plat_mouse.h similarity index 100% rename from src/WIN/plat_mouse.h rename to src/win/plat_mouse.h diff --git a/src/WIN/plat_serial.h b/src/win/plat_serial.h similarity index 100% rename from src/WIN/plat_serial.h rename to src/win/plat_serial.h diff --git a/src/WIN/plat_thread.h b/src/win/plat_thread.h similarity index 100% rename from src/WIN/plat_thread.h rename to src/win/plat_thread.h diff --git a/src/WIN/plat_ticks.h b/src/win/plat_ticks.h similarity index 100% rename from src/WIN/plat_ticks.h rename to src/win/plat_ticks.h diff --git a/src/WIN/plat_ui.h b/src/win/plat_ui.h similarity index 100% rename from src/WIN/plat_ui.h rename to src/win/plat_ui.h diff --git a/src/WIN/resource.h b/src/win/resource.h similarity index 100% rename from src/WIN/resource.h rename to src/win/resource.h diff --git a/src/WIN/win.c b/src/win/win.c similarity index 99% rename from src/WIN/win.c rename to src/win/win.c index 9c5f19a3c..39afba785 100644 --- a/src/WIN/win.c +++ b/src/win/win.c @@ -24,29 +24,29 @@ #include "../device.h" #include "../disc.h" #include "../fdd.h" -#include "../HDD/hdd.h" +#include "../hdd/hdd.h" #include "../ibm.h" -#include "../CPU/cpu.h" +#include "../cpu/cpu.h" #include "../mem.h" #ifdef USE_NETWORK -#include "../NETWORK/network.h" +#include "../network/network.h" #endif #include "../rom.h" #include "../nvr.h" #include "../config.h" #include "../model.h" -#include "../HDD/hdd_ide_at.h" +#include "../hdd/hdd_ide_at.h" #include "../cdrom.h" #include "../cdrom_null.h" #include "../cdrom_ioctl.h" #include "../cdrom_image.h" -#include "../SCSI/scsi.h" -#include "../SCSI/scsi_disk.h" -#include "../VIDEO/video.h" -#include "../VIDEO/vid_ega.h" +#include "../scsi/scsi.h" +#include "../scsi/scsi_disk.h" +#include "../video/video.h" +#include "../video/vid_ega.h" #include "../mouse.h" -#include "../SOUND/sound.h" -#include "../SOUND/snd_dbopl.h" +#include "../sound/sound.h" +#include "../sound/snd_dbopl.h" #include "plat_keyboard.h" #include "plat_iodev.h" #include "plat_mouse.h" diff --git a/src/WIN/win.h b/src/win/win.h similarity index 100% rename from src/WIN/win.h rename to src/win/win.h diff --git a/src/WIN/win_cgapal.h b/src/win/win_cgapal.h similarity index 100% rename from src/WIN/win_cgapal.h rename to src/win/win_cgapal.h diff --git a/src/WIN/win_crashdump.c b/src/win/win_crashdump.c similarity index 100% rename from src/WIN/win_crashdump.c rename to src/win/win_crashdump.c diff --git a/src/WIN/win_crashdump.h b/src/win/win_crashdump.h similarity index 100% rename from src/WIN/win_crashdump.h rename to src/win/win_crashdump.h diff --git a/src/WIN/win_d3d.cc b/src/win/win_d3d.cc similarity index 99% rename from src/WIN/win_d3d.cc rename to src/win/win_d3d.cc index 6dc5743bb..3b7740d56 100644 --- a/src/WIN/win_d3d.cc +++ b/src/win/win_d3d.cc @@ -16,7 +16,7 @@ * Copyright 2016,2017 Miran Grca. */ #include -#include "../VIDEO/video.h" +#include "../video/video.h" #include "win.h" #include "win_d3d.h" #include "win_cgapal.h" diff --git a/src/WIN/win_d3d.h b/src/win/win_d3d.h similarity index 100% rename from src/WIN/win_d3d.h rename to src/win/win_d3d.h diff --git a/src/WIN/win_d3d_fs.cc b/src/win/win_d3d_fs.cc similarity index 99% rename from src/WIN/win_d3d_fs.cc rename to src/win/win_d3d_fs.cc index bbd10669c..575d18d80 100644 --- a/src/WIN/win_d3d_fs.cc +++ b/src/win/win_d3d_fs.cc @@ -18,7 +18,7 @@ #include #include #include "../86box.h" -#include "../VIDEO/video.h" +#include "../video/video.h" #include "win.h" #include "win_d3d.h" #include "win_cgapal.h" diff --git a/src/WIN/win_ddraw.cc b/src/win/win_ddraw.cc similarity index 99% rename from src/WIN/win_ddraw.cc rename to src/win/win_ddraw.cc index 434ced8c4..e87265f87 100644 --- a/src/WIN/win_ddraw.cc +++ b/src/win/win_ddraw.cc @@ -3,7 +3,7 @@ */ #include #include -#include "../VIDEO/video.h" +#include "../video/video.h" #include "win_ddraw.h" #include "win_cgapal.h" diff --git a/src/WIN/win_ddraw.h b/src/win/win_ddraw.h similarity index 100% rename from src/WIN/win_ddraw.h rename to src/win/win_ddraw.h diff --git a/src/WIN/win_ddraw_fs.cc b/src/win/win_ddraw_fs.cc similarity index 99% rename from src/WIN/win_ddraw_fs.cc rename to src/win/win_ddraw_fs.cc index 9f2ddb92e..abb390093 100644 --- a/src/WIN/win_ddraw_fs.cc +++ b/src/win/win_ddraw_fs.cc @@ -2,7 +2,7 @@ see COPYING for more details */ #include -#include "../VIDEO/video.h" +#include "../video/video.h" #include "win_ddraw.h" #include "win_cgapal.h" diff --git a/src/WIN/win_ddraw_screenshot.cc b/src/win/win_ddraw_screenshot.cc similarity index 99% rename from src/WIN/win_ddraw_screenshot.cc rename to src/win/win_ddraw_screenshot.cc index d7e589617..853ee25ef 100644 --- a/src/WIN/win_ddraw_screenshot.cc +++ b/src/win/win_ddraw_screenshot.cc @@ -20,7 +20,7 @@ #define BITMAP WINDOWS_BITMAP #include #undef BITMAP -#include "../VIDEO/video.h" +#include "../video/video.h" #include "win.h" #include "win_ddraw.h" #include "win_language.h" diff --git a/src/WIN/win_deviceconfig.c b/src/win/win_deviceconfig.c similarity index 100% rename from src/WIN/win_deviceconfig.c rename to src/win/win_deviceconfig.c diff --git a/src/WIN/win_dynld.c b/src/win/win_dynld.c similarity index 100% rename from src/WIN/win_dynld.c rename to src/win/win_dynld.c diff --git a/src/WIN/win_iodev.c b/src/win/win_iodev.c similarity index 99% rename from src/WIN/win_iodev.c rename to src/win/win_iodev.c index cc62fb0bb..b47d9949b 100644 --- a/src/WIN/win_iodev.c +++ b/src/win/win_iodev.c @@ -35,7 +35,7 @@ #include "../cdrom_image.h" #include "../cdrom_ioctl.h" #include "../cdrom_null.h" -#include "../SCSI/scsi_disk.h" +#include "../scsi/scsi_disk.h" #include "plat_iodev.h" #include "win.h" diff --git a/src/WIN/win_joystick.cc b/src/win/win_joystick.cc similarity index 100% rename from src/WIN/win_joystick.cc rename to src/win/win_joystick.cc diff --git a/src/WIN/win_joystickconfig.c b/src/win/win_joystickconfig.c similarity index 100% rename from src/WIN/win_joystickconfig.c rename to src/win/win_joystickconfig.c diff --git a/src/WIN/win_keyboard.c b/src/win/win_keyboard.c similarity index 100% rename from src/WIN/win_keyboard.c rename to src/win/win_keyboard.c diff --git a/src/WIN/win_language.c b/src/win/win_language.c similarity index 100% rename from src/WIN/win_language.c rename to src/win/win_language.c diff --git a/src/WIN/win_language.h b/src/win/win_language.h similarity index 100% rename from src/WIN/win_language.h rename to src/win/win_language.h diff --git a/src/WIN/win_midi.c b/src/win/win_midi.c similarity index 99% rename from src/WIN/win_midi.c rename to src/win/win_midi.c index 4572c0b32..2c3e3eded 100644 --- a/src/WIN/win_midi.c +++ b/src/win/win_midi.c @@ -2,7 +2,7 @@ #include #include "../ibm.h" #include "../config.h" -#include "../SOUND/midi.h" +#include "../sound/midi.h" #include "plat_midi.h" int midi_id = 0; diff --git a/src/WIN/win_mouse.cc b/src/win/win_mouse.cc similarity index 100% rename from src/WIN/win_mouse.cc rename to src/win/win_mouse.cc diff --git a/src/WIN/win_opendir.c b/src/win/win_opendir.c similarity index 100% rename from src/WIN/win_opendir.c rename to src/win/win_opendir.c diff --git a/src/WIN/win_serial.c b/src/win/win_serial.c similarity index 100% rename from src/WIN/win_serial.c rename to src/win/win_serial.c diff --git a/src/WIN/win_settings.c b/src/win/win_settings.c similarity index 99% rename from src/WIN/win_settings.c rename to src/win/win_settings.c index 534560a17..c694121fe 100644 --- a/src/WIN/win_settings.c +++ b/src/win/win_settings.c @@ -23,25 +23,25 @@ #include #include "../ibm.h" #include "../mem.h" -#include "../CPU/cpu.h" +#include "../cpu/cpu.h" #include "../nvr.h" #include "../device.h" #include "../model.h" #include "../cdrom.h" #include "../disc.h" #include "../fdd.h" -#include "../HDD/hdd.h" -#include "../HDD/hdd_ide_at.h" -#include "../SCSI/scsi.h" +#include "../hdd/hdd.h" +#include "../hdd/hdd_ide_at.h" +#include "../scsi/scsi.h" #ifdef USE_NETWORK -#include "../NETWORK/network.h" +#include "../network/network.h" #endif -#include "../SOUND/sound.h" -#include "../SOUND/midi.h" -#include "../SOUND/snd_dbopl.h" -#include "../SOUND/snd_mpu401.h" -#include "../VIDEO/video.h" -#include "../VIDEO/vid_voodoo.h" +#include "../sound/sound.h" +#include "../sound/midi.h" +#include "../sound/snd_dbopl.h" +#include "../sound/snd_mpu401.h" +#include "../video/video.h" +#include "../video/vid_voodoo.h" #include "../gameport.h" #include "../mouse.h" #include "plat_midi.h" diff --git a/src/WIN/win_status.c b/src/win/win_status.c similarity index 98% rename from src/WIN/win_status.c rename to src/win/win_status.c index d981f5e0e..0a0fc659c 100644 --- a/src/WIN/win_status.c +++ b/src/win/win_status.c @@ -8,8 +8,8 @@ #include "../ibm.h" #include "../mem.h" -#include "../CPU/x86_ops.h" -#include "../CPU/codegen.h" +#include "../cpu/x86_ops.h" +#include "../cpu/codegen.h" #include "../device.h" #include "win.h" diff --git a/src/WIN/win_video.c b/src/win/win_video.c similarity index 97% rename from src/WIN/win_video.c rename to src/win/win_video.c index 39c18c751..3a50f7b9f 100644 --- a/src/WIN/win_video.c +++ b/src/win/win_video.c @@ -4,7 +4,7 @@ #include #include #include -#include "../VIDEO/video.h" +#include "../video/video.h" #include "win_cgapal.h"