diff --git a/configure b/configure index 0e3623c..abbd3d6 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.65 for PCem v9. +# Generated by GNU Autoconf 2.65 for PCem v10.1. # # Report bugs to >. # @@ -551,8 +551,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='PCem' PACKAGE_TARNAME='pcem' -PACKAGE_VERSION='v9' -PACKAGE_STRING='PCem v9' +PACKAGE_VERSION='v10.1' +PACKAGE_STRING='PCem v10.1' PACKAGE_BUGREPORT='Tom Walker ' PACKAGE_URL='' @@ -571,8 +571,6 @@ CPU_X86_64_FALSE CPU_X86_64_TRUE CPU_I386_FALSE CPU_I386_TRUE -DYNAREC_FALSE -DYNAREC_TRUE am__fastdepCXX_FALSE am__fastdepCXX_TRUE CXXDEPMODE @@ -669,7 +667,6 @@ ac_user_opts=' enable_option_checking enable_dependency_tracking enable_debug -enable_dynarec with_allegro_prefix with_allegro_exec_prefix enable_allegrotest @@ -1226,7 +1223,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures PCem v9 to adapt to many kinds of systems. +\`configure' configures PCem v10.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1296,7 +1293,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of PCem v9:";; + short | recursive ) echo "Configuration of PCem v10.1:";; esac cat <<\_ACEOF @@ -1307,7 +1304,6 @@ Optional Features: --disable-dependency-tracking speeds up one-time build --enable-dependency-tracking do not reject slow dependency extractors --enable-debug build debug executable - --enable-dynarec build dynamic recompiler --disable-allegrotest Do not try to compile and run a test LIBallegro program Optional Packages: @@ -1393,7 +1389,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -PCem configure v9 +PCem configure v10.1 generated by GNU Autoconf 2.65 Copyright (C) 2009 Free Software Foundation, Inc. @@ -1574,7 +1570,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by PCem $as_me v9, which was +It was created by PCem $as_me v10.1, which was generated by GNU Autoconf 2.65. Invocation command line was $ $0 $@ @@ -2455,7 +2451,7 @@ fi # Define the identity of the package. PACKAGE='pcem' - VERSION='v9' + VERSION='v10.1' cat >>confdefs.h <<_ACEOF @@ -4005,42 +4001,23 @@ else $as_echo "no" >&6; } fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use the dynamic recompiler" >&5 -$as_echo_n "checking whether to use the dynamic recompiler... " >&6; } -# Check whether --enable-dynarec was given. -if test "${enable_dynarec+set}" = set; then : - enableval=$enable_dynarec; -fi - -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_dynarec" >&5 -$as_echo "$enable_dynarec" >&6; } - if test "$enable_dynarec" = "yes"; then - DYNAREC_TRUE= - DYNAREC_FALSE='#' -else - DYNAREC_TRUE='#' - DYNAREC_FALSE= -fi - -if test "$enable_dynarec" = "yes"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cpu" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for cpu" >&5 $as_echo_n "checking for cpu... " >&6; } - case "${host_cpu}" in - i?86) - CPU=i386 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${host_cpu}" >&5 +case "${host_cpu}" in + i?86) + CPU=i386 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${host_cpu}" >&5 $as_echo "${host_cpu}" >&6; } - ;; - x86_64) - CPU=x86_64 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${host_cpu}" >&5 + ;; + x86_64) + CPU=x86_64 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${host_cpu}" >&5 $as_echo "${host_cpu}" >&6; } - ;; - *) - as_fn_error "Unsupported CPU." "$LINENO" 5 - ;; - esac -fi + ;; + *) + as_fn_error "Unsupported CPU." "$LINENO" 5 + ;; +esac if test "$CPU" = "i386"; then CPU_I386_TRUE= @@ -4650,10 +4627,6 @@ if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then as_fn_error "conditional \"am__fastdepCXX\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi -if test -z "${DYNAREC_TRUE}" && test -z "${DYNAREC_FALSE}"; then - as_fn_error "conditional \"DYNAREC\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi if test -z "${CPU_I386_TRUE}" && test -z "${CPU_I386_FALSE}"; then as_fn_error "conditional \"CPU_I386\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -5078,7 +5051,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by PCem $as_me v9, which was +This file was extended by PCem $as_me v10.1, which was generated by GNU Autoconf 2.65. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -5135,7 +5108,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -PCem config.status v9 +PCem config.status v10.1 configured by $0, generated by GNU Autoconf 2.65, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 1475f85..388f3db 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ # AC_PREREQ([2.61]) -AC_INIT(PCem, v9, Tom Walker , pcem) +AC_INIT(PCem, v10.1, Tom Walker , pcem) AC_CANONICAL_HOST @@ -24,27 +24,20 @@ else AC_MSG_RESULT([no]) fi -AC_MSG_CHECKING([whether to use the dynamic recompiler]) -AC_ARG_ENABLE(dynarec, - AC_HELP_STRING([--enable-dynarec], [build dynamic recompiler])) -AC_MSG_RESULT($enable_dynarec) -AM_CONDITIONAL(DYNAREC, test "$enable_dynarec" = "yes") -if test "$enable_dynarec" = "yes"; then - AC_MSG_CHECKING([for cpu]) - case "${host_cpu}" in - i?86) - CPU=i386 - AC_MSG_RESULT(${host_cpu}) - ;; - x86_64) - CPU=x86_64 - AC_MSG_RESULT(${host_cpu}) - ;; - *) - AC_MSG_ERROR([Unsupported CPU.]) - ;; - esac -fi +AC_MSG_CHECKING([for cpu]) +case "${host_cpu}" in + i?86) + CPU=i386 + AC_MSG_RESULT(${host_cpu}) + ;; + x86_64) + CPU=x86_64 + AC_MSG_RESULT(${host_cpu}) + ;; + *) + AC_MSG_ERROR([Unsupported CPU.]) + ;; +esac AM_CONDITIONAL(CPU_I386, test "$CPU" = "i386") AM_CONDITIONAL(CPU_X86_64, test "$CPU" = "x86_64") diff --git a/readme.txt b/readme.txt index a6694ea..547b80f 100644 --- a/readme.txt +++ b/readme.txt @@ -1,29 +1,13 @@ -PCem v10 +PCem v10.1 PCem is licensed under the GPL, see COPYING for more details. -Changes since v9: +Changes since v10: -- New machines - AMI XT clone, DTK XT clone, VTech Laser Turbo XT, VTech Laser XT3, - Phoenix XT clone, Juko XT clone, IBM PS/1 model 2011, Compaq Deskpro 386, DTK - 386SX clone, Phoenix 386 clone, Intel Premiere/PCI, Intel Advanced/EV -- New graphics cards - IBM VGA, 3DFX Voodoo Graphics -- Experimental dynamic recompiler - up to 3x speedup -- Pentium and Pentium MMX emulation -- CPU fixes - fixed issues in Unreal, Half-Life, Final Fantasy VII, - Little Big Adventure 2, Windows 9x setup, Coherent, BeOS and others -- Improved FDC emulation - more accurate, supports FDI images, supports 1.2MB 5.25" - floppy drive emulation, supports write protect correctly -- Internal timer improvements, fixes sound in some games (eg Lion King) -- Added support for up to 4 IDE hard drives -- MIDI OUT code now handles sysex commands correctly -- CD-ROM code now no longer crashes Windows 9x when CD-ROM drive empty -- Fixes to ViRGE, S3 Vision series, ATI Mach64 and OAK OTI-067 cards -- Now supports 4 IDE hard drives -- Various other fixes/changes - -Thanks to te_lanus, ecksemmess, nerd73, GeeDee, Battler, leilei and kurumushi for -contributions towards this release. +- Fixed buffer overruns in PIIX and ET4000/W32p emulation +- Add command line options to start in fullscreen and to specify config file +- Emulator doesn't die when the CPU jumps to an unexecutable address +- Removed Voodoo memory dump on exit PCem emulates the following machines: diff --git a/src/Makefile.am b/src/Makefile.am index 0966277..071af4f 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -14,10 +14,11 @@ pcem_CFLAGS = $(allegro_CFLAGS) pcem_LDADD = $(allegro_LIBS) -lopenal -lalut -pcem_SOURCES = 386.c 808x.c acer386sx.c ali1429.c allegro-gui.c allegro-gui-configure.c \ -allegro-gui-hdconf.c allegro-joystick.c allegro-keyboard.c allegro-main.c \ +pcem_SOURCES = 386.c 386_dynarec.c 386_dynarec_ops.c 808x.c acer386sx.c ali1429.c allegro-gui.c \ +allegro-gui-configure.c allegro-gui-hdconf.c allegro-joystick.c allegro-keyboard.c allegro-main.c \ allegro-midi.c allegro-mouse.c allegro-video.c amstrad.c cdrom-ioctl-linux.c cdrom-null.c \ -compaq.c config.c cpu.c dac.c device.c disc.c disc_fdi.c disc_img.c dma.c fdc.c fdc37c665.c fdi2raw.c gameport.c \ +codegen.c codegen_ops.c codegen_timing_486.c codegen_timing_pentium.c compaq.c config.c cpu.c \ +dac.c device.c disc.c disc_fdi.c disc_img.c dma.c fdc.c fdc37c665.c fdi2raw.c gameport.c \ headland.c i430lx.c i430fx.c i430vx.c ide.c intel.c intel_flash.c io.c jim.c \ keyboard.c keyboard_amstrad.c keyboard_at.c keyboard_olim24.c keyboard_pcjr.c keyboard_xt.c \ linux-time.c lpt.c mcr.c mem.c model.c mouse.c mouse_ps2.c mouse_serial.c neat.c nmi.c nvr.c \ @@ -39,12 +40,6 @@ resid-fp/wave6581_P_T.cc resid-fp/wave6581__ST.cc resid-fp/wave8580_PS_.cc \ resid-fp/wave8580_PST.cc resid-fp/wave8580_P_T.cc resid-fp/wave8580__ST.cc \ resid-fp/wave.cc - -if DYNAREC -pcem_CFLAGS += -DDYNAREC -pcem_SOURCES += 386_dynarec.c 386_dynarec_ops.c codegen.c codegen_ops.c \ -codegen_timing_486.c codegen_timing_pentium.c - if CPU_I386 pcem_SOURCES += codegen_x86.c endif @@ -53,6 +48,3 @@ if CPU_X86_64 pcem_SOURCES += codegen_x86-64.c endif -endif - - diff --git a/src/Makefile.in b/src/Makefile.in index c798ddc..1d3455b 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -38,12 +38,8 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ bin_PROGRAMS = pcem$(EXEEXT) -@DYNAREC_TRUE@am__append_1 = -DDYNAREC -@DYNAREC_TRUE@am__append_2 = 386_dynarec.c 386_dynarec_ops.c codegen.c codegen_ops.c \ -@DYNAREC_TRUE@codegen_timing_486.c codegen_timing_pentium.c - -@CPU_I386_TRUE@@DYNAREC_TRUE@am__append_3 = codegen_x86.c -@CPU_X86_64_TRUE@@DYNAREC_TRUE@am__append_4 = codegen_x86-64.c +@CPU_I386_TRUE@am__append_1 = codegen_x86.c +@CPU_X86_64_TRUE@am__append_2 = codegen_x86-64.c subdir = src DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 @@ -55,29 +51,31 @@ CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = am__installdirs = "$(DESTDIR)$(bindir)" PROGRAMS = $(bin_PROGRAMS) -am__pcem_SOURCES_DIST = 386.c 808x.c acer386sx.c ali1429.c \ - allegro-gui.c allegro-gui-configure.c allegro-gui-hdconf.c \ - allegro-joystick.c allegro-keyboard.c allegro-main.c \ - allegro-midi.c allegro-mouse.c allegro-video.c amstrad.c \ - cdrom-ioctl-linux.c cdrom-null.c compaq.c config.c cpu.c dac.c \ - device.c disc.c disc_fdi.c disc_img.c dma.c fdc.c fdc37c665.c \ - fdi2raw.c gameport.c headland.c i430lx.c i430fx.c i430vx.c \ - ide.c intel.c intel_flash.c io.c jim.c keyboard.c \ - keyboard_amstrad.c keyboard_at.c keyboard_olim24.c \ - keyboard_pcjr.c keyboard_xt.c linux-time.c lpt.c mcr.c mem.c \ - model.c mouse.c mouse_ps2.c mouse_serial.c neat.c nmi.c nvr.c \ - olivetti_m24.c opti.c pc.c pci.c pic.c piix.c pit.c ppi.c \ - ps1.c rom.c serial.c sis496.c sound.c sound_ad1848.c \ - sound_adlib.c sound_adlibgold.c sound_cms.c sound_emu8k.c \ - sound_gus.c sound_mpu401_uart.c sound_opl.c sound_pas16.c \ - sound_sb.c sound_sb_dsp.c sound_sn76489.c sound_speaker.c \ - sound_ssi2001.c sound_wss.c soundopenal.c thread-pthread.c \ - timer.c um8669f.c um8881f.c vid_ati_eeprom.c vid_ati_mach64.c \ - vid_ati18800.c vid_ati28800.c vid_ati68860_ramdac.c vid_cga.c \ - vid_cl5429.c vid_ega.c vid_et4000.c vid_et4000w32.c \ - vid_hercules.c vid_icd2061.c vid_ics2595.c vid_mda.c \ - vid_olivetti_m24.c vid_oti067.c vid_paradise.c vid_pc200.c \ - vid_pc1512.c vid_pc1640.c vid_pcjr.c vid_s3.c vid_s3_virge.c \ +am__pcem_SOURCES_DIST = 386.c 386_dynarec.c 386_dynarec_ops.c 808x.c \ + acer386sx.c ali1429.c allegro-gui.c allegro-gui-configure.c \ + allegro-gui-hdconf.c allegro-joystick.c allegro-keyboard.c \ + allegro-main.c allegro-midi.c allegro-mouse.c allegro-video.c \ + amstrad.c cdrom-ioctl-linux.c cdrom-null.c codegen.c \ + codegen_ops.c codegen_timing_486.c codegen_timing_pentium.c \ + compaq.c config.c cpu.c dac.c device.c disc.c disc_fdi.c \ + disc_img.c dma.c fdc.c fdc37c665.c fdi2raw.c gameport.c \ + headland.c i430lx.c i430fx.c i430vx.c ide.c intel.c \ + intel_flash.c io.c jim.c keyboard.c keyboard_amstrad.c \ + keyboard_at.c keyboard_olim24.c keyboard_pcjr.c keyboard_xt.c \ + linux-time.c lpt.c mcr.c mem.c model.c mouse.c mouse_ps2.c \ + mouse_serial.c neat.c nmi.c nvr.c olivetti_m24.c opti.c pc.c \ + pci.c pic.c piix.c pit.c ppi.c ps1.c rom.c serial.c sis496.c \ + sound.c sound_ad1848.c sound_adlib.c sound_adlibgold.c \ + sound_cms.c sound_emu8k.c sound_gus.c sound_mpu401_uart.c \ + sound_opl.c sound_pas16.c sound_sb.c sound_sb_dsp.c \ + sound_sn76489.c sound_speaker.c sound_ssi2001.c sound_wss.c \ + soundopenal.c thread-pthread.c timer.c um8669f.c um8881f.c \ + vid_ati_eeprom.c vid_ati_mach64.c vid_ati18800.c \ + vid_ati28800.c vid_ati68860_ramdac.c vid_cga.c vid_cl5429.c \ + vid_ega.c vid_et4000.c vid_et4000w32.c vid_hercules.c \ + vid_icd2061.c vid_ics2595.c vid_mda.c vid_olivetti_m24.c \ + vid_oti067.c vid_paradise.c vid_pc200.c vid_pc1512.c \ + vid_pc1640.c vid_pcjr.c vid_s3.c vid_s3_virge.c \ vid_sdac_ramdac.c vid_stg_ramdac.c vid_svga.c \ vid_svga_render.c vid_tandy.c vid_tgui9440.c \ vid_tkd8001_ramdac.c vid_tvga.c vid_unk_ramdac.c vid_vga.c \ @@ -90,20 +88,11 @@ am__pcem_SOURCES_DIST = 386.c 808x.c acer386sx.c ali1429.c \ resid-fp/wave6581_P_T.cc resid-fp/wave6581__ST.cc \ resid-fp/wave8580_PS_.cc resid-fp/wave8580_PST.cc \ resid-fp/wave8580_P_T.cc resid-fp/wave8580__ST.cc \ - resid-fp/wave.cc 386_dynarec.c 386_dynarec_ops.c codegen.c \ - codegen_ops.c codegen_timing_486.c codegen_timing_pentium.c \ - codegen_x86.c codegen_x86-64.c -@DYNAREC_TRUE@am__objects_1 = pcem-386_dynarec.$(OBJEXT) \ -@DYNAREC_TRUE@ pcem-386_dynarec_ops.$(OBJEXT) \ -@DYNAREC_TRUE@ pcem-codegen.$(OBJEXT) \ -@DYNAREC_TRUE@ pcem-codegen_ops.$(OBJEXT) \ -@DYNAREC_TRUE@ pcem-codegen_timing_486.$(OBJEXT) \ -@DYNAREC_TRUE@ pcem-codegen_timing_pentium.$(OBJEXT) -@CPU_I386_TRUE@@DYNAREC_TRUE@am__objects_2 = \ -@CPU_I386_TRUE@@DYNAREC_TRUE@ pcem-codegen_x86.$(OBJEXT) -@CPU_X86_64_TRUE@@DYNAREC_TRUE@am__objects_3 = \ -@CPU_X86_64_TRUE@@DYNAREC_TRUE@ pcem-codegen_x86-64.$(OBJEXT) -am_pcem_OBJECTS = pcem-386.$(OBJEXT) pcem-808x.$(OBJEXT) \ + resid-fp/wave.cc codegen_x86.c codegen_x86-64.c +@CPU_I386_TRUE@am__objects_1 = pcem-codegen_x86.$(OBJEXT) +@CPU_X86_64_TRUE@am__objects_2 = pcem-codegen_x86-64.$(OBJEXT) +am_pcem_OBJECTS = pcem-386.$(OBJEXT) pcem-386_dynarec.$(OBJEXT) \ + pcem-386_dynarec_ops.$(OBJEXT) pcem-808x.$(OBJEXT) \ pcem-acer386sx.$(OBJEXT) pcem-ali1429.$(OBJEXT) \ pcem-allegro-gui.$(OBJEXT) \ pcem-allegro-gui-configure.$(OBJEXT) \ @@ -113,8 +102,11 @@ am_pcem_OBJECTS = pcem-386.$(OBJEXT) pcem-808x.$(OBJEXT) \ pcem-allegro-midi.$(OBJEXT) pcem-allegro-mouse.$(OBJEXT) \ pcem-allegro-video.$(OBJEXT) pcem-amstrad.$(OBJEXT) \ pcem-cdrom-ioctl-linux.$(OBJEXT) pcem-cdrom-null.$(OBJEXT) \ - pcem-compaq.$(OBJEXT) pcem-config.$(OBJEXT) pcem-cpu.$(OBJEXT) \ - pcem-dac.$(OBJEXT) pcem-device.$(OBJEXT) pcem-disc.$(OBJEXT) \ + pcem-codegen.$(OBJEXT) pcem-codegen_ops.$(OBJEXT) \ + pcem-codegen_timing_486.$(OBJEXT) \ + pcem-codegen_timing_pentium.$(OBJEXT) pcem-compaq.$(OBJEXT) \ + pcem-config.$(OBJEXT) pcem-cpu.$(OBJEXT) pcem-dac.$(OBJEXT) \ + pcem-device.$(OBJEXT) pcem-disc.$(OBJEXT) \ pcem-disc_fdi.$(OBJEXT) pcem-disc_img.$(OBJEXT) \ pcem-dma.$(OBJEXT) pcem-fdc.$(OBJEXT) pcem-fdc37c665.$(OBJEXT) \ pcem-fdi2raw.$(OBJEXT) pcem-gameport.$(OBJEXT) \ @@ -170,7 +162,7 @@ am_pcem_OBJECTS = pcem-386.$(OBJEXT) pcem-808x.$(OBJEXT) \ wave6581_P_T.$(OBJEXT) wave6581__ST.$(OBJEXT) \ wave8580_PS_.$(OBJEXT) wave8580_PST.$(OBJEXT) \ wave8580_P_T.$(OBJEXT) wave8580__ST.$(OBJEXT) wave.$(OBJEXT) \ - $(am__objects_1) $(am__objects_2) $(am__objects_3) + $(am__objects_1) $(am__objects_2) pcem_OBJECTS = $(am_pcem_OBJECTS) am__DEPENDENCIES_1 = pcem_DEPENDENCIES = $(am__DEPENDENCIES_1) @@ -293,31 +285,33 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ noinst_SCRIPTS = ../pcem CLEANFILES = $(noinst_SCRIPTS) -pcem_CFLAGS = $(allegro_CFLAGS) $(am__append_1) +pcem_CFLAGS = $(allegro_CFLAGS) pcem_LDADD = $(allegro_LIBS) -lopenal -lalut -pcem_SOURCES = 386.c 808x.c acer386sx.c ali1429.c allegro-gui.c \ - allegro-gui-configure.c allegro-gui-hdconf.c \ - allegro-joystick.c allegro-keyboard.c allegro-main.c \ - allegro-midi.c allegro-mouse.c allegro-video.c amstrad.c \ - cdrom-ioctl-linux.c cdrom-null.c compaq.c config.c cpu.c dac.c \ - device.c disc.c disc_fdi.c disc_img.c dma.c fdc.c fdc37c665.c \ - fdi2raw.c gameport.c headland.c i430lx.c i430fx.c i430vx.c \ - ide.c intel.c intel_flash.c io.c jim.c keyboard.c \ - keyboard_amstrad.c keyboard_at.c keyboard_olim24.c \ - keyboard_pcjr.c keyboard_xt.c linux-time.c lpt.c mcr.c mem.c \ - model.c mouse.c mouse_ps2.c mouse_serial.c neat.c nmi.c nvr.c \ - olivetti_m24.c opti.c pc.c pci.c pic.c piix.c pit.c ppi.c \ - ps1.c rom.c serial.c sis496.c sound.c sound_ad1848.c \ - sound_adlib.c sound_adlibgold.c sound_cms.c sound_emu8k.c \ - sound_gus.c sound_mpu401_uart.c sound_opl.c sound_pas16.c \ - sound_sb.c sound_sb_dsp.c sound_sn76489.c sound_speaker.c \ - sound_ssi2001.c sound_wss.c soundopenal.c thread-pthread.c \ - timer.c um8669f.c um8881f.c vid_ati_eeprom.c vid_ati_mach64.c \ - vid_ati18800.c vid_ati28800.c vid_ati68860_ramdac.c vid_cga.c \ - vid_cl5429.c vid_ega.c vid_et4000.c vid_et4000w32.c \ - vid_hercules.c vid_icd2061.c vid_ics2595.c vid_mda.c \ - vid_olivetti_m24.c vid_oti067.c vid_paradise.c vid_pc200.c \ - vid_pc1512.c vid_pc1640.c vid_pcjr.c vid_s3.c vid_s3_virge.c \ +pcem_SOURCES = 386.c 386_dynarec.c 386_dynarec_ops.c 808x.c \ + acer386sx.c ali1429.c allegro-gui.c allegro-gui-configure.c \ + allegro-gui-hdconf.c allegro-joystick.c allegro-keyboard.c \ + allegro-main.c allegro-midi.c allegro-mouse.c allegro-video.c \ + amstrad.c cdrom-ioctl-linux.c cdrom-null.c codegen.c \ + codegen_ops.c codegen_timing_486.c codegen_timing_pentium.c \ + compaq.c config.c cpu.c dac.c device.c disc.c disc_fdi.c \ + disc_img.c dma.c fdc.c fdc37c665.c fdi2raw.c gameport.c \ + headland.c i430lx.c i430fx.c i430vx.c ide.c intel.c \ + intel_flash.c io.c jim.c keyboard.c keyboard_amstrad.c \ + keyboard_at.c keyboard_olim24.c keyboard_pcjr.c keyboard_xt.c \ + linux-time.c lpt.c mcr.c mem.c model.c mouse.c mouse_ps2.c \ + mouse_serial.c neat.c nmi.c nvr.c olivetti_m24.c opti.c pc.c \ + pci.c pic.c piix.c pit.c ppi.c ps1.c rom.c serial.c sis496.c \ + sound.c sound_ad1848.c sound_adlib.c sound_adlibgold.c \ + sound_cms.c sound_emu8k.c sound_gus.c sound_mpu401_uart.c \ + sound_opl.c sound_pas16.c sound_sb.c sound_sb_dsp.c \ + sound_sn76489.c sound_speaker.c sound_ssi2001.c sound_wss.c \ + soundopenal.c thread-pthread.c timer.c um8669f.c um8881f.c \ + vid_ati_eeprom.c vid_ati_mach64.c vid_ati18800.c \ + vid_ati28800.c vid_ati68860_ramdac.c vid_cga.c vid_cl5429.c \ + vid_ega.c vid_et4000.c vid_et4000w32.c vid_hercules.c \ + vid_icd2061.c vid_ics2595.c vid_mda.c vid_olivetti_m24.c \ + vid_oti067.c vid_paradise.c vid_pc200.c vid_pc1512.c \ + vid_pc1640.c vid_pcjr.c vid_s3.c vid_s3_virge.c \ vid_sdac_ramdac.c vid_stg_ramdac.c vid_svga.c \ vid_svga_render.c vid_tandy.c vid_tgui9440.c \ vid_tkd8001_ramdac.c vid_tvga.c vid_unk_ramdac.c vid_vga.c \ @@ -330,8 +324,7 @@ pcem_SOURCES = 386.c 808x.c acer386sx.c ali1429.c allegro-gui.c \ resid-fp/wave6581_P_T.cc resid-fp/wave6581__ST.cc \ resid-fp/wave8580_PS_.cc resid-fp/wave8580_PST.cc \ resid-fp/wave8580_P_T.cc resid-fp/wave8580__ST.cc \ - resid-fp/wave.cc $(am__append_2) $(am__append_3) \ - $(am__append_4) + resid-fp/wave.cc $(am__append_1) $(am__append_2) all: all-am .SUFFIXES: @@ -597,6 +590,34 @@ pcem-386.obj: 386.c @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pcem_CFLAGS) $(CFLAGS) -c -o pcem-386.obj `if test -f '386.c'; then $(CYGPATH_W) '386.c'; else $(CYGPATH_W) '$(srcdir)/386.c'; fi` +pcem-386_dynarec.o: 386_dynarec.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pcem_CFLAGS) $(CFLAGS) -MT pcem-386_dynarec.o -MD -MP -MF $(DEPDIR)/pcem-386_dynarec.Tpo -c -o pcem-386_dynarec.o `test -f '386_dynarec.c' || echo '$(srcdir)/'`386_dynarec.c +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/pcem-386_dynarec.Tpo $(DEPDIR)/pcem-386_dynarec.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='386_dynarec.c' object='pcem-386_dynarec.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pcem_CFLAGS) $(CFLAGS) -c -o pcem-386_dynarec.o `test -f '386_dynarec.c' || echo '$(srcdir)/'`386_dynarec.c + +pcem-386_dynarec.obj: 386_dynarec.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pcem_CFLAGS) $(CFLAGS) -MT pcem-386_dynarec.obj -MD -MP -MF $(DEPDIR)/pcem-386_dynarec.Tpo -c -o pcem-386_dynarec.obj `if test -f '386_dynarec.c'; then $(CYGPATH_W) '386_dynarec.c'; else $(CYGPATH_W) '$(srcdir)/386_dynarec.c'; fi` +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/pcem-386_dynarec.Tpo $(DEPDIR)/pcem-386_dynarec.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='386_dynarec.c' object='pcem-386_dynarec.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pcem_CFLAGS) $(CFLAGS) -c -o pcem-386_dynarec.obj `if test -f '386_dynarec.c'; then $(CYGPATH_W) '386_dynarec.c'; else $(CYGPATH_W) '$(srcdir)/386_dynarec.c'; fi` + +pcem-386_dynarec_ops.o: 386_dynarec_ops.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pcem_CFLAGS) $(CFLAGS) -MT pcem-386_dynarec_ops.o -MD -MP -MF $(DEPDIR)/pcem-386_dynarec_ops.Tpo -c -o pcem-386_dynarec_ops.o `test -f '386_dynarec_ops.c' || echo '$(srcdir)/'`386_dynarec_ops.c +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/pcem-386_dynarec_ops.Tpo $(DEPDIR)/pcem-386_dynarec_ops.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='386_dynarec_ops.c' object='pcem-386_dynarec_ops.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pcem_CFLAGS) $(CFLAGS) -c -o pcem-386_dynarec_ops.o `test -f '386_dynarec_ops.c' || echo '$(srcdir)/'`386_dynarec_ops.c + +pcem-386_dynarec_ops.obj: 386_dynarec_ops.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pcem_CFLAGS) $(CFLAGS) -MT pcem-386_dynarec_ops.obj -MD -MP -MF $(DEPDIR)/pcem-386_dynarec_ops.Tpo -c -o pcem-386_dynarec_ops.obj `if test -f '386_dynarec_ops.c'; then $(CYGPATH_W) '386_dynarec_ops.c'; else $(CYGPATH_W) '$(srcdir)/386_dynarec_ops.c'; fi` +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/pcem-386_dynarec_ops.Tpo $(DEPDIR)/pcem-386_dynarec_ops.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='386_dynarec_ops.c' object='pcem-386_dynarec_ops.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pcem_CFLAGS) $(CFLAGS) -c -o pcem-386_dynarec_ops.obj `if test -f '386_dynarec_ops.c'; then $(CYGPATH_W) '386_dynarec_ops.c'; else $(CYGPATH_W) '$(srcdir)/386_dynarec_ops.c'; fi` + pcem-808x.o: 808x.c @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pcem_CFLAGS) $(CFLAGS) -MT pcem-808x.o -MD -MP -MF $(DEPDIR)/pcem-808x.Tpo -c -o pcem-808x.o `test -f '808x.c' || echo '$(srcdir)/'`808x.c @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/pcem-808x.Tpo $(DEPDIR)/pcem-808x.Po @@ -807,6 +828,62 @@ pcem-cdrom-null.obj: cdrom-null.c @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pcem_CFLAGS) $(CFLAGS) -c -o pcem-cdrom-null.obj `if test -f 'cdrom-null.c'; then $(CYGPATH_W) 'cdrom-null.c'; else $(CYGPATH_W) '$(srcdir)/cdrom-null.c'; fi` +pcem-codegen.o: codegen.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pcem_CFLAGS) $(CFLAGS) -MT pcem-codegen.o -MD -MP -MF $(DEPDIR)/pcem-codegen.Tpo -c -o pcem-codegen.o `test -f 'codegen.c' || echo '$(srcdir)/'`codegen.c +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/pcem-codegen.Tpo $(DEPDIR)/pcem-codegen.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='codegen.c' object='pcem-codegen.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pcem_CFLAGS) $(CFLAGS) -c -o pcem-codegen.o `test -f 'codegen.c' || echo '$(srcdir)/'`codegen.c + +pcem-codegen.obj: codegen.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pcem_CFLAGS) $(CFLAGS) -MT pcem-codegen.obj -MD -MP -MF $(DEPDIR)/pcem-codegen.Tpo -c -o pcem-codegen.obj `if test -f 'codegen.c'; then $(CYGPATH_W) 'codegen.c'; else $(CYGPATH_W) '$(srcdir)/codegen.c'; fi` +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/pcem-codegen.Tpo $(DEPDIR)/pcem-codegen.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='codegen.c' object='pcem-codegen.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pcem_CFLAGS) $(CFLAGS) -c -o pcem-codegen.obj `if test -f 'codegen.c'; then $(CYGPATH_W) 'codegen.c'; else $(CYGPATH_W) '$(srcdir)/codegen.c'; fi` + +pcem-codegen_ops.o: codegen_ops.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pcem_CFLAGS) $(CFLAGS) -MT pcem-codegen_ops.o -MD -MP -MF $(DEPDIR)/pcem-codegen_ops.Tpo -c -o pcem-codegen_ops.o `test -f 'codegen_ops.c' || echo '$(srcdir)/'`codegen_ops.c +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/pcem-codegen_ops.Tpo $(DEPDIR)/pcem-codegen_ops.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='codegen_ops.c' object='pcem-codegen_ops.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pcem_CFLAGS) $(CFLAGS) -c -o pcem-codegen_ops.o `test -f 'codegen_ops.c' || echo '$(srcdir)/'`codegen_ops.c + +pcem-codegen_ops.obj: codegen_ops.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pcem_CFLAGS) $(CFLAGS) -MT pcem-codegen_ops.obj -MD -MP -MF $(DEPDIR)/pcem-codegen_ops.Tpo -c -o pcem-codegen_ops.obj `if test -f 'codegen_ops.c'; then $(CYGPATH_W) 'codegen_ops.c'; else $(CYGPATH_W) '$(srcdir)/codegen_ops.c'; fi` +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/pcem-codegen_ops.Tpo $(DEPDIR)/pcem-codegen_ops.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='codegen_ops.c' object='pcem-codegen_ops.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pcem_CFLAGS) $(CFLAGS) -c -o pcem-codegen_ops.obj `if test -f 'codegen_ops.c'; then $(CYGPATH_W) 'codegen_ops.c'; else $(CYGPATH_W) '$(srcdir)/codegen_ops.c'; fi` + +pcem-codegen_timing_486.o: codegen_timing_486.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pcem_CFLAGS) $(CFLAGS) -MT pcem-codegen_timing_486.o -MD -MP -MF $(DEPDIR)/pcem-codegen_timing_486.Tpo -c -o pcem-codegen_timing_486.o `test -f 'codegen_timing_486.c' || echo '$(srcdir)/'`codegen_timing_486.c +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/pcem-codegen_timing_486.Tpo $(DEPDIR)/pcem-codegen_timing_486.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='codegen_timing_486.c' object='pcem-codegen_timing_486.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pcem_CFLAGS) $(CFLAGS) -c -o pcem-codegen_timing_486.o `test -f 'codegen_timing_486.c' || echo '$(srcdir)/'`codegen_timing_486.c + +pcem-codegen_timing_486.obj: codegen_timing_486.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pcem_CFLAGS) $(CFLAGS) -MT pcem-codegen_timing_486.obj -MD -MP -MF $(DEPDIR)/pcem-codegen_timing_486.Tpo -c -o pcem-codegen_timing_486.obj `if test -f 'codegen_timing_486.c'; then $(CYGPATH_W) 'codegen_timing_486.c'; else $(CYGPATH_W) '$(srcdir)/codegen_timing_486.c'; fi` +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/pcem-codegen_timing_486.Tpo $(DEPDIR)/pcem-codegen_timing_486.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='codegen_timing_486.c' object='pcem-codegen_timing_486.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pcem_CFLAGS) $(CFLAGS) -c -o pcem-codegen_timing_486.obj `if test -f 'codegen_timing_486.c'; then $(CYGPATH_W) 'codegen_timing_486.c'; else $(CYGPATH_W) '$(srcdir)/codegen_timing_486.c'; fi` + +pcem-codegen_timing_pentium.o: codegen_timing_pentium.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pcem_CFLAGS) $(CFLAGS) -MT pcem-codegen_timing_pentium.o -MD -MP -MF $(DEPDIR)/pcem-codegen_timing_pentium.Tpo -c -o pcem-codegen_timing_pentium.o `test -f 'codegen_timing_pentium.c' || echo '$(srcdir)/'`codegen_timing_pentium.c +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/pcem-codegen_timing_pentium.Tpo $(DEPDIR)/pcem-codegen_timing_pentium.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='codegen_timing_pentium.c' object='pcem-codegen_timing_pentium.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pcem_CFLAGS) $(CFLAGS) -c -o pcem-codegen_timing_pentium.o `test -f 'codegen_timing_pentium.c' || echo '$(srcdir)/'`codegen_timing_pentium.c + +pcem-codegen_timing_pentium.obj: codegen_timing_pentium.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pcem_CFLAGS) $(CFLAGS) -MT pcem-codegen_timing_pentium.obj -MD -MP -MF $(DEPDIR)/pcem-codegen_timing_pentium.Tpo -c -o pcem-codegen_timing_pentium.obj `if test -f 'codegen_timing_pentium.c'; then $(CYGPATH_W) 'codegen_timing_pentium.c'; else $(CYGPATH_W) '$(srcdir)/codegen_timing_pentium.c'; fi` +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/pcem-codegen_timing_pentium.Tpo $(DEPDIR)/pcem-codegen_timing_pentium.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='codegen_timing_pentium.c' object='pcem-codegen_timing_pentium.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pcem_CFLAGS) $(CFLAGS) -c -o pcem-codegen_timing_pentium.obj `if test -f 'codegen_timing_pentium.c'; then $(CYGPATH_W) 'codegen_timing_pentium.c'; else $(CYGPATH_W) '$(srcdir)/codegen_timing_pentium.c'; fi` + pcem-compaq.o: compaq.c @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pcem_CFLAGS) $(CFLAGS) -MT pcem-compaq.o -MD -MP -MF $(DEPDIR)/pcem-compaq.Tpo -c -o pcem-compaq.o `test -f 'compaq.c' || echo '$(srcdir)/'`compaq.c @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/pcem-compaq.Tpo $(DEPDIR)/pcem-compaq.Po @@ -2361,90 +2438,6 @@ pcem-xtide.obj: xtide.c @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pcem_CFLAGS) $(CFLAGS) -c -o pcem-xtide.obj `if test -f 'xtide.c'; then $(CYGPATH_W) 'xtide.c'; else $(CYGPATH_W) '$(srcdir)/xtide.c'; fi` -pcem-386_dynarec.o: 386_dynarec.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pcem_CFLAGS) $(CFLAGS) -MT pcem-386_dynarec.o -MD -MP -MF $(DEPDIR)/pcem-386_dynarec.Tpo -c -o pcem-386_dynarec.o `test -f '386_dynarec.c' || echo '$(srcdir)/'`386_dynarec.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/pcem-386_dynarec.Tpo $(DEPDIR)/pcem-386_dynarec.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='386_dynarec.c' object='pcem-386_dynarec.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pcem_CFLAGS) $(CFLAGS) -c -o pcem-386_dynarec.o `test -f '386_dynarec.c' || echo '$(srcdir)/'`386_dynarec.c - -pcem-386_dynarec.obj: 386_dynarec.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pcem_CFLAGS) $(CFLAGS) -MT pcem-386_dynarec.obj -MD -MP -MF $(DEPDIR)/pcem-386_dynarec.Tpo -c -o pcem-386_dynarec.obj `if test -f '386_dynarec.c'; then $(CYGPATH_W) '386_dynarec.c'; else $(CYGPATH_W) '$(srcdir)/386_dynarec.c'; fi` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/pcem-386_dynarec.Tpo $(DEPDIR)/pcem-386_dynarec.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='386_dynarec.c' object='pcem-386_dynarec.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pcem_CFLAGS) $(CFLAGS) -c -o pcem-386_dynarec.obj `if test -f '386_dynarec.c'; then $(CYGPATH_W) '386_dynarec.c'; else $(CYGPATH_W) '$(srcdir)/386_dynarec.c'; fi` - -pcem-386_dynarec_ops.o: 386_dynarec_ops.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pcem_CFLAGS) $(CFLAGS) -MT pcem-386_dynarec_ops.o -MD -MP -MF $(DEPDIR)/pcem-386_dynarec_ops.Tpo -c -o pcem-386_dynarec_ops.o `test -f '386_dynarec_ops.c' || echo '$(srcdir)/'`386_dynarec_ops.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/pcem-386_dynarec_ops.Tpo $(DEPDIR)/pcem-386_dynarec_ops.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='386_dynarec_ops.c' object='pcem-386_dynarec_ops.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pcem_CFLAGS) $(CFLAGS) -c -o pcem-386_dynarec_ops.o `test -f '386_dynarec_ops.c' || echo '$(srcdir)/'`386_dynarec_ops.c - -pcem-386_dynarec_ops.obj: 386_dynarec_ops.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pcem_CFLAGS) $(CFLAGS) -MT pcem-386_dynarec_ops.obj -MD -MP -MF $(DEPDIR)/pcem-386_dynarec_ops.Tpo -c -o pcem-386_dynarec_ops.obj `if test -f '386_dynarec_ops.c'; then $(CYGPATH_W) '386_dynarec_ops.c'; else $(CYGPATH_W) '$(srcdir)/386_dynarec_ops.c'; fi` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/pcem-386_dynarec_ops.Tpo $(DEPDIR)/pcem-386_dynarec_ops.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='386_dynarec_ops.c' object='pcem-386_dynarec_ops.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pcem_CFLAGS) $(CFLAGS) -c -o pcem-386_dynarec_ops.obj `if test -f '386_dynarec_ops.c'; then $(CYGPATH_W) '386_dynarec_ops.c'; else $(CYGPATH_W) '$(srcdir)/386_dynarec_ops.c'; fi` - -pcem-codegen.o: codegen.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pcem_CFLAGS) $(CFLAGS) -MT pcem-codegen.o -MD -MP -MF $(DEPDIR)/pcem-codegen.Tpo -c -o pcem-codegen.o `test -f 'codegen.c' || echo '$(srcdir)/'`codegen.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/pcem-codegen.Tpo $(DEPDIR)/pcem-codegen.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='codegen.c' object='pcem-codegen.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pcem_CFLAGS) $(CFLAGS) -c -o pcem-codegen.o `test -f 'codegen.c' || echo '$(srcdir)/'`codegen.c - -pcem-codegen.obj: codegen.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pcem_CFLAGS) $(CFLAGS) -MT pcem-codegen.obj -MD -MP -MF $(DEPDIR)/pcem-codegen.Tpo -c -o pcem-codegen.obj `if test -f 'codegen.c'; then $(CYGPATH_W) 'codegen.c'; else $(CYGPATH_W) '$(srcdir)/codegen.c'; fi` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/pcem-codegen.Tpo $(DEPDIR)/pcem-codegen.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='codegen.c' object='pcem-codegen.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pcem_CFLAGS) $(CFLAGS) -c -o pcem-codegen.obj `if test -f 'codegen.c'; then $(CYGPATH_W) 'codegen.c'; else $(CYGPATH_W) '$(srcdir)/codegen.c'; fi` - -pcem-codegen_ops.o: codegen_ops.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pcem_CFLAGS) $(CFLAGS) -MT pcem-codegen_ops.o -MD -MP -MF $(DEPDIR)/pcem-codegen_ops.Tpo -c -o pcem-codegen_ops.o `test -f 'codegen_ops.c' || echo '$(srcdir)/'`codegen_ops.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/pcem-codegen_ops.Tpo $(DEPDIR)/pcem-codegen_ops.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='codegen_ops.c' object='pcem-codegen_ops.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pcem_CFLAGS) $(CFLAGS) -c -o pcem-codegen_ops.o `test -f 'codegen_ops.c' || echo '$(srcdir)/'`codegen_ops.c - -pcem-codegen_ops.obj: codegen_ops.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pcem_CFLAGS) $(CFLAGS) -MT pcem-codegen_ops.obj -MD -MP -MF $(DEPDIR)/pcem-codegen_ops.Tpo -c -o pcem-codegen_ops.obj `if test -f 'codegen_ops.c'; then $(CYGPATH_W) 'codegen_ops.c'; else $(CYGPATH_W) '$(srcdir)/codegen_ops.c'; fi` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/pcem-codegen_ops.Tpo $(DEPDIR)/pcem-codegen_ops.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='codegen_ops.c' object='pcem-codegen_ops.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pcem_CFLAGS) $(CFLAGS) -c -o pcem-codegen_ops.obj `if test -f 'codegen_ops.c'; then $(CYGPATH_W) 'codegen_ops.c'; else $(CYGPATH_W) '$(srcdir)/codegen_ops.c'; fi` - -pcem-codegen_timing_486.o: codegen_timing_486.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pcem_CFLAGS) $(CFLAGS) -MT pcem-codegen_timing_486.o -MD -MP -MF $(DEPDIR)/pcem-codegen_timing_486.Tpo -c -o pcem-codegen_timing_486.o `test -f 'codegen_timing_486.c' || echo '$(srcdir)/'`codegen_timing_486.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/pcem-codegen_timing_486.Tpo $(DEPDIR)/pcem-codegen_timing_486.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='codegen_timing_486.c' object='pcem-codegen_timing_486.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pcem_CFLAGS) $(CFLAGS) -c -o pcem-codegen_timing_486.o `test -f 'codegen_timing_486.c' || echo '$(srcdir)/'`codegen_timing_486.c - -pcem-codegen_timing_486.obj: codegen_timing_486.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pcem_CFLAGS) $(CFLAGS) -MT pcem-codegen_timing_486.obj -MD -MP -MF $(DEPDIR)/pcem-codegen_timing_486.Tpo -c -o pcem-codegen_timing_486.obj `if test -f 'codegen_timing_486.c'; then $(CYGPATH_W) 'codegen_timing_486.c'; else $(CYGPATH_W) '$(srcdir)/codegen_timing_486.c'; fi` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/pcem-codegen_timing_486.Tpo $(DEPDIR)/pcem-codegen_timing_486.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='codegen_timing_486.c' object='pcem-codegen_timing_486.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pcem_CFLAGS) $(CFLAGS) -c -o pcem-codegen_timing_486.obj `if test -f 'codegen_timing_486.c'; then $(CYGPATH_W) 'codegen_timing_486.c'; else $(CYGPATH_W) '$(srcdir)/codegen_timing_486.c'; fi` - -pcem-codegen_timing_pentium.o: codegen_timing_pentium.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pcem_CFLAGS) $(CFLAGS) -MT pcem-codegen_timing_pentium.o -MD -MP -MF $(DEPDIR)/pcem-codegen_timing_pentium.Tpo -c -o pcem-codegen_timing_pentium.o `test -f 'codegen_timing_pentium.c' || echo '$(srcdir)/'`codegen_timing_pentium.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/pcem-codegen_timing_pentium.Tpo $(DEPDIR)/pcem-codegen_timing_pentium.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='codegen_timing_pentium.c' object='pcem-codegen_timing_pentium.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pcem_CFLAGS) $(CFLAGS) -c -o pcem-codegen_timing_pentium.o `test -f 'codegen_timing_pentium.c' || echo '$(srcdir)/'`codegen_timing_pentium.c - -pcem-codegen_timing_pentium.obj: codegen_timing_pentium.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pcem_CFLAGS) $(CFLAGS) -MT pcem-codegen_timing_pentium.obj -MD -MP -MF $(DEPDIR)/pcem-codegen_timing_pentium.Tpo -c -o pcem-codegen_timing_pentium.obj `if test -f 'codegen_timing_pentium.c'; then $(CYGPATH_W) 'codegen_timing_pentium.c'; else $(CYGPATH_W) '$(srcdir)/codegen_timing_pentium.c'; fi` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/pcem-codegen_timing_pentium.Tpo $(DEPDIR)/pcem-codegen_timing_pentium.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='codegen_timing_pentium.c' object='pcem-codegen_timing_pentium.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pcem_CFLAGS) $(CFLAGS) -c -o pcem-codegen_timing_pentium.obj `if test -f 'codegen_timing_pentium.c'; then $(CYGPATH_W) 'codegen_timing_pentium.c'; else $(CYGPATH_W) '$(srcdir)/codegen_timing_pentium.c'; fi` - pcem-codegen_x86.o: codegen_x86.c @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pcem_CFLAGS) $(CFLAGS) -MT pcem-codegen_x86.o -MD -MP -MF $(DEPDIR)/pcem-codegen_x86.Tpo -c -o pcem-codegen_x86.o `test -f 'codegen_x86.c' || echo '$(srcdir)/'`codegen_x86.c @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/pcem-codegen_x86.Tpo $(DEPDIR)/pcem-codegen_x86.Po diff --git a/src/pc.c b/src/pc.c index 69b9392..23c1b68 100644 --- a/src/pc.c +++ b/src/pc.c @@ -189,7 +189,7 @@ void pc_reset() ali1429_reset(); // video_init(); } - +#undef printf void initpc(int argc, char *argv[]) { char *p; @@ -450,7 +450,7 @@ void runpc() if (win_title_update) { win_title_update=0; - sprintf(s, "PCem v10 - %i%% - %s - %s - %s", fps, model_getname(), models[model].cpu[cpu_manufacturer].cpus[cpu].name, (!mousecapture) ? "Click to capture mouse" : "Press CTRL-END or middle button to release mouse"); + sprintf(s, "PCem v10.1 - %i%% - %s - %s - %s", fps, model_getname(), models[model].cpu[cpu_manufacturer].cpus[cpu].name, (!mousecapture) ? "Click to capture mouse" : "Press CTRL-END or middle button to release mouse"); set_window_title(s); } done++; diff --git a/src/win-d3d-fs.cc b/src/win-d3d-fs.cc index e08103d..c3ca8d1 100644 --- a/src/win-d3d-fs.cc +++ b/src/win-d3d-fs.cc @@ -86,7 +86,7 @@ void d3d_fs_init(HWND h) d3d_device_window = CreateWindowEx ( 0, szSubClassName, - "PCem v10", + "PCem v10.1", WS_POPUP, CW_USEDEFAULT, CW_USEDEFAULT, diff --git a/src/win.c b/src/win.c index a3f8836..dd4cf26 100644 --- a/src/win.c +++ b/src/win.c @@ -511,7 +511,7 @@ int WINAPI WinMain (HINSTANCE hThisInstance, hwnd = CreateWindowEx ( 0, /* Extended possibilites for variation */ szClassName, /* Classname */ - "PCem v10", /* Title Text */ + "PCem v10.1", /* Title Text */ WS_OVERLAPPEDWINDOW&~WS_SIZEBOX, /* default window */ CW_USEDEFAULT, /* Windows decides the position */ CW_USEDEFAULT, /* where the window ends up on the screen */