libretro/vice-libretro
1
0
Fork 0
mirror of https://github.com/libretro/vice-libretro.git synced 2024-11-23 08:19:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Version sync 3.5

Browse Source
This commit is contained in:
sonninnos 2021-04-16 17:45:35 +03:00
parent d9c6b7538f
commit eb41072b5a
2189 changed files with 167280 additions and 311851 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -361,14 +361,14 @@ else ifeq ($(platform), wincross64)
AR = x86_64-w64-mingw32-ar
CC = x86_64-w64-mingw32-gcc
CXX = x86_64-w64-mingw32-g++
CFLAGS += -D__WIN32__ -DHAVE_SNPRINTF -DHAVE_VSNPRINTF -D__USE_MINGW_ANSI_STDIO=1
CFLAGS += -D__WIN32__
TARGET := $(TARGET_NAME)_libretro.dll
LDFLAGS += --shared -static-libgcc -static-libstdc++ -Wl,--version-script=$(CORE_DIR)/libretro/link.T -L/usr/x86_64-w64-mingw32/lib
LDFLAGS += -lws2_32 -luser32 -lwinmm -ladvapi32 -lshlwapi -lwsock32 -lws2_32 -lpsapi -liphlpapi -lshell32 -luserenv -lmingw32 -shared -lgcc -lm -lmingw32
# Windows
else
CFLAGS += -D__WIN32__ -DHAVE_SNPRINTF -DHAVE_VSNPRINTF -D__USE_MINGW_ANSI_STDIO=1
CFLAGS += -D__WIN32__
TARGET := $(TARGET_NAME)_libretro.dll
LDFLAGS += --shared -static-libgcc -static-libstdc++ -Wl,--version-script=$(CORE_DIR)/libretro/link.T -Wl,--gc-sections -L/usr/x86_64-w64-mingw32/lib
LDFLAGS += -lws2_32 -luser32 -lwinmm -ladvapi32 -lshlwapi -lwsock32 -lws2_32 -lpsapi -liphlpapi -lshell32 -luserenv -lmingw32 -shared -lgcc -lm -lmingw32

139
Makefile.common
View File

@ -1,5 +1,6 @@
EMU := $(CORE_DIR)/vice/src
DEPS_DIR := $(CORE_DIR)/deps
EMU = $(CORE_DIR)/vice/src
DEPS_DIR = $(CORE_DIR)/deps
RETRODEP = $(CORE_DIR)/retrodep
LIBRETRO_COMM_DIR := $(CORE_DIR)/libretro-common
INCFLAGS += \
@ -7,6 +8,7 @@ INCFLAGS += \
-I$(CORE_DIR)/libretro \
-I$(CORE_DIR)/include \
-I$(CORE_DIR)/include/embedded \
-I$(RETRODEP) \
-I$(LIBRETRO_COMM_DIR)/include \
-I$(LIBRETRO_COMM_DIR)/include/compat/zlib
@ -23,6 +25,107 @@ SOURCES_C := \
$(DEPS_DIR)/libz/unzip.c \
$(DEPS_DIR)/libz/ioapi.c
SOURCES_C_C64_CART := \
$(EMU)/c64/cart/actionreplay.c \
$(EMU)/c64/cart/actionreplay2.c \
$(EMU)/c64/cart/actionreplay3.c \
$(EMU)/c64/cart/actionreplay4.c \
$(EMU)/c64/cart/atomicpower.c \
$(EMU)/c64/cart/bisplus.c \
$(EMU)/c64/cart/blackbox3.c \
$(EMU)/c64/cart/blackbox4.c \
$(EMU)/c64/cart/blackbox8.c \
$(EMU)/c64/cart/blackbox9.c \
$(EMU)/c64/cart/c64-generic.c \
$(EMU)/c64/cart/c64-midi.c \
$(EMU)/c64/cart/c64acia1.c \
$(EMU)/c64/cart/c64cart.c \
$(EMU)/c64/cart/c64carthooks.c \
$(EMU)/c64/cart/c64cartmem.c \
$(EMU)/c64/cart/c64tpi.c \
$(EMU)/c64/cart/capture.c \
$(EMU)/c64/cart/clockport-mp3at64.c \
$(EMU)/c64/cart/clockport-rrnet.c \
$(EMU)/c64/cart/clockport.c \
$(EMU)/c64/cart/comal80.c \
$(EMU)/c64/cart/crt.c \
$(EMU)/c64/cart/cs8900io.c \
$(EMU)/c64/cart/daa.c \
$(EMU)/c64/cart/debugcart.c \
$(EMU)/c64/cart/delaep7x8.c \
$(EMU)/c64/cart/delaep64.c \
$(EMU)/c64/cart/delaep256.c \
$(EMU)/c64/cart/diashowmaker.c \
$(EMU)/c64/cart/digimax.c \
$(EMU)/c64/cart/dinamic.c \
$(EMU)/c64/cart/dqbb.c \
$(EMU)/c64/cart/ds12c887rtc.c \
$(EMU)/c64/cart/easycalc.c \
$(EMU)/c64/cart/easyflash.c \
$(EMU)/c64/cart/epyxfastload.c \
$(EMU)/c64/cart/ethernetcart.c \
$(EMU)/c64/cart/exos.c \
$(EMU)/c64/cart/expert.c \
$(EMU)/c64/cart/final.c \
$(EMU)/c64/cart/final3.c \
$(EMU)/c64/cart/finalplus.c \
$(EMU)/c64/cart/formel64.c \
$(EMU)/c64/cart/freezeframe.c \
$(EMU)/c64/cart/freezemachine.c \
$(EMU)/c64/cart/funplay.c \
$(EMU)/c64/cart/gamekiller.c \
$(EMU)/c64/cart/georam.c \
$(EMU)/c64/cart/gmod2.c \
$(EMU)/c64/cart/gmod3.c \
$(EMU)/c64/cart/gs.c \
$(EMU)/c64/cart/hero.c \
$(EMU)/c64/cart/ide64.c \
$(EMU)/c64/cart/isepic.c \
$(EMU)/c64/cart/kcs.c \
$(EMU)/c64/cart/kingsoft.c \
$(EMU)/c64/cart/ltkernal.c \
$(EMU)/c64/cart/mach5.c \
$(EMU)/c64/cart/magicdesk.c \
$(EMU)/c64/cart/magicformel.c \
$(EMU)/c64/cart/magicvoice.c \
$(EMU)/c64/cart/maxbasic.c \
$(EMU)/c64/cart/mikroass.c \
$(EMU)/c64/cart/multimax.c \
$(EMU)/c64/cart/mmc64.c \
$(EMU)/c64/cart/mmcreplay.c \
$(EMU)/c64/cart/ocean.c \
$(EMU)/c64/cart/pagefox.c \
$(EMU)/c64/cart/prophet64.c \
$(EMU)/c64/cart/ramcart.c \
$(EMU)/c64/cart/ramlink.c \
$(EMU)/c64/cart/retroreplay.c \
$(EMU)/c64/cart/reu.c \
$(EMU)/c64/cart/rexep256.c \
$(EMU)/c64/cart/rexutility.c \
$(EMU)/c64/cart/rgcd.c \
$(EMU)/c64/cart/ross.c \
$(EMU)/c64/cart/rrnetmk3.c \
$(EMU)/c64/cart/sdbox.c \
$(EMU)/c64/cart/sfx_soundexpander.c \
$(EMU)/c64/cart/sfx_soundsampler.c \
$(EMU)/c64/cart/shortbus.c \
$(EMU)/c64/cart/shortbus_digimax.c \
$(EMU)/c64/cart/shortbus_etfe.c \
$(EMU)/c64/cart/silverrock128.c \
$(EMU)/c64/cart/simonsbasic.c \
$(EMU)/c64/cart/snapshot64.c \
$(EMU)/c64/cart/stardos.c \
$(EMU)/c64/cart/stb.c \
$(EMU)/c64/cart/superexplode5.c \
$(EMU)/c64/cart/supergames.c \
$(EMU)/c64/cart/supersnapshot.c \
$(EMU)/c64/cart/supersnapshot4.c \
$(EMU)/c64/cart/rexramfloppy.c \
$(EMU)/c64/cart/warpspeed.c \
$(EMU)/c64/cart/westermann.c \
$(EMU)/c64/cart/zaxxon.c \
$(EMU)/c64/cart/zippcode48.c
ifeq ($(EMUTYPE), x128)
include $(CORE_DIR)/Makefile.x128
else ifeq ($(EMUTYPE), x64sc)
@ -48,22 +151,22 @@ endif
SOURCES_CXX += $(LOCAL_SRC_CC_FILES)
SOURCES_C += \
$(LOCAL_SRC_FILES) \
$(EMU)/arch/libretro/archdep.c \
$(EMU)/arch/libretro/blockdev.c \
$(EMU)/arch/libretro/c64ui.c \
$(EMU)/arch/libretro/console.c \
$(EMU)/arch/libretro/joy.c \
$(EMU)/arch/libretro/kbd.c \
$(EMU)/arch/libretro/main.c \
$(EMU)/arch/libretro/mousedrv.c \
$(EMU)/arch/libretro/signals.c \
$(EMU)/arch/libretro/ui.c \
$(EMU)/arch/libretro/uicmdline.c \
$(EMU)/arch/libretro/uimon.c \
$(EMU)/arch/libretro/uistatusbar.c \
$(EMU)/arch/libretro/video.c \
$(EMU)/arch/libretro/vsidui.c \
$(EMU)/arch/libretro/vsyncarch.c
$(RETRODEP)/archdep.c \
$(RETRODEP)/c64ui.c \
$(RETRODEP)/console.c \
$(RETRODEP)/joy.c \
$(RETRODEP)/kbd.c \
$(RETRODEP)/main.c \
$(RETRODEP)/mousedrv.c \
$(RETRODEP)/signals.c \
$(RETRODEP)/soundretro.c \
$(RETRODEP)/ui.c \
$(RETRODEP)/uicmdline.c \
$(RETRODEP)/uimon.c \
$(RETRODEP)/uistatusbar.c \
$(RETRODEP)/video.c \
$(RETRODEP)/vsidui.c \
$(RETRODEP)/vsyncarch.c
ifneq ($(STATIC_LINKING), 1)
SOURCES_C += \

153
Makefile.x128
View File

@ -3,18 +3,20 @@ COMMONFLAGS += -D__X128__
INCFLAGS += \
-I$(EMU)/sid \
-I$(EMU) \
-I$(EMU)/arch/libretro \
-I$(EMU)/arch/shared \
-I$(EMU)/c64 \
-I$(EMU)/c64/cart \
-I$(EMU)/c64dtv \
-I$(EMU)/c128 \
-I$(EMU)/core \
-I$(EMU)/datasette \
-I$(EMU)/diag \
-I$(EMU)/drive \
-I$(EMU)/drive/iec \
-I$(EMU)/drive/iec/c64exp \
-I$(EMU)/drive/ieee \
-I$(EMU)/drive/tcbm \
-I$(EMU)/fsdevice \
-I$(EMU)/imagecontents \
-I$(EMU)/joyport \
-I$(EMU)/lib/p64 \
@ -23,6 +25,7 @@ INCFLAGS += \
-I$(EMU)/resid \
-I$(EMU)/residfp \
-I$(EMU)/residfp/builders/residfp-builder/residfp \
-I$(EMU)/rs232drv \
-I$(EMU)/rtc \
-I$(EMU)/samplerdrv \
-I$(EMU)/socketdrv \
@ -89,94 +92,9 @@ SOURCES_C += \
$(EMU)/c64/c64printer.c \
$(EMU)/c64/c64rsuser.c \
$(EMU)/c64/c64sound.c \
$(EMU)/c64/cart/actionreplay.c \
$(EMU)/c64/cart/actionreplay2.c \
$(EMU)/c64/cart/actionreplay3.c \
$(EMU)/c64/cart/actionreplay4.c \
$(EMU)/c64/cart/atomicpower.c \
$(EMU)/c64/cart/c64-generic.c \
$(EMU)/c64/cart/c64-midi.c \
$(EMU)/c64/cart/c64acia1.c \
$(EMU)/c64/cart/c64cart.c \
$(EMU)/c64/cart/c64carthooks.c \
$(EMU)/c64/cart/c64cartmem.c \
$(EMU)/c64/cart/c64tpi.c \
$(EMU)/c64/cart/capture.c \
$(EMU)/c64/cart/clockport-mp3at64.c \
$(EMU)/c64/cart/clockport-rrnet.c \
$(EMU)/c64/cart/clockport.c \
$(EMU)/c64/cart/comal80.c \
$(EMU)/c64/cart/crt.c \
$(EMU)/c64/cart/cs8900io.c \
$(EMU)/c64/cart/daa.c \
$(EMU)/c64/cart/debugcart.c \
$(EMU)/c64/cart/delaep7x8.c \
$(EMU)/c64/cart/delaep64.c \
$(EMU)/c64/cart/delaep256.c \
$(EMU)/c64/cart/diashowmaker.c \
$(EMU)/c64/cart/digimax.c \
$(EMU)/c64/cart/dinamic.c \
$(EMU)/c64/cart/dqbb.c \
$(EMU)/c64/cart/ds12c887rtc.c \
$(EMU)/c64/cart/easycalc.c \
$(EMU)/c64/cart/easyflash.c \
$(EMU)/c64/cart/epyxfastload.c \
$(EMU)/c64/cart/ethernetcart.c \
$(EMU)/c64/cart/exos.c \
$(EMU)/c64/cart/expert.c \
$(EMU)/c64/cart/final.c \
$(EMU)/c64/cart/final3.c \
$(EMU)/c64/cart/finalplus.c \
$(EMU)/c64/cart/formel64.c \
$(EMU)/c64/cart/freezeframe.c \
$(EMU)/c64/cart/freezemachine.c \
$(EMU)/c64/cart/funplay.c \
$(EMU)/c64/cart/gamekiller.c \
$(EMU)/c64/cart/georam.c \
$(EMU)/c64/cart/gmod2.c \
$(EMU)/c64/cart/gs.c \
$(EMU)/c64/cart/ide64.c \
$(EMU)/c64/cart/isepic.c \
$(EMU)/c64/cart/kcs.c \
$(EMU)/c64/cart/kingsoft.c \
$(EMU)/c64/cart/mach5.c \
$(EMU)/c64/cart/magicdesk.c \
$(EMU)/c64/cart/magicformel.c \
$(EMU)/c64/cart/magicvoice.c \
$(EMU)/c64/cart/mikroass.c \
$(EMU)/c64/cart/mmc64.c \
$(EMU)/c64/cart/mmcreplay.c \
$(EMU)/c64/cart/ocean.c \
$(EMU)/c64/cart/pagefox.c \
$(EMU)/c64/cart/prophet64.c \
$(EMU)/c64/cart/ramcart.c \
$(EMU)/c64/cart/retroreplay.c \
$(EMU)/c64/cart/reu.c \
$(EMU)/c64/cart/rexep256.c \
$(EMU)/c64/cart/rexutility.c \
$(EMU)/c64/cart/rgcd.c \
$(EMU)/c64/cart/ross.c \
$(EMU)/c64/cart/rrnetmk3.c \
$(EMU)/c64/cart/sfx_soundexpander.c \
$(EMU)/c64/cart/sfx_soundsampler.c \
$(EMU)/c64/cart/shortbus.c \
$(EMU)/c64/cart/shortbus_digimax.c \
$(EMU)/c64/cart/shortbus_etfe.c \
$(EMU)/c64/cart/silverrock128.c \
$(EMU)/c64/cart/simonsbasic.c \
$(EMU)/c64/cart/snapshot64.c \
$(EMU)/c64/cart/stardos.c \
$(EMU)/c64/cart/stb.c \
$(EMU)/c64/cart/superexplode5.c \
$(EMU)/c64/cart/supergames.c \
$(EMU)/c64/cart/supersnapshot.c \
$(EMU)/c64/cart/supersnapshot4.c \
$(EMU)/c64/cart/warpspeed.c \
$(EMU)/c64/cart/westermann.c \
$(EMU)/c64/cart/zaxxon.c \
$(SOURCES_C_C64_CART) \
$(EMU)/c128/c128-cmdline-options.c \
$(EMU)/c128/c128-resources.c \
$(EMU)/c128/c128-snapshot.c \
$(EMU)/c128/c128.c \
$(EMU)/c128/c128cia1.c \
$(EMU)/c128/c128cpu.c \
@ -209,16 +127,20 @@ SOURCES_C += \
$(EMU)/core/cs8900.c \
$(EMU)/core/flash040core.c \
$(EMU)/core/fmopl.c \
$(EMU)/core/i8255a.c \
$(EMU)/core/m93c86.c \
$(EMU)/core/mc6821core.c \
$(EMU)/core/riotcore.c \
$(EMU)/core/scsi.c \
$(EMU)/core/ser-eeprom.c \
$(EMU)/core/spi-flash.c \
$(EMU)/core/spi-sdcard.c \
$(EMU)/core/t6721.c \
$(EMU)/core/tpicore.c \
$(EMU)/core/viacore.c \
$(EMU)/crc32.c \
$(EMU)/datasette.c \
$(EMU)/datasette/datasette.c \
$(EMU)/datasette/datasette-sound.c \
$(EMU)/debug.c \
$(EMU)/diag/c64_diag_586220_harness.c \
$(EMU)/diskimage/diskimage.c \
@ -229,7 +151,6 @@ SOURCES_C += \
$(EMU)/diskimage/fsimage-p64.c \
$(EMU)/diskimage/fsimage-probe.c \
$(EMU)/diskimage/fsimage.c \
$(EMU)/diskimage/rawimage.c \
$(EMU)/diskimage/realimage.c \
$(EMU)/dma.c \
$(EMU)/drive/drive-check.c \
@ -259,6 +180,7 @@ SOURCES_C += \
$(EMU)/drive/iec/c64exp/supercard.c \
$(EMU)/drive/iec/cia1571d.c \
$(EMU)/drive/iec/cia1581d.c \
$(EMU)/drive/iec/cmdhd.c \
$(EMU)/drive/iec/fdd.c \
$(EMU)/drive/iec/glue1571.c \
$(EMU)/drive/iec/iec-cmdline-options.c \
@ -298,6 +220,7 @@ SOURCES_C += \
$(EMU)/fliplist.c \
$(EMU)/fsdevice/fsdevice-close.c \
$(EMU)/fsdevice/fsdevice-cmdline-options.c \
$(EMU)/fsdevice/fsdevice-filename.c \
$(EMU)/fsdevice/fsdevice-flush.c \
$(EMU)/fsdevice/fsdevice-open.c \
$(EMU)/fsdevice/fsdevice-read.c \
@ -336,7 +259,6 @@ SOURCES_C += \
$(EMU)/keyboard.c \
$(EMU)/lib.c \
$(EMU)/lib/p64/p64.c \
$(EMU)/libm_math.c \
$(EMU)/log.c \
$(EMU)/machine-bus.c \
$(EMU)/machine.c \
@ -348,10 +270,7 @@ SOURCES_C += \
$(EMU)/parallel/parallel-trap.c \
$(EMU)/parallel/parallel.c \
$(EMU)/printerdrv/driver-select.c \
$(EMU)/printerdrv/drv-1520.c \
$(EMU)/printerdrv/drv-ascii.c \
$(EMU)/printerdrv/drv-mps803.c \
$(EMU)/printerdrv/drv-nl10.c \
$(EMU)/printerdrv/drv-raw.c \
$(EMU)/printerdrv/interface-serial.c \
$(EMU)/printerdrv/interface-userport.c \
@ -393,8 +312,6 @@ SOURCES_C += \
$(EMU)/rtc/rtc-58321a.c \
$(EMU)/rtc/rtc-72421.c \
$(EMU)/rtc/rtc.c \
$(EMU)/samplerdrv/file_drv.c \
$(EMU)/samplerdrv/sampler.c \
$(EMU)/screenshot.c \
$(EMU)/serial/fsdrive.c \
$(EMU)/serial/realdevice.c \
@ -419,7 +336,6 @@ SOURCES_C += \
$(EMU)/socket.c \
$(EMU)/socketdrv/socketdrv.c \
$(EMU)/sound.c \
$(EMU)/sounddrv/soundretro.c \
$(EMU)/sysfile.c \
$(EMU)/tape/t64.c \
$(EMU)/tape/tap.c \
@ -434,6 +350,7 @@ SOURCES_C += \
$(EMU)/tapeport/tapelog.c \
$(EMU)/tapeport/tapeport.c \
$(EMU)/tapeport/tape_diag_586220_harness.c \
$(EMU)/tick.c \
$(EMU)/traps.c \
$(EMU)/userport/userport.c \
$(EMU)/userport/userport_4bit_sampler.c \
@ -477,26 +394,9 @@ SOURCES_C += \
$(EMU)/vicii/vicii-timing.c \
$(EMU)/vicii/vicii.c \
$(EMU)/video/render1x1.c \
$(EMU)/video/render1x1crt.c \
$(EMU)/video/render1x1ntsc.c \
$(EMU)/video/render1x1pal.c \
$(EMU)/video/render1x2.c \
$(EMU)/video/render1x2crt.c \
$(EMU)/video/render2x2.c \
$(EMU)/video/render2x2crt.c \
$(EMU)/video/render2x2ntsc.c \
$(EMU)/video/render2x2pal.c \
$(EMU)/video/render2x4.c \
$(EMU)/video/render2x4crt.c \
$(EMU)/video/renderscale2x.c \
$(EMU)/video/renderyuv.c \
$(EMU)/video/video-canvas.c \
$(EMU)/video/video-cmdline-options.c \
$(EMU)/video/video-color.c \
$(EMU)/video/video-render-1x2.c \
$(EMU)/video/video-render-2x2.c \
$(EMU)/video/video-render-crt.c \
$(EMU)/video/video-render-pal.c \
$(EMU)/video/video-render.c \
$(EMU)/video/video-resources.c \
$(EMU)/video/video-sound.c \
@ -507,11 +407,22 @@ SOURCES_C += \
# stubs
SOURCES_C += \
$(EMU)/arch/libretro/info.c \
$(EMU)/arch/libretro/gfxoutputdrv/gfxoutput.c \
$(EMU)/arch/libretro/monitor/asm6502.c \
$(EMU)/arch/libretro/monitor/asmR65C02.c \
$(EMU)/arch/libretro/monitor/asmz80.c \
$(EMU)/arch/libretro/monitor/monitor.c \
$(EMU)/arch/libretro/monitor/monitor_network.c \
$(EMU)/arch/libretro/monitor/mon_util.c
$(RETRODEP)/info.c \
$(RETRODEP)/cart/cpmcart.c \
$(RETRODEP)/gfxoutputdrv/gfxoutput.c \
$(RETRODEP)/monitor/asm6502.c \
$(RETRODEP)/monitor/asmR65C02.c \
$(RETRODEP)/monitor/asmz80.c \
$(RETRODEP)/monitor/monitor.c \
$(RETRODEP)/monitor/monitor_network.c \
$(RETRODEP)/monitor/mon_util.c \
$(RETRODEP)/printerdrv/drv-1520.c \
$(RETRODEP)/printerdrv/drv-mps803.c \
$(RETRODEP)/printerdrv/drv-nl10.c \
$(RETRODEP)/samplerdrv/file_drv.c \
$(RETRODEP)/samplerdrv/sampler.c \
$(RETRODEP)/video/video-render-1x2.c \
$(RETRODEP)/video/video-render-2x2.c \
$(RETRODEP)/video/video-render-crt.c \
$(RETRODEP)/video/video-render-pal.c \

154
Makefile.x64
View File

@ -3,17 +3,19 @@ COMMONFLAGS += -D__X64__
INCFLAGS += \
-I$(EMU)/sid \
-I$(EMU) \
-I$(EMU)/arch/libretro \
-I$(EMU)/arch/shared \
-I$(EMU)/c64 \
-I$(EMU)/c64/cart \
-I$(EMU)/c64dtv \
-I$(EMU)/core \
-I$(EMU)/datasette \
-I$(EMU)/diag \
-I$(EMU)/drive \
-I$(EMU)/drive/iec \
-I$(EMU)/drive/iec/c64exp \
-I$(EMU)/drive/ieee \
-I$(EMU)/drive/tcbm \
-I$(EMU)/fsdevice \
-I$(EMU)/imagecontents \
-I$(EMU)/joyport \
-I$(EMU)/lib/p64 \
@ -22,6 +24,7 @@ INCFLAGS += \
-I$(EMU)/resid \
-I$(EMU)/residfp \
-I$(EMU)/residfp/builders/residfp-builder/residfp \
-I$(EMU)/rs232drv \
-I$(EMU)/rtc \
-I$(EMU)/samplerdrv \
-I$(EMU)/socketdrv \
@ -75,7 +78,6 @@ SOURCES_C += \
$(EMU)/c64/c64-cmdline-options.c \
$(EMU)/c64/c64-memory-hacks.c \
$(EMU)/c64/c64-resources.c \
$(EMU)/c64/c64-snapshot.c \
$(EMU)/c64/c64.c \
$(EMU)/c64/c64bus.c \
$(EMU)/c64/c64cia1.c \
@ -105,91 +107,7 @@ SOURCES_C += \
$(EMU)/c64/c64sound.c \
$(EMU)/c64/c64video.c \
$(EMU)/c64/c64_256k.c \
$(EMU)/c64/cart/actionreplay.c \
$(EMU)/c64/cart/actionreplay2.c \
$(EMU)/c64/cart/actionreplay3.c \
$(EMU)/c64/cart/actionreplay4.c \
$(EMU)/c64/cart/atomicpower.c \
$(EMU)/c64/cart/c64-generic.c \
$(EMU)/c64/cart/c64-midi.c \
$(EMU)/c64/cart/c64acia1.c \
$(EMU)/c64/cart/c64cart.c \
$(EMU)/c64/cart/c64carthooks.c \
$(EMU)/c64/cart/c64cartmem.c \
$(EMU)/c64/cart/c64tpi.c \
$(EMU)/c64/cart/capture.c \
$(EMU)/c64/cart/clockport-mp3at64.c \
$(EMU)/c64/cart/clockport-rrnet.c \
$(EMU)/c64/cart/clockport.c \
$(EMU)/c64/cart/comal80.c \
$(EMU)/c64/cart/crt.c \
$(EMU)/c64/cart/cs8900io.c \
$(EMU)/c64/cart/daa.c \
$(EMU)/c64/cart/debugcart.c \
$(EMU)/c64/cart/delaep7x8.c \
$(EMU)/c64/cart/delaep64.c \
$(EMU)/c64/cart/delaep256.c \
$(EMU)/c64/cart/diashowmaker.c \
$(EMU)/c64/cart/digimax.c \
$(EMU)/c64/cart/dinamic.c \
$(EMU)/c64/cart/dqbb.c \
$(EMU)/c64/cart/ds12c887rtc.c \
$(EMU)/c64/cart/easycalc.c \
$(EMU)/c64/cart/easyflash.c \
$(EMU)/c64/cart/epyxfastload.c \
$(EMU)/c64/cart/ethernetcart.c \
$(EMU)/c64/cart/exos.c \
$(EMU)/c64/cart/expert.c \
$(EMU)/c64/cart/final.c \
$(EMU)/c64/cart/final3.c \
$(EMU)/c64/cart/finalplus.c \
$(EMU)/c64/cart/formel64.c \
$(EMU)/c64/cart/freezeframe.c \
$(EMU)/c64/cart/freezemachine.c \
$(EMU)/c64/cart/funplay.c \
$(EMU)/c64/cart/gamekiller.c \
$(EMU)/c64/cart/georam.c \
$(EMU)/c64/cart/gmod2.c \
$(EMU)/c64/cart/gs.c \
$(EMU)/c64/cart/ide64.c \
$(EMU)/c64/cart/isepic.c \
$(EMU)/c64/cart/kcs.c \
$(EMU)/c64/cart/kingsoft.c \
$(EMU)/c64/cart/mach5.c \
$(EMU)/c64/cart/magicdesk.c \
$(EMU)/c64/cart/magicformel.c \
$(EMU)/c64/cart/magicvoice.c \
$(EMU)/c64/cart/mikroass.c \
$(EMU)/c64/cart/mmc64.c \
$(EMU)/c64/cart/mmcreplay.c \
$(EMU)/c64/cart/ocean.c \
$(EMU)/c64/cart/pagefox.c \
$(EMU)/c64/cart/prophet64.c \
$(EMU)/c64/cart/ramcart.c \
$(EMU)/c64/cart/retroreplay.c \
$(EMU)/c64/cart/reu.c \
$(EMU)/c64/cart/rexep256.c \
$(EMU)/c64/cart/rexutility.c \
$(EMU)/c64/cart/rgcd.c \
$(EMU)/c64/cart/ross.c \
$(EMU)/c64/cart/rrnetmk3.c \
$(EMU)/c64/cart/sfx_soundexpander.c \
$(EMU)/c64/cart/sfx_soundsampler.c \
$(EMU)/c64/cart/shortbus.c \
$(EMU)/c64/cart/shortbus_digimax.c \
$(EMU)/c64/cart/shortbus_etfe.c \
$(EMU)/c64/cart/silverrock128.c \
$(EMU)/c64/cart/simonsbasic.c \
$(EMU)/c64/cart/snapshot64.c \
$(EMU)/c64/cart/stardos.c \
$(EMU)/c64/cart/stb.c \
$(EMU)/c64/cart/superexplode5.c \
$(EMU)/c64/cart/supergames.c \
$(EMU)/c64/cart/supersnapshot.c \
$(EMU)/c64/cart/supersnapshot4.c \
$(EMU)/c64/cart/warpspeed.c \
$(EMU)/c64/cart/westermann.c \
$(EMU)/c64/cart/zaxxon.c \
$(SOURCES_C_C64_CART) \
$(EMU)/c64/patchrom.c \
$(EMU)/c64/plus60k.c \
$(EMU)/c64/plus256k.c \
@ -208,16 +126,20 @@ SOURCES_C += \
$(EMU)/core/cs8900.c \
$(EMU)/core/flash040core.c \
$(EMU)/core/fmopl.c \
$(EMU)/core/i8255a.c \
$(EMU)/core/m93c86.c \
$(EMU)/core/mc6821core.c \
$(EMU)/core/riotcore.c \
$(EMU)/core/scsi.c \
$(EMU)/core/ser-eeprom.c \
$(EMU)/core/spi-flash.c \
$(EMU)/core/spi-sdcard.c \
$(EMU)/core/t6721.c \
$(EMU)/core/tpicore.c \
$(EMU)/core/viacore.c \
$(EMU)/crc32.c \
$(EMU)/datasette.c \
$(EMU)/datasette/datasette.c \
$(EMU)/datasette/datasette-sound.c \
$(EMU)/debug.c \
$(EMU)/diag/c64_diag_586220_harness.c \
$(EMU)/diskimage/diskimage.c \
@ -228,7 +150,6 @@ SOURCES_C += \
$(EMU)/diskimage/fsimage-p64.c \
$(EMU)/diskimage/fsimage-probe.c \
$(EMU)/diskimage/fsimage.c \
$(EMU)/diskimage/rawimage.c \
$(EMU)/diskimage/realimage.c \
$(EMU)/dma.c \
$(EMU)/drive/drive-check.c \
@ -254,6 +175,7 @@ SOURCES_C += \
$(EMU)/drive/iec/c64exp/stardos-exp.c \
$(EMU)/drive/iec/cia1571d.c \
$(EMU)/drive/iec/cia1581d.c \
$(EMU)/drive/iec/cmdhd.c \
$(EMU)/drive/iec/fdd.c \
$(EMU)/drive/iec/glue1571.c \
$(EMU)/drive/iec/iec-cmdline-options.c \
@ -293,6 +215,7 @@ SOURCES_C += \
$(EMU)/fliplist.c \
$(EMU)/fsdevice/fsdevice-close.c \
$(EMU)/fsdevice/fsdevice-cmdline-options.c \
$(EMU)/fsdevice/fsdevice-filename.c \
$(EMU)/fsdevice/fsdevice-flush.c \
$(EMU)/fsdevice/fsdevice-open.c \
$(EMU)/fsdevice/fsdevice-read.c \
@ -331,11 +254,11 @@ SOURCES_C += \
$(EMU)/keyboard.c \
$(EMU)/lib.c \
$(EMU)/lib/p64/p64.c \
$(EMU)/libm_math.c \
$(EMU)/log.c \
$(EMU)/machine-bus.c \
$(EMU)/machine.c \
$(EMU)/main.c \
$(EMU)/mainlock.c \
$(EMU)/midi.c \
$(EMU)/network.c \
$(EMU)/opencbmlib.c \
@ -343,10 +266,7 @@ SOURCES_C += \
$(EMU)/parallel/parallel-trap.c \
$(EMU)/parallel/parallel.c \
$(EMU)/printerdrv/driver-select.c \
$(EMU)/printerdrv/drv-1520.c \
$(EMU)/printerdrv/drv-ascii.c \
$(EMU)/printerdrv/drv-mps803.c \
$(EMU)/printerdrv/drv-nl10.c \
$(EMU)/printerdrv/drv-raw.c \
$(EMU)/printerdrv/interface-serial.c \
$(EMU)/printerdrv/interface-userport.c \
@ -388,8 +308,6 @@ SOURCES_C += \
$(EMU)/rtc/rtc-58321a.c \
$(EMU)/rtc/rtc-72421.c \
$(EMU)/rtc/rtc.c \
$(EMU)/samplerdrv/file_drv.c \
$(EMU)/samplerdrv/sampler.c \
$(EMU)/screenshot.c \
$(EMU)/serial/fsdrive.c \
$(EMU)/serial/realdevice.c \
@ -414,7 +332,6 @@ SOURCES_C += \
$(EMU)/socket.c \
$(EMU)/socketdrv/socketdrv.c \
$(EMU)/sound.c \
$(EMU)/sounddrv/soundretro.c \
$(EMU)/sysfile.c \
$(EMU)/tape/t64.c \
$(EMU)/tape/tap.c \
@ -429,6 +346,7 @@ SOURCES_C += \
$(EMU)/tapeport/tapelog.c \
$(EMU)/tapeport/tapeport.c \
$(EMU)/tapeport/tape_diag_586220_harness.c \
$(EMU)/tick.c \
$(EMU)/traps.c \
$(EMU)/userport/userport.c \
$(EMU)/userport/userport_4bit_sampler.c \
@ -464,26 +382,9 @@ SOURCES_C += \
$(EMU)/vicii/vicii-timing.c \
$(EMU)/vicii/vicii.c \
$(EMU)/video/render1x1.c \
$(EMU)/video/render1x1crt.c \
$(EMU)/video/render1x1ntsc.c \
$(EMU)/video/render1x1pal.c \
$(EMU)/video/render1x2.c \
$(EMU)/video/render1x2crt.c \
$(EMU)/video/render2x2.c \
$(EMU)/video/render2x2crt.c \
$(EMU)/video/render2x2ntsc.c \
$(EMU)/video/render2x2pal.c \
$(EMU)/video/render2x4.c \
$(EMU)/video/render2x4crt.c \
$(EMU)/video/renderscale2x.c \
$(EMU)/video/renderyuv.c \
$(EMU)/video/video-canvas.c \
$(EMU)/video/video-cmdline-options.c \
$(EMU)/video/video-color.c \
$(EMU)/video/video-render-1x2.c \
$(EMU)/video/video-render-2x2.c \
$(EMU)/video/video-render-crt.c \
$(EMU)/video/video-render-pal.c \
$(EMU)/video/video-render.c \
$(EMU)/video/video-resources.c \
$(EMU)/video/video-sound.c \
@ -494,12 +395,21 @@ SOURCES_C += \
# stubs
SOURCES_C += \
$(EMU)/arch/libretro/info.c \
$(EMU)/arch/libretro/cart/cpmcart.c \
$(EMU)/arch/libretro/gfxoutputdrv/gfxoutput.c \
$(EMU)/arch/libretro/monitor/asm6502.c \
$(EMU)/arch/libretro/monitor/asmR65C02.c \
$(EMU)/arch/libretro/monitor/asmz80.c \
$(EMU)/arch/libretro/monitor/monitor.c \
$(EMU)/arch/libretro/monitor/monitor_network.c \
$(EMU)/arch/libretro/monitor/mon_util.c
$(RETRODEP)/info.c \
$(RETRODEP)/cart/cpmcart.c \
$(RETRODEP)/gfxoutputdrv/gfxoutput.c \
$(RETRODEP)/monitor/asm6502.c \
$(RETRODEP)/monitor/asmR65C02.c \
$(RETRODEP)/monitor/asmz80.c \
$(RETRODEP)/monitor/monitor.c \
$(RETRODEP)/monitor/monitor_network.c \
$(RETRODEP)/monitor/mon_util.c \
$(RETRODEP)/printerdrv/drv-1520.c \
$(RETRODEP)/printerdrv/drv-mps803.c \
$(RETRODEP)/printerdrv/drv-nl10.c \
$(RETRODEP)/samplerdrv/file_drv.c \
$(RETRODEP)/samplerdrv/sampler.c \
$(RETRODEP)/video/video-render-2x2.c \
$(RETRODEP)/video/video-render-crt.c \
$(RETRODEP)/video/video-render-pal.c \

69
Makefile.x64dtv
View File

@ -3,23 +3,26 @@ COMMONFLAGS += -D__X64DTV__
INCFLAGS += \
-I$(EMU)/sid \
-I$(EMU) \
-I$(EMU)/arch/libretro \
-I$(EMU)/arch/shared \
-I$(EMU)/c64 \
-I$(EMU)/c64/cart \
-I$(EMU)/c64dtv \
-I$(EMU)/core \
-I$(EMU)/datasette \
-I$(EMU)/diag \
-I$(EMU)/drive \
-I$(EMU)/drive/iec \
-I$(EMU)/drive/iec/c64exp \
-I$(EMU)/drive/ieee \
-I$(EMU)/drive/tcbm \
-I$(EMU)/fsdevice \
-I$(EMU)/imagecontents \
-I$(EMU)/joyport \
-I$(EMU)/lib/p64 \
-I$(EMU)/monitor \
-I$(EMU)/raster \
-I$(EMU)/resid-dtv \
-I$(EMU)/rs232drv \
-I$(EMU)/rtc \
-I$(EMU)/samplerdrv \
-I$(EMU)/socketdrv \
@ -59,7 +62,6 @@ SOURCES_C += \
$(EMU)/c64/reloc65.c \
$(EMU)/c64dtv/c64dtv-cmdline-options.c \
$(EMU)/c64dtv/c64dtv-resources.c \
$(EMU)/c64dtv/c64dtv-snapshot.c \
$(EMU)/c64dtv/c64dtv.c \
$(EMU)/c64dtv/c64dtvblitter.c \
$(EMU)/c64dtv/c64dtvcart.c \
@ -94,16 +96,20 @@ SOURCES_C += \
$(EMU)/core/cs8900.c \
$(EMU)/core/flash040core.c \
$(EMU)/core/fmopl.c \
$(EMU)/core/i8255a.c \
$(EMU)/core/m93c86.c \
$(EMU)/core/mc6821core.c \
$(EMU)/core/riotcore.c \
$(EMU)/core/scsi.c \
$(EMU)/core/ser-eeprom.c \
$(EMU)/core/spi-flash.c \
$(EMU)/core/spi-sdcard.c \
$(EMU)/core/t6721.c \
$(EMU)/core/tpicore.c \
$(EMU)/core/viacore.c \
$(EMU)/crc32.c \
$(EMU)/datasette.c \
$(EMU)/datasette/datasette.c \
$(EMU)/datasette/datasette-sound.c \
$(EMU)/debug.c \
$(EMU)/diskimage/diskimage.c \
$(EMU)/diskimage/fsimage-check.c \
@ -113,7 +119,6 @@ SOURCES_C += \
$(EMU)/diskimage/fsimage-p64.c \
$(EMU)/diskimage/fsimage-probe.c \
$(EMU)/diskimage/fsimage.c \
$(EMU)/diskimage/rawimage.c \
$(EMU)/diskimage/realimage.c \
$(EMU)/dma.c \
$(EMU)/drive/drive-check.c \
@ -139,6 +144,7 @@ SOURCES_C += \
$(EMU)/drive/iec/c64exp/stardos-exp.c \
$(EMU)/drive/iec/cia1571d.c \
$(EMU)/drive/iec/cia1581d.c \
$(EMU)/drive/iec/cmdhd.c \
$(EMU)/drive/iec/fdd.c \
$(EMU)/drive/iec/glue1571.c \
$(EMU)/drive/iec/iec-cmdline-options.c \
@ -178,6 +184,7 @@ SOURCES_C += \
$(EMU)/fliplist.c \
$(EMU)/fsdevice/fsdevice-close.c \
$(EMU)/fsdevice/fsdevice-cmdline-options.c \
$(EMU)/fsdevice/fsdevice-filename.c \
$(EMU)/fsdevice/fsdevice-flush.c \
$(EMU)/fsdevice/fsdevice-open.c \
$(EMU)/fsdevice/fsdevice-read.c \
@ -203,6 +210,7 @@ SOURCES_C += \
$(EMU)/joyport/joyport.c \
$(EMU)/joyport/joystick.c \
$(EMU)/joyport/lightpen.c \
$(EMU)/joyport/mouse.c \
$(EMU)/joyport/paperclip64.c \
$(EMU)/joyport/rushware_keypad.c \
$(EMU)/joyport/sampler2bit.c \
@ -215,7 +223,6 @@ SOURCES_C += \
$(EMU)/keyboard.c \
$(EMU)/lib.c \
$(EMU)/lib/p64/p64.c \
$(EMU)/libm_math.c \
$(EMU)/log.c \
$(EMU)/machine-bus.c \
$(EMU)/machine.c \
@ -227,10 +234,7 @@ SOURCES_C += \
$(EMU)/parallel/parallel-trap.c \
$(EMU)/parallel/parallel.c \
$(EMU)/printerdrv/driver-select.c \
$(EMU)/printerdrv/drv-1520.c \
$(EMU)/printerdrv/drv-ascii.c \
$(EMU)/printerdrv/drv-mps803.c \
$(EMU)/printerdrv/drv-nl10.c \
$(EMU)/printerdrv/drv-raw.c \
$(EMU)/printerdrv/interface-serial.c \
$(EMU)/printerdrv/interface-userport.c \
@ -273,8 +277,6 @@ SOURCES_C += \
$(EMU)/rtc/rtc-58321a.c \
$(EMU)/rtc/rtc-72421.c \
$(EMU)/rtc/rtc.c \
$(EMU)/samplerdrv/file_drv.c \
$(EMU)/samplerdrv/sampler.c \
$(EMU)/screenshot.c \
$(EMU)/serial/fsdrive.c \
$(EMU)/serial/realdevice.c \
@ -299,7 +301,6 @@ SOURCES_C += \
$(EMU)/socket.c \
$(EMU)/socketdrv/socketdrv.c \
$(EMU)/sound.c \
$(EMU)/sounddrv/soundretro.c \
$(EMU)/sysfile.c \
$(EMU)/tape/t64.c \
$(EMU)/tape/tap.c \
@ -307,6 +308,7 @@ SOURCES_C += \
$(EMU)/tape/tape-snapshot.c \
$(EMU)/tape/tape.c \
$(EMU)/tape/tapeimage.c \
$(EMU)/tick.c \
$(EMU)/traps.c \
$(EMU)/userport/userport.c \
$(EMU)/userport/userport_4bit_sampler.c \
@ -340,26 +342,9 @@ SOURCES_C += \
$(EMU)/vicii/viciidtv-draw.c \
$(EMU)/vicii/viciidtv-snapshot.c \
$(EMU)/video/render1x1.c \
$(EMU)/video/render1x1crt.c \
$(EMU)/video/render1x1ntsc.c \
$(EMU)/video/render1x1pal.c \
$(EMU)/video/render1x2.c \
$(EMU)/video/render1x2crt.c \
$(EMU)/video/render2x2.c \
$(EMU)/video/render2x2crt.c \
$(EMU)/video/render2x2ntsc.c \
$(EMU)/video/render2x2pal.c \
$(EMU)/video/render2x4.c \
$(EMU)/video/render2x4crt.c \
$(EMU)/video/renderscale2x.c \
$(EMU)/video/renderyuv.c \
$(EMU)/video/video-canvas.c \
$(EMU)/video/video-cmdline-options.c \
$(EMU)/video/video-color.c \
$(EMU)/video/video-render-1x2.c \
$(EMU)/video/video-render-2x2.c \
$(EMU)/video/video-render-crt.c \
$(EMU)/video/video-render-pal.c \
$(EMU)/video/video-render.c \
$(EMU)/video/video-resources.c \
$(EMU)/video/video-sound.c \
@ -370,12 +355,22 @@ SOURCES_C += \
# stubs
SOURCES_C += \
$(EMU)/arch/libretro/info.c \
$(EMU)/arch/libretro/gfxoutputdrv/gfxoutput.c \
$(EMU)/arch/libretro/monitor/asm6502.c \
$(EMU)/arch/libretro/monitor/asm6502dtv.c \
$(EMU)/arch/libretro/monitor/asmR65C02.c \
$(EMU)/arch/libretro/monitor/asmz80.c \
$(EMU)/arch/libretro/monitor/monitor.c \
$(EMU)/arch/libretro/monitor/monitor_network.c \
$(EMU)/arch/libretro/monitor/mon_util.c
$(RETRODEP)/info.c \
$(RETRODEP)/cart/cpmcart.c \
$(RETRODEP)/gfxoutputdrv/gfxoutput.c \
$(RETRODEP)/monitor/asm6502.c \
$(RETRODEP)/monitor/asm6502dtv.c \
$(RETRODEP)/monitor/asmR65C02.c \
$(RETRODEP)/monitor/asmz80.c \
$(RETRODEP)/monitor/monitor.c \
$(RETRODEP)/monitor/monitor_network.c \
$(RETRODEP)/monitor/mon_util.c \
$(RETRODEP)/printerdrv/drv-1520.c \
$(RETRODEP)/printerdrv/drv-mps803.c \
$(RETRODEP)/printerdrv/drv-nl10.c \
$(RETRODEP)/samplerdrv/file_drv.c \
$(RETRODEP)/samplerdrv/sampler.c \
$(RETRODEP)/video/video-render-2x2.c \
$(RETRODEP)/video/video-render-crt.c \
$(RETRODEP)/video/video-render-pal.c \

154
Makefile.x64sc
View File

@ -3,16 +3,18 @@ COMMONFLAGS += -D__X64SC__
INCFLAGS += \
-I$(EMU)/sid \
-I$(EMU) \
-I$(EMU)/arch/libretro \
-I$(EMU)/arch/shared \
-I$(EMU)/c64 \
-I$(EMU)/c64/cart \
-I$(EMU)/core \
-I$(EMU)/datasette \
-I$(EMU)/diag \
-I$(EMU)/drive \
-I$(EMU)/drive/iec \
-I$(EMU)/drive/iec/c64exp \
-I$(EMU)/drive/ieee \
-I$(EMU)/drive/tcbm \
-I$(EMU)/fsdevice \
-I$(EMU)/imagecontents \
-I$(EMU)/joyport \
-I$(EMU)/lib/p64 \
@ -21,6 +23,7 @@ INCFLAGS += \
-I$(EMU)/resid \
-I$(EMU)/residfp \
-I$(EMU)/residfp/builders/residfp-builder/residfp \
-I$(EMU)/rs232drv \
-I$(EMU)/rtc \
-I$(EMU)/samplerdrv \
-I$(EMU)/socketdrv \
@ -74,7 +77,6 @@ SOURCES_C += \
$(EMU)/c64/c64-cmdline-options.c \
$(EMU)/c64/c64-memory-hacks.c \
$(EMU)/c64/c64-resources.c \
$(EMU)/c64/c64-snapshot.c \
$(EMU)/c64/c64.c \
$(EMU)/c64/c64bus.c \
$(EMU)/c64/c64cia1.c \
@ -104,91 +106,7 @@ SOURCES_C += \
$(EMU)/c64/c64sound.c \
$(EMU)/c64/c64video.c \
$(EMU)/c64/c64_256k.c \
$(EMU)/c64/cart/actionreplay.c \
$(EMU)/c64/cart/actionreplay2.c \
$(EMU)/c64/cart/actionreplay3.c \
$(EMU)/c64/cart/actionreplay4.c \
$(EMU)/c64/cart/atomicpower.c \
$(EMU)/c64/cart/c64-generic.c \
$(EMU)/c64/cart/c64-midi.c \
$(EMU)/c64/cart/c64acia1.c \
$(EMU)/c64/cart/c64cart.c \
$(EMU)/c64/cart/c64carthooks.c \
$(EMU)/c64/cart/c64cartmem.c \
$(EMU)/c64/cart/c64tpi.c \
$(EMU)/c64/cart/capture.c \
$(EMU)/c64/cart/clockport-mp3at64.c \
$(EMU)/c64/cart/clockport-rrnet.c \
$(EMU)/c64/cart/clockport.c \
$(EMU)/c64/cart/comal80.c \
$(EMU)/c64/cart/crt.c \
$(EMU)/c64/cart/cs8900io.c \
$(EMU)/c64/cart/daa.c \
$(EMU)/c64/cart/debugcart.c \
$(EMU)/c64/cart/delaep7x8.c \
$(EMU)/c64/cart/delaep64.c \
$(EMU)/c64/cart/delaep256.c \
$(EMU)/c64/cart/diashowmaker.c \
$(EMU)/c64/cart/digimax.c \
$(EMU)/c64/cart/dinamic.c \
$(EMU)/c64/cart/dqbb.c \
$(EMU)/c64/cart/ds12c887rtc.c \
$(EMU)/c64/cart/easycalc.c \
$(EMU)/c64/cart/easyflash.c \
$(EMU)/c64/cart/epyxfastload.c \
$(EMU)/c64/cart/ethernetcart.c \
$(EMU)/c64/cart/exos.c \
$(EMU)/c64/cart/expert.c \
$(EMU)/c64/cart/final.c \
$(EMU)/c64/cart/final3.c \
$(EMU)/c64/cart/finalplus.c \
$(EMU)/c64/cart/formel64.c \
$(EMU)/c64/cart/freezeframe.c \
$(EMU)/c64/cart/freezemachine.c \
$(EMU)/c64/cart/funplay.c \
$(EMU)/c64/cart/gamekiller.c \
$(EMU)/c64/cart/georam.c \
$(EMU)/c64/cart/gmod2.c \
$(EMU)/c64/cart/gs.c \
$(EMU)/c64/cart/ide64.c \
$(EMU)/c64/cart/isepic.c \
$(EMU)/c64/cart/kcs.c \
$(EMU)/c64/cart/kingsoft.c \
$(EMU)/c64/cart/mach5.c \
$(EMU)/c64/cart/magicdesk.c \
$(EMU)/c64/cart/magicformel.c \
$(EMU)/c64/cart/magicvoice.c \
$(EMU)/c64/cart/mikroass.c \
$(EMU)/c64/cart/mmc64.c \
$(EMU)/c64/cart/mmcreplay.c \
$(EMU)/c64/cart/ocean.c \
$(EMU)/c64/cart/pagefox.c \
$(EMU)/c64/cart/prophet64.c \
$(EMU)/c64/cart/ramcart.c \
$(EMU)/c64/cart/retroreplay.c \
$(EMU)/c64/cart/reu.c \
$(EMU)/c64/cart/rexep256.c \
$(EMU)/c64/cart/rexutility.c \
$(EMU)/c64/cart/rgcd.c \
$(EMU)/c64/cart/ross.c \
$(EMU)/c64/cart/rrnetmk3.c \
$(EMU)/c64/cart/sfx_soundexpander.c \
$(EMU)/c64/cart/sfx_soundsampler.c \
$(EMU)/c64/cart/shortbus.c \
$(EMU)/c64/cart/shortbus_digimax.c \
$(EMU)/c64/cart/shortbus_etfe.c \
$(EMU)/c64/cart/silverrock128.c \
$(EMU)/c64/cart/simonsbasic.c \
$(EMU)/c64/cart/snapshot64.c \
$(EMU)/c64/cart/stardos.c \
$(EMU)/c64/cart/stb.c \
$(EMU)/c64/cart/superexplode5.c \
$(EMU)/c64/cart/supergames.c \
$(EMU)/c64/cart/supersnapshot.c \
$(EMU)/c64/cart/supersnapshot4.c \
$(EMU)/c64/cart/warpspeed.c \
$(EMU)/c64/cart/westermann.c \
$(EMU)/c64/cart/zaxxon.c \
$(SOURCES_C_C64_CART) \
$(EMU)/c64/patchrom.c \
$(EMU)/c64/plus60k.c \
$(EMU)/c64/plus256k.c \
@ -207,16 +125,20 @@ SOURCES_C += \
$(EMU)/core/cs8900.c \
$(EMU)/core/flash040core.c \
$(EMU)/core/fmopl.c \
$(EMU)/core/i8255a.c \
$(EMU)/core/m93c86.c \
$(EMU)/core/mc6821core.c \
$(EMU)/core/riotcore.c \
$(EMU)/core/scsi.c \
$(EMU)/core/ser-eeprom.c \
$(EMU)/core/spi-flash.c \
$(EMU)/core/spi-sdcard.c \
$(EMU)/core/t6721.c \
$(EMU)/core/tpicore.c \
$(EMU)/core/viacore.c \
$(EMU)/crc32.c \
$(EMU)/datasette.c \
$(EMU)/datasette/datasette.c \
$(EMU)/datasette/datasette-sound.c \
$(EMU)/debug.c \
$(EMU)/diag/c64_diag_586220_harness.c \
$(EMU)/diskimage/diskimage.c \
@ -227,7 +149,6 @@ SOURCES_C += \
$(EMU)/diskimage/fsimage-p64.c \
$(EMU)/diskimage/fsimage-probe.c \
$(EMU)/diskimage/fsimage.c \
$(EMU)/diskimage/rawimage.c \
$(EMU)/diskimage/realimage.c \
$(EMU)/dma.c \
$(EMU)/drive/drive-check.c \
@ -253,6 +174,7 @@ SOURCES_C += \
$(EMU)/drive/iec/c64exp/stardos-exp.c \
$(EMU)/drive/iec/cia1571d.c \
$(EMU)/drive/iec/cia1581d.c \
$(EMU)/drive/iec/cmdhd.c \
$(EMU)/drive/iec/fdd.c \
$(EMU)/drive/iec/glue1571.c \
$(EMU)/drive/iec/iec-cmdline-options.c \
@ -292,6 +214,7 @@ SOURCES_C += \
$(EMU)/fliplist.c \
$(EMU)/fsdevice/fsdevice-close.c \
$(EMU)/fsdevice/fsdevice-cmdline-options.c \
$(EMU)/fsdevice/fsdevice-filename.c \
$(EMU)/fsdevice/fsdevice-flush.c \
$(EMU)/fsdevice/fsdevice-open.c \
$(EMU)/fsdevice/fsdevice-read.c \
@ -330,11 +253,11 @@ SOURCES_C += \
$(EMU)/keyboard.c \
$(EMU)/lib.c \
$(EMU)/lib/p64/p64.c \
$(EMU)/libm_math.c \
$(EMU)/log.c \
$(EMU)/machine-bus.c \
$(EMU)/machine.c \
$(EMU)/main.c \
$(EMU)/mainlock.c \
$(EMU)/midi.c \
$(EMU)/network.c \
$(EMU)/opencbmlib.c \
@ -342,10 +265,7 @@ SOURCES_C += \
$(EMU)/parallel/parallel-trap.c \
$(EMU)/parallel/parallel.c \
$(EMU)/printerdrv/driver-select.c \
$(EMU)/printerdrv/drv-1520.c \
$(EMU)/printerdrv/drv-ascii.c \
$(EMU)/printerdrv/drv-mps803.c \
$(EMU)/printerdrv/drv-nl10.c \
$(EMU)/printerdrv/drv-raw.c \
$(EMU)/printerdrv/interface-serial.c \
$(EMU)/printerdrv/interface-userport.c \
@ -387,8 +307,6 @@ SOURCES_C += \
$(EMU)/rtc/rtc-58321a.c \
$(EMU)/rtc/rtc-72421.c \
$(EMU)/rtc/rtc.c \
$(EMU)/samplerdrv/file_drv.c \
$(EMU)/samplerdrv/sampler.c \
$(EMU)/screenshot.c \
$(EMU)/serial/fsdrive.c \
$(EMU)/serial/realdevice.c \
@ -413,7 +331,6 @@ SOURCES_C += \
$(EMU)/socket.c \
$(EMU)/socketdrv/socketdrv.c \
$(EMU)/sound.c \
$(EMU)/sounddrv/soundretro.c \
$(EMU)/sysfile.c \
$(EMU)/tape/t64.c \
$(EMU)/tape/tap.c \
@ -428,6 +345,7 @@ SOURCES_C += \
$(EMU)/tapeport/tapelog.c \
$(EMU)/tapeport/tapeport.c \
$(EMU)/tapeport/tape_diag_586220_harness.c \
$(EMU)/tick.c \
$(EMU)/traps.c \
$(EMU)/userport/userport.c \
$(EMU)/userport/userport_4bit_sampler.c \
@ -464,26 +382,9 @@ SOURCES_C += \
$(EMU)/viciisc/vicii-timing.c \
$(EMU)/viciisc/vicii.c \
$(EMU)/video/render1x1.c \
$(EMU)/video/render1x1crt.c \
$(EMU)/video/render1x1ntsc.c \
$(EMU)/video/render1x1pal.c \
$(EMU)/video/render1x2.c \
$(EMU)/video/render1x2crt.c \
$(EMU)/video/render2x2.c \
$(EMU)/video/render2x2crt.c \
$(EMU)/video/render2x2ntsc.c \
$(EMU)/video/render2x2pal.c \
$(EMU)/video/render2x4.c \
$(EMU)/video/render2x4crt.c \
$(EMU)/video/renderscale2x.c \
$(EMU)/video/renderyuv.c \
$(EMU)/video/video-canvas.c \
$(EMU)/video/video-cmdline-options.c \
$(EMU)/video/video-color.c \
$(EMU)/video/video-render-1x2.c \
$(EMU)/video/video-render-2x2.c \
$(EMU)/video/video-render-crt.c \
$(EMU)/video/video-render-pal.c \
$(EMU)/video/video-render.c \
$(EMU)/video/video-resources.c \
$(EMU)/video/video-sound.c \
@ -494,12 +395,21 @@ SOURCES_C += \
# stubs
SOURCES_C += \
$(EMU)/arch/libretro/info.c \
$(EMU)/arch/libretro/cart/cpmcart.c \
$(EMU)/arch/libretro/gfxoutputdrv/gfxoutput.c \
$(EMU)/arch/libretro/monitor/asm6502.c \
$(EMU)/arch/libretro/monitor/asmR65C02.c \
$(EMU)/arch/libretro/monitor/asmz80.c \
$(EMU)/arch/libretro/monitor/monitor.c \
$(EMU)/arch/libretro/monitor/monitor_network.c \
$(EMU)/arch/libretro/monitor/mon_util.c
$(RETRODEP)/info.c \
$(RETRODEP)/cart/cpmcart.c \
$(RETRODEP)/gfxoutputdrv/gfxoutput.c \
$(RETRODEP)/monitor/asm6502.c \
$(RETRODEP)/monitor/asmR65C02.c \
$(RETRODEP)/monitor/asmz80.c \
$(RETRODEP)/monitor/monitor.c \
$(RETRODEP)/monitor/monitor_network.c \
$(RETRODEP)/monitor/mon_util.c \
$(RETRODEP)/printerdrv/drv-1520.c \
$(RETRODEP)/printerdrv/drv-mps803.c \
$(RETRODEP)/printerdrv/drv-nl10.c \
$(RETRODEP)/samplerdrv/file_drv.c \
$(RETRODEP)/samplerdrv/sampler.c \
$(RETRODEP)/video/video-render-2x2.c \
$(RETRODEP)/video/video-render-crt.c \
$(RETRODEP)/video/video-render-pal.c \

62
Makefile.xcbm2
View File

@ -3,21 +3,24 @@ COMMONFLAGS += -D__XCBM2__
INCFLAGS += \
-I$(EMU)/sid \
-I$(EMU) \
-I$(EMU)/arch/libretro \
-I$(EMU)/arch/shared \
-I$(EMU)/cbm2 \
-I$(EMU)/core \
-I$(EMU)/datasette \
-I$(EMU)/crtc \
-I$(EMU)/diag \
-I$(EMU)/drive \
-I$(EMU)/drive/iec \
-I$(EMU)/drive/ieee \
-I$(EMU)/drive/tcbm \
-I$(EMU)/fsdevice \
-I$(EMU)/imagecontents \
-I$(EMU)/joyport \
-I$(EMU)/lib/p64 \
-I$(EMU)/monitor \
-I$(EMU)/raster \
-I$(EMU)/resid \
-I$(EMU)/rs232drv \
-I$(EMU)/rtc \
-I$(EMU)/samplerdrv \
-I$(EMU)/socketdrv \
@ -71,7 +74,6 @@ SOURCES_C += \
$(EMU)/cbm2/cbm2-resources.c \
$(EMU)/cbm2/cbm2rom.c \
$(EMU)/cbm2/cbm2romset.c \
$(EMU)/cbm2/cbm2-snapshot.c \
$(EMU)/cbm2/cbm2sound.c \
$(EMU)/cbm2/cbm2tpi1.c \
$(EMU)/cbm2/cbm2tpi2.c \
@ -83,10 +85,13 @@ SOURCES_C += \
$(EMU)/core/cs8900.c \
$(EMU)/core/flash040core.c \
$(EMU)/core/fmopl.c \
$(EMU)/core/i8255a.c \
$(EMU)/core/m93c86.c \
$(EMU)/core/mc6821core.c \
$(EMU)/core/riotcore.c \
$(EMU)/core/scsi.c \
$(EMU)/core/ser-eeprom.c \
$(EMU)/core/spi-flash.c \
$(EMU)/core/spi-sdcard.c \
$(EMU)/core/t6721.c \
$(EMU)/core/tpicore.c \
@ -99,7 +104,8 @@ SOURCES_C += \
$(EMU)/crtc/crtc-resources.c \
$(EMU)/crtc/crtc-snapshot.c \
$(EMU)/crtc/crtc.c \
$(EMU)/datasette.c \
$(EMU)/datasette/datasette.c \
$(EMU)/datasette/datasette-sound.c \
$(EMU)/debug.c \
$(EMU)/diskimage/diskimage.c \
$(EMU)/diskimage/fsimage-check.c \
@ -109,7 +115,6 @@ SOURCES_C += \
$(EMU)/diskimage/fsimage-p64.c \
$(EMU)/diskimage/fsimage-probe.c \
$(EMU)/diskimage/fsimage.c \
$(EMU)/diskimage/rawimage.c \
$(EMU)/diskimage/realimage.c \
$(EMU)/dma.c \
$(EMU)/drive/drive-check.c \
@ -128,6 +133,7 @@ SOURCES_C += \
$(EMU)/drive/drivesync.c \
$(EMU)/drive/iec/cia1571d.c \
$(EMU)/drive/iec/cia1581d.c \
$(EMU)/drive/iec/cmdhd.c \
$(EMU)/drive/iec/fdd.c \
$(EMU)/drive/iec/glue1571.c \
$(EMU)/drive/iec/iec-cmdline-options.c \
@ -167,6 +173,7 @@ SOURCES_C += \
$(EMU)/fliplist.c \
$(EMU)/fsdevice/fsdevice-close.c \
$(EMU)/fsdevice/fsdevice-cmdline-options.c \
$(EMU)/fsdevice/fsdevice-filename.c \
$(EMU)/fsdevice/fsdevice-flush.c \
$(EMU)/fsdevice/fsdevice-open.c \
$(EMU)/fsdevice/fsdevice-read.c \
@ -202,7 +209,6 @@ SOURCES_C += \
$(EMU)/keyboard.c \
$(EMU)/lib.c \
$(EMU)/lib/p64/p64.c \
$(EMU)/libm_math.c \
$(EMU)/log.c \
$(EMU)/machine-bus.c \
$(EMU)/machine.c \
@ -214,10 +220,7 @@ SOURCES_C += \
$(EMU)/parallel/parallel-trap.c \
$(EMU)/parallel/parallel.c \
$(EMU)/printerdrv/driver-select.c \
$(EMU)/printerdrv/drv-1520.c \
$(EMU)/printerdrv/drv-ascii.c \
$(EMU)/printerdrv/drv-mps803.c \
$(EMU)/printerdrv/drv-nl10.c \
$(EMU)/printerdrv/drv-raw.c \
$(EMU)/printerdrv/interface-serial.c \
$(EMU)/printerdrv/interface-userport.c \
@ -259,8 +262,6 @@ SOURCES_C += \
$(EMU)/rtc/rtc-58321a.c \
$(EMU)/rtc/rtc-72421.c \
$(EMU)/rtc/rtc.c \
$(EMU)/samplerdrv/file_drv.c \
$(EMU)/samplerdrv/sampler.c \
$(EMU)/screenshot.c \
$(EMU)/serial/fsdrive.c \
$(EMU)/serial/serial-device.c \
@ -284,7 +285,6 @@ SOURCES_C += \
$(EMU)/socket.c \
$(EMU)/socketdrv/socketdrv.c \
$(EMU)/sound.c \
$(EMU)/sounddrv/soundretro.c \
$(EMU)/sysfile.c \
$(EMU)/tape/t64.c \
$(EMU)/tape/tap.c \
@ -298,6 +298,7 @@ SOURCES_C += \
$(EMU)/tapeport/tapecart.c \
$(EMU)/tapeport/tapelog.c \
$(EMU)/tapeport/tapeport.c \
$(EMU)/tick.c \
$(EMU)/traps.c \
$(EMU)/userport/userport.c \
$(EMU)/userport/userport_4bit_sampler.c \
@ -318,26 +319,9 @@ SOURCES_C += \
$(EMU)/vdrive/vdrive.c \
$(EMU)/vicefeatures.c \
$(EMU)/video/render1x1.c \
$(EMU)/video/render1x1crt.c \
$(EMU)/video/render1x1ntsc.c \
$(EMU)/video/render1x1pal.c \
$(EMU)/video/render1x2.c \
$(EMU)/video/render1x2crt.c \
$(EMU)/video/render2x2.c \
$(EMU)/video/render2x2crt.c \
$(EMU)/video/render2x2ntsc.c \
$(EMU)/video/render2x2pal.c \
$(EMU)/video/render2x4.c \
$(EMU)/video/render2x4crt.c \
$(EMU)/video/renderscale2x.c \
$(EMU)/video/renderyuv.c \
$(EMU)/video/video-canvas.c \
$(EMU)/video/video-cmdline-options.c \
$(EMU)/video/video-color.c \
$(EMU)/video/video-render-1x2.c \
$(EMU)/video/video-render-2x2.c \
$(EMU)/video/video-render-crt.c \
$(EMU)/video/video-render-pal.c \
$(EMU)/video/video-render.c \
$(EMU)/video/video-resources.c \
$(EMU)/video/video-sound.c \
@ -348,9 +332,19 @@ SOURCES_C += \
# stubs
SOURCES_C += \
$(EMU)/arch/libretro/info.c \
$(EMU)/arch/libretro/gfxoutputdrv/gfxoutput.c \
$(EMU)/arch/libretro/monitor/asm6502.c \
$(EMU)/arch/libretro/monitor/monitor.c \
$(EMU)/arch/libretro/monitor/monitor_network.c \
$(EMU)/arch/libretro/monitor/mon_util.c
$(RETRODEP)/info.c \
$(RETRODEP)/gfxoutputdrv/gfxoutput.c \
$(RETRODEP)/monitor/asm6502.c \
$(RETRODEP)/monitor/monitor.c \
$(RETRODEP)/monitor/monitor_network.c \
$(RETRODEP)/monitor/mon_util.c \
$(RETRODEP)/printerdrv/drv-1520.c \
$(RETRODEP)/printerdrv/drv-mps803.c \
$(RETRODEP)/printerdrv/drv-nl10.c \
$(RETRODEP)/samplerdrv/file_drv.c \
$(RETRODEP)/samplerdrv/sampler.c \
$(RETRODEP)/video/video-render-1x2.c \
$(RETRODEP)/video/video-render-2x2.c \
$(RETRODEP)/video/video-render-crt.c \
$(RETRODEP)/video/video-render-pal.c \

62
Makefile.xcbm5x0
View File

@ -3,24 +3,27 @@ COMMONFLAGS += -D__XCBM5x0__
INCFLAGS += \
-I$(EMU)/sid \
-I$(EMU) \
-I$(EMU)/arch/libretro \
-I$(EMU)/arch/shared \
-I$(EMU)/c64 \
-I$(EMU)/c64/cart \
-I$(EMU)/c64dtv \
-I$(EMU)/cbm2 \
-I$(EMU)/core \
-I$(EMU)/crtc \
-I$(EMU)/datasette \
-I$(EMU)/diag \
-I$(EMU)/drive \
-I$(EMU)/drive/iec \
-I$(EMU)/drive/ieee \
-I$(EMU)/drive/tcbm \
-I$(EMU)/fsdevice \
-I$(EMU)/imagecontents \
-I$(EMU)/joyport \
-I$(EMU)/lib/p64 \
-I$(EMU)/monitor \
-I$(EMU)/raster \
-I$(EMU)/resid \
-I$(EMU)/rs232drv \
-I$(EMU)/rtc \
-I$(EMU)/samplerdrv \
-I$(EMU)/socketdrv \
@ -74,7 +77,6 @@ SOURCES_C += \
$(EMU)/cbm2/cbm5x0-resources.c \
$(EMU)/cbm2/cbm5x0rom.c \
$(EMU)/cbm2/cbm2romset.c \
$(EMU)/cbm2/cbm5x0-snapshot.c \
$(EMU)/cbm2/cbm2sound.c \
$(EMU)/cbm2/cbm2tpi1.c \
$(EMU)/cbm2/cbm2tpi2.c \
@ -86,16 +88,20 @@ SOURCES_C += \
$(EMU)/core/cs8900.c \
$(EMU)/core/flash040core.c \
$(EMU)/core/fmopl.c \
$(EMU)/core/i8255a.c \
$(EMU)/core/m93c86.c \
$(EMU)/core/mc6821core.c \
$(EMU)/core/riotcore.c \
$(EMU)/core/scsi.c \
$(EMU)/core/ser-eeprom.c \
$(EMU)/core/spi-flash.c \
$(EMU)/core/spi-sdcard.c \
$(EMU)/core/t6721.c \
$(EMU)/core/tpicore.c \
$(EMU)/core/viacore.c \
$(EMU)/crc32.c \
$(EMU)/datasette.c \
$(EMU)/datasette/datasette.c \
$(EMU)/datasette/datasette-sound.c \
$(EMU)/debug.c \
$(EMU)/diskimage/diskimage.c \
$(EMU)/diskimage/fsimage-check.c \
@ -105,7 +111,6 @@ SOURCES_C += \
$(EMU)/diskimage/fsimage-p64.c \
$(EMU)/diskimage/fsimage-probe.c \
$(EMU)/diskimage/fsimage.c \
$(EMU)/diskimage/rawimage.c \
$(EMU)/diskimage/realimage.c \
$(EMU)/dma.c \
$(EMU)/drive/drive-check.c \
@ -124,6 +129,7 @@ SOURCES_C += \
$(EMU)/drive/drivesync.c \
$(EMU)/drive/iec/cia1571d.c \
$(EMU)/drive/iec/cia1581d.c \
$(EMU)/drive/iec/cmdhd.c \
$(EMU)/drive/iec/fdd.c \
$(EMU)/drive/iec/glue1571.c \
$(EMU)/drive/iec/iec-cmdline-options.c \
@ -163,6 +169,7 @@ SOURCES_C += \
$(EMU)/fliplist.c \
$(EMU)/fsdevice/fsdevice-close.c \
$(EMU)/fsdevice/fsdevice-cmdline-options.c \
$(EMU)/fsdevice/fsdevice-filename.c \
$(EMU)/fsdevice/fsdevice-flush.c \
$(EMU)/fsdevice/fsdevice-open.c \
$(EMU)/fsdevice/fsdevice-read.c \
@ -198,7 +205,6 @@ SOURCES_C += \
$(EMU)/keyboard.c \
$(EMU)/lib.c \
$(EMU)/lib/p64/p64.c \
$(EMU)/libm_math.c \
$(EMU)/log.c \
$(EMU)/machine-bus.c \
$(EMU)/machine.c \
@ -210,10 +216,7 @@ SOURCES_C += \
$(EMU)/parallel/parallel-trap.c \
$(EMU)/parallel/parallel.c \
$(EMU)/printerdrv/driver-select.c \
$(EMU)/printerdrv/drv-1520.c \
$(EMU)/printerdrv/drv-ascii.c \
$(EMU)/printerdrv/drv-mps803.c \
$(EMU)/printerdrv/drv-nl10.c \
$(EMU)/printerdrv/drv-raw.c \
$(EMU)/printerdrv/interface-serial.c \
$(EMU)/printerdrv/output-graphics.c \
@ -253,8 +256,6 @@ SOURCES_C += \
$(EMU)/rtc/rtc-58321a.c \
$(EMU)/rtc/rtc-72421.c \
$(EMU)/rtc/rtc.c \
$(EMU)/samplerdrv/file_drv.c \
$(EMU)/samplerdrv/sampler.c \
$(EMU)/screenshot.c \
$(EMU)/serial/fsdrive.c \
$(EMU)/serial/serial-device.c \
@ -278,7 +279,6 @@ SOURCES_C += \
$(EMU)/socket.c \
$(EMU)/socketdrv/socketdrv.c \
$(EMU)/sound.c \
$(EMU)/sounddrv/soundretro.c \
$(EMU)/sysfile.c \
$(EMU)/tape/t64.c \
$(EMU)/tape/tap.c \
@ -292,6 +292,7 @@ SOURCES_C += \
$(EMU)/tapeport/tapecart.c \
$(EMU)/tapeport/tapelog.c \
$(EMU)/tapeport/tapeport.c \
$(EMU)/tick.c \
$(EMU)/traps.c \
$(EMU)/util.c \
$(EMU)/vdrive/vdrive-bam.c \
@ -318,26 +319,9 @@ SOURCES_C += \
$(EMU)/vicii/vicii-timing.c \
$(EMU)/vicii/vicii.c \
$(EMU)/video/render1x1.c \
$(EMU)/video/render1x1crt.c \
$(EMU)/video/render1x1ntsc.c \
$(EMU)/video/render1x1pal.c \
$(EMU)/video/render1x2.c \
$(EMU)/video/render1x2crt.c \
$(EMU)/video/render2x2.c \
$(EMU)/video/render2x2crt.c \
$(EMU)/video/render2x2ntsc.c \
$(EMU)/video/render2x2pal.c \
$(EMU)/video/render2x4.c \
$(EMU)/video/render2x4crt.c \
$(EMU)/video/renderscale2x.c \
$(EMU)/video/renderyuv.c \
$(EMU)/video/video-canvas.c \
$(EMU)/video/video-cmdline-options.c \
$(EMU)/video/video-color.c \
$(EMU)/video/video-render-1x2.c \
$(EMU)/video/video-render-2x2.c \
$(EMU)/video/video-render-crt.c \
$(EMU)/video/video-render-pal.c \
$(EMU)/video/video-render.c \
$(EMU)/video/video-resources.c \
$(EMU)/video/video-sound.c \
@ -348,9 +332,19 @@ SOURCES_C += \
# stubs
SOURCES_C += \
$(EMU)/arch/libretro/info.c \
$(EMU)/arch/libretro/gfxoutputdrv/gfxoutput.c \
$(EMU)/arch/libretro/monitor/asm6502.c \
$(EMU)/arch/libretro/monitor/monitor.c \
$(EMU)/arch/libretro/monitor/monitor_network.c \
$(EMU)/arch/libretro/monitor/mon_util.c
$(RETRODEP)/info.c \
$(RETRODEP)/gfxoutputdrv/gfxoutput.c \
$(RETRODEP)/monitor/asm6502.c \
$(RETRODEP)/monitor/monitor.c \
$(RETRODEP)/monitor/monitor_network.c \
$(RETRODEP)/monitor/mon_util.c \
$(RETRODEP)/printerdrv/drv-1520.c \
$(RETRODEP)/printerdrv/drv-mps803.c \
$(RETRODEP)/printerdrv/drv-nl10.c \
$(RETRODEP)/samplerdrv/file_drv.c \
$(RETRODEP)/samplerdrv/sampler.c \
$(RETRODEP)/video/video-render-1x2.c \
$(RETRODEP)/video/video-render-2x2.c \
$(RETRODEP)/video/video-render-crt.c \
$(RETRODEP)/video/video-render-pal.c \

64
Makefile.xpet
View File

@ -3,14 +3,16 @@ COMMONFLAGS += -D__XPET__
INCFLAGS += \
-I$(EMU)/sid \
-I$(EMU) \
-I$(EMU)/arch/libretro \
-I$(EMU)/arch/shared \
-I$(EMU)/core \
-I$(EMU)/crtc \
-I$(EMU)/datasette \
-I$(EMU)/diag \
-I$(EMU)/drive \
-I$(EMU)/drive/iec \
-I$(EMU)/drive/ieee \
-I$(EMU)/drive/tcbm \
-I$(EMU)/fsdevice \
-I$(EMU)/imagecontents \
-I$(EMU)/joyport \
-I$(EMU)/lib/p64 \
@ -18,6 +20,7 @@ INCFLAGS += \
-I$(EMU)/pet \
-I$(EMU)/raster \
-I$(EMU)/resid \
-I$(EMU)/rs232drv \
-I$(EMU)/rtc \
-I$(EMU)/samplerdrv \
-I$(EMU)/socketdrv \
@ -57,10 +60,13 @@ SOURCES_C += \
$(EMU)/core/cs8900.c \
$(EMU)/core/flash040core.c \
$(EMU)/core/fmopl.c \
$(EMU)/core/i8255a.c \
$(EMU)/core/m93c86.c \
$(EMU)/core/mc6821core.c \
$(EMU)/core/riotcore.c \
$(EMU)/core/scsi.c \
$(EMU)/core/ser-eeprom.c \
$(EMU)/core/spi-flash.c \
$(EMU)/core/spi-sdcard.c \
$(EMU)/core/t6721.c \
$(EMU)/core/tpicore.c \
@ -73,7 +79,8 @@ SOURCES_C += \
$(EMU)/crtc/crtc-resources.c \
$(EMU)/crtc/crtc-snapshot.c \
$(EMU)/crtc/crtc.c \
$(EMU)/datasette.c \
$(EMU)/datasette/datasette.c \
$(EMU)/datasette/datasette-sound.c \
$(EMU)/debug.c \
$(EMU)/diskimage/diskimage.c \
$(EMU)/diskimage/fsimage-check.c \
@ -83,7 +90,6 @@ SOURCES_C += \
$(EMU)/diskimage/fsimage-p64.c \
$(EMU)/diskimage/fsimage-probe.c \
$(EMU)/diskimage/fsimage.c \
$(EMU)/diskimage/rawimage.c \
$(EMU)/diskimage/realimage.c \
$(EMU)/dma.c \
$(EMU)/drive/drive-check.c \
@ -102,6 +108,7 @@ SOURCES_C += \
$(EMU)/drive/drivesync.c \
$(EMU)/drive/iec/cia1571d.c \
$(EMU)/drive/iec/cia1581d.c \
$(EMU)/drive/iec/cmdhd.c \
$(EMU)/drive/iec/fdd.c \
$(EMU)/drive/iec/glue1571.c \
$(EMU)/drive/iec/iec-cmdline-options.c \
@ -141,6 +148,7 @@ SOURCES_C += \
$(EMU)/fliplist.c \
$(EMU)/fsdevice/fsdevice-close.c \
$(EMU)/fsdevice/fsdevice-cmdline-options.c \
$(EMU)/fsdevice/fsdevice-filename.c \
$(EMU)/fsdevice/fsdevice-flush.c \
$(EMU)/fsdevice/fsdevice-open.c \
$(EMU)/fsdevice/fsdevice-read.c \
@ -176,7 +184,6 @@ SOURCES_C += \
$(EMU)/keyboard.c \
$(EMU)/lib.c \
$(EMU)/lib/p64/p64.c \
$(EMU)/libm_math.c \
$(EMU)/log.c \
$(EMU)/machine-bus.c \
$(EMU)/machine.c \
@ -192,7 +199,6 @@ SOURCES_C += \
$(EMU)/pet/pet-cmdline-options.c \
$(EMU)/pet/pet-resources.c \
$(EMU)/pet/pet-sidcart.c \
$(EMU)/pet/pet-snapshot.c \
$(EMU)/pet/pet.c \
$(EMU)/pet/petacia1.c \
$(EMU)/pet/petbus.c \
@ -218,10 +224,7 @@ SOURCES_C += \
$(EMU)/pet/petvia.c \
$(EMU)/pet/petvideo.c \
$(EMU)/printerdrv/driver-select.c \
$(EMU)/printerdrv/drv-1520.c \
$(EMU)/printerdrv/drv-ascii.c \
$(EMU)/printerdrv/drv-mps803.c \
$(EMU)/printerdrv/drv-nl10.c \
$(EMU)/printerdrv/drv-raw.c \
$(EMU)/printerdrv/interface-serial.c \
$(EMU)/printerdrv/interface-userport.c \
@ -263,8 +266,6 @@ SOURCES_C += \
$(EMU)/rtc/rtc-58321a.c \
$(EMU)/rtc/rtc-72421.c \
$(EMU)/rtc/rtc.c \
$(EMU)/samplerdrv/file_drv.c \
$(EMU)/samplerdrv/sampler.c \
$(EMU)/screenshot.c \
$(EMU)/serial/fsdrive.c \
$(EMU)/serial/serial-device.c \
@ -288,7 +289,6 @@ SOURCES_C += \
$(EMU)/socket.c \
$(EMU)/socketdrv/socketdrv.c \
$(EMU)/sound.c \
$(EMU)/sounddrv/soundretro.c \
$(EMU)/sysfile.c \
$(EMU)/tape/t64.c \
$(EMU)/tape/tap.c \
@ -302,6 +302,7 @@ SOURCES_C += \
$(EMU)/tapeport/tapecart.c \
$(EMU)/tapeport/tapelog.c \
$(EMU)/tapeport/tapeport.c \
$(EMU)/tick.c \
$(EMU)/traps.c \
$(EMU)/userport/userport.c \
$(EMU)/userport/userport_4bit_sampler.c \
@ -322,26 +323,9 @@ SOURCES_C += \
$(EMU)/vdrive/vdrive.c \
$(EMU)/vicefeatures.c \
$(EMU)/video/render1x1.c \
$(EMU)/video/render1x1crt.c \
$(EMU)/video/render1x1ntsc.c \
$(EMU)/video/render1x1pal.c \
$(EMU)/video/render1x2.c \
$(EMU)/video/render1x2crt.c \
$(EMU)/video/render2x2.c \
$(EMU)/video/render2x2crt.c \
$(EMU)/video/render2x2ntsc.c \
$(EMU)/video/render2x2pal.c \
$(EMU)/video/render2x4.c \
$(EMU)/video/render2x4crt.c \
$(EMU)/video/renderscale2x.c \
$(EMU)/video/renderyuv.c \
$(EMU)/video/video-canvas.c \
$(EMU)/video/video-cmdline-options.c \
$(EMU)/video/video-color.c \
$(EMU)/video/video-render-1x2.c \
$(EMU)/video/video-render-2x2.c \
$(EMU)/video/video-render-crt.c \
$(EMU)/video/video-render-pal.c \
$(EMU)/video/video-render.c \
$(EMU)/video/video-resources.c \
$(EMU)/video/video-sound.c \
@ -352,10 +336,20 @@ SOURCES_C += \
# stubs
SOURCES_C += \
$(EMU)/arch/libretro/info.c \
$(EMU)/arch/libretro/gfxoutputdrv/gfxoutput.c \
$(EMU)/arch/libretro/monitor/asm6502.c \
$(EMU)/arch/libretro/monitor/asm6809.c \
$(EMU)/arch/libretro/monitor/monitor.c \
$(EMU)/arch/libretro/monitor/monitor_network.c \
$(EMU)/arch/libretro/monitor/mon_util.c
$(RETRODEP)/info.c \
$(RETRODEP)/gfxoutputdrv/gfxoutput.c \
$(RETRODEP)/monitor/asm6502.c \
$(RETRODEP)/monitor/asm6809.c \
$(RETRODEP)/monitor/monitor.c \
$(RETRODEP)/monitor/monitor_network.c \
$(RETRODEP)/monitor/mon_util.c \
$(RETRODEP)/printerdrv/drv-1520.c \
$(RETRODEP)/printerdrv/drv-mps803.c \
$(RETRODEP)/printerdrv/drv-nl10.c \
$(RETRODEP)/samplerdrv/file_drv.c \
$(RETRODEP)/samplerdrv/sampler.c \
$(RETRODEP)/video/video-render-1x2.c \
$(RETRODEP)/video/video-render-2x2.c \
$(RETRODEP)/video/video-render-crt.c \
$(RETRODEP)/video/video-render-pal.c \

63
Makefile.xplus4
View File

@ -3,15 +3,17 @@ COMMONFLAGS += -D__XPLUS4__
INCFLAGS += \
-I$(EMU)/sid \
-I$(EMU) \
-I$(EMU)/arch/libretro \
-I$(EMU)/arch/shared \
-I$(EMU)/c64 \
-I$(EMU)/c64/cart \
-I$(EMU)/core \
-I$(EMU)/datasette \
-I$(EMU)/diag \
-I$(EMU)/drive \
-I$(EMU)/drive/iec \
-I$(EMU)/drive/ieee \
-I$(EMU)/drive/tcbm \
-I$(EMU)/fsdevice \
-I$(EMU)/imagecontents \
-I$(EMU)/joyport \
-I$(EMU)/lib/p64 \
@ -19,6 +21,7 @@ INCFLAGS += \
-I$(EMU)/plus4 \
-I$(EMU)/raster \
-I$(EMU)/resid \
-I$(EMU)/rs232drv \
-I$(EMU)/rtc \
-I$(EMU)/samplerdrv \
-I$(EMU)/socketdrv \
@ -58,16 +61,20 @@ SOURCES_C += \
$(EMU)/core/cs8900.c \
$(EMU)/core/flash040core.c \
$(EMU)/core/fmopl.c \
$(EMU)/core/i8255a.c \
$(EMU)/core/m93c86.c \
$(EMU)/core/mc6821core.c \
$(EMU)/core/riotcore.c \
$(EMU)/core/scsi.c \
$(EMU)/core/ser-eeprom.c \
$(EMU)/core/spi-flash.c \
$(EMU)/core/spi-sdcard.c \
$(EMU)/core/t6721.c \
$(EMU)/core/tpicore.c \
$(EMU)/core/viacore.c \
$(EMU)/crc32.c \
$(EMU)/datasette.c \
$(EMU)/datasette/datasette.c \
$(EMU)/datasette/datasette-sound.c \
$(EMU)/debug.c \
$(EMU)/diag/c64_diag_586220_harness.c \
$(EMU)/diskimage/diskimage.c \
@ -78,7 +85,6 @@ SOURCES_C += \
$(EMU)/diskimage/fsimage-p64.c \
$(EMU)/diskimage/fsimage-probe.c \
$(EMU)/diskimage/fsimage.c \
$(EMU)/diskimage/rawimage.c \
$(EMU)/diskimage/realimage.c \
$(EMU)/dma.c \
$(EMU)/drive/drive-check.c \
@ -97,6 +103,7 @@ SOURCES_C += \
$(EMU)/drive/drivesync.c \
$(EMU)/drive/iec/cia1571d.c \
$(EMU)/drive/iec/cia1581d.c \
$(EMU)/drive/iec/cmdhd.c \
$(EMU)/drive/iec/fdd.c \
$(EMU)/drive/iec/glue1571.c \
$(EMU)/drive/iec/iec-cmdline-options.c \
@ -139,6 +146,7 @@ SOURCES_C += \
$(EMU)/fliplist.c \
$(EMU)/fsdevice/fsdevice-close.c \
$(EMU)/fsdevice/fsdevice-cmdline-options.c \
$(EMU)/fsdevice/fsdevice-filename.c \
$(EMU)/fsdevice/fsdevice-flush.c \
$(EMU)/fsdevice/fsdevice-open.c \
$(EMU)/fsdevice/fsdevice-read.c \
@ -177,7 +185,6 @@ SOURCES_C += \
$(EMU)/keyboard.c \
$(EMU)/lib.c \
$(EMU)/lib/p64/p64.c \
$(EMU)/libm_math.c \
$(EMU)/log.c \
$(EMU)/machine-bus.c \
$(EMU)/machine.c \
@ -193,7 +200,6 @@ SOURCES_C += \
$(EMU)/plus4/plus4-cmdline-options.c \
$(EMU)/plus4/plus4-resources.c \
$(EMU)/plus4/plus4-sidcart.c \
$(EMU)/plus4/plus4-snapshot.c \
$(EMU)/plus4/plus4.c \
$(EMU)/plus4/plus4acia.c \
$(EMU)/plus4/plus4bus.c \
@ -235,10 +241,7 @@ SOURCES_C += \
$(EMU)/plus4/ted-timing.c \
$(EMU)/plus4/ted.c \
$(EMU)/printerdrv/driver-select.c \
$(EMU)/printerdrv/drv-1520.c \
$(EMU)/printerdrv/drv-ascii.c \
$(EMU)/printerdrv/drv-mps803.c \
$(EMU)/printerdrv/drv-nl10.c \
$(EMU)/printerdrv/drv-raw.c \
$(EMU)/printerdrv/interface-serial.c \
$(EMU)/printerdrv/interface-userport.c \
@ -280,8 +283,6 @@ SOURCES_C += \
$(EMU)/rtc/rtc-58321a.c \
$(EMU)/rtc/rtc-72421.c \
$(EMU)/rtc/rtc.c \
$(EMU)/samplerdrv/file_drv.c \
$(EMU)/samplerdrv/sampler.c \
$(EMU)/screenshot.c \
$(EMU)/serial/fsdrive.c \
$(EMU)/serial/realdevice.c \
@ -306,7 +307,6 @@ SOURCES_C += \
$(EMU)/socket.c \
$(EMU)/socketdrv/socketdrv.c \
$(EMU)/sound.c \
$(EMU)/sounddrv/soundretro.c \
$(EMU)/sysfile.c \
$(EMU)/tape/t64.c \
$(EMU)/tape/tap.c \
@ -321,6 +321,7 @@ SOURCES_C += \
$(EMU)/tapeport/tapelog.c \
$(EMU)/tapeport/tapeport.c \
$(EMU)/tapeport/tape_diag_586220_harness.c \
$(EMU)/tick.c \
$(EMU)/traps.c \
$(EMU)/userport/userport.c \
$(EMU)/userport/userport_4bit_sampler.c \
@ -342,26 +343,9 @@ SOURCES_C += \
$(EMU)/vdrive/vdrive.c \
$(EMU)/vicefeatures.c \
$(EMU)/video/render1x1.c \
$(EMU)/video/render1x1crt.c \
$(EMU)/video/render1x1ntsc.c \
$(EMU)/video/render1x1pal.c \
$(EMU)/video/render1x2.c \
$(EMU)/video/render1x2crt.c \
$(EMU)/video/render2x2.c \
$(EMU)/video/render2x2crt.c \
$(EMU)/video/render2x2ntsc.c \
$(EMU)/video/render2x2pal.c \
$(EMU)/video/render2x4.c \
$(EMU)/video/render2x4crt.c \
$(EMU)/video/renderscale2x.c \
$(EMU)/video/renderyuv.c \
$(EMU)/video/video-canvas.c \
$(EMU)/video/video-cmdline-options.c \
$(EMU)/video/video-color.c \
$(EMU)/video/video-render-1x2.c \
$(EMU)/video/video-render-2x2.c \
$(EMU)/video/video-render-crt.c \
$(EMU)/video/video-render-pal.c \
$(EMU)/video/video-render.c \
$(EMU)/video/video-resources.c \
$(EMU)/video/video-sound.c \
@ -372,10 +356,19 @@ SOURCES_C += \
# stubs
SOURCES_C += \
$(EMU)/arch/libretro/info.c \
$(EMU)/arch/libretro/gfxoutputdrv/gfxoutput.c \
$(EMU)/arch/libretro/monitor/asm6502.c \
$(EMU)/arch/libretro/monitor/asmR65C02.c \
$(EMU)/arch/libretro/monitor/monitor.c \
$(EMU)/arch/libretro/monitor/monitor_network.c \
$(EMU)/arch/libretro/monitor/mon_util.c
$(RETRODEP)/info.c \
$(RETRODEP)/gfxoutputdrv/gfxoutput.c \
$(RETRODEP)/monitor/asm6502.c \
$(RETRODEP)/monitor/asmR65C02.c \
$(RETRODEP)/monitor/monitor.c \
$(RETRODEP)/monitor/monitor_network.c \
$(RETRODEP)/monitor/mon_util.c \
$(RETRODEP)/printerdrv/drv-1520.c \
$(RETRODEP)/printerdrv/drv-mps803.c \
$(RETRODEP)/printerdrv/drv-nl10.c \
$(RETRODEP)/samplerdrv/file_drv.c \
$(RETRODEP)/samplerdrv/sampler.c \
$(RETRODEP)/video/video-render-2x2.c \
$(RETRODEP)/video/video-render-crt.c \
$(RETRODEP)/video/video-render-pal.c \

157
Makefile.xscpu64
View File

@ -3,16 +3,18 @@ COMMONFLAGS += -D__XSCPU64__
INCFLAGS += \
-I$(EMU)/sid \
-I$(EMU) \
-I$(EMU)/arch/libretro \
-I$(EMU)/arch/shared \
-I$(EMU)/c64 \
-I$(EMU)/c64/cart \
-I$(EMU)/core \
-I$(EMU)/datasette \
-I$(EMU)/diag \
-I$(EMU)/drive \
-I$(EMU)/drive/iec \
-I$(EMU)/drive/iec/c64exp \
-I$(EMU)/drive/ieee \
-I$(EMU)/drive/tcbm \
-I$(EMU)/fsdevice \
-I$(EMU)/imagecontents \
-I$(EMU)/joyport \
-I$(EMU)/lib/p64 \
@ -21,6 +23,7 @@ INCFLAGS += \
-I$(EMU)/resid \
-I$(EMU)/residfp \
-I$(EMU)/residfp/builders/residfp-builder/residfp \
-I$(EMU)/rs232drv \
-I$(EMU)/rtc \
-I$(EMU)/samplerdrv \
-I$(EMU)/scpu64 \
@ -89,93 +92,7 @@ SOURCES_C += \
$(EMU)/c64/c64rsuser.c \
$(EMU)/c64/c64sound.c \
$(EMU)/c64/c64video.c \
$(EMU)/c64/c64_256k.c \
$(EMU)/c64/cart/actionreplay.c \
$(EMU)/c64/cart/actionreplay2.c \
$(EMU)/c64/cart/actionreplay3.c \
$(EMU)/c64/cart/actionreplay4.c \
$(EMU)/c64/cart/atomicpower.c \
$(EMU)/c64/cart/c64-generic.c \
$(EMU)/c64/cart/c64-midi.c \
$(EMU)/c64/cart/c64acia1.c \
$(EMU)/c64/cart/c64cart.c \
$(EMU)/c64/cart/c64carthooks.c \
$(EMU)/c64/cart/c64cartmem.c \
$(EMU)/c64/cart/c64tpi.c \
$(EMU)/c64/cart/capture.c \
$(EMU)/c64/cart/clockport-mp3at64.c \
$(EMU)/c64/cart/clockport-rrnet.c \
$(EMU)/c64/cart/clockport.c \
$(EMU)/c64/cart/comal80.c \
$(EMU)/c64/cart/crt.c \
$(EMU)/c64/cart/cs8900io.c \
$(EMU)/c64/cart/daa.c \
$(EMU)/c64/cart/debugcart.c \
$(EMU)/c64/cart/delaep7x8.c \
$(EMU)/c64/cart/delaep64.c \
$(EMU)/c64/cart/delaep256.c \
$(EMU)/c64/cart/diashowmaker.c \
$(EMU)/c64/cart/digimax.c \
$(EMU)/c64/cart/dinamic.c \
$(EMU)/c64/cart/dqbb.c \
$(EMU)/c64/cart/ds12c887rtc.c \
$(EMU)/c64/cart/easycalc.c \
$(EMU)/c64/cart/easyflash.c \
$(EMU)/c64/cart/epyxfastload.c \
$(EMU)/c64/cart/ethernetcart.c \
$(EMU)/c64/cart/exos.c \
$(EMU)/c64/cart/expert.c \
$(EMU)/c64/cart/final.c \
$(EMU)/c64/cart/final3.c \
$(EMU)/c64/cart/finalplus.c \
$(EMU)/c64/cart/formel64.c \
$(EMU)/c64/cart/freezeframe.c \
$(EMU)/c64/cart/freezemachine.c \
$(EMU)/c64/cart/funplay.c \
$(EMU)/c64/cart/gamekiller.c \
$(EMU)/c64/cart/georam.c \
$(EMU)/c64/cart/gmod2.c \
$(EMU)/c64/cart/gs.c \
$(EMU)/c64/cart/ide64.c \
$(EMU)/c64/cart/isepic.c \
$(EMU)/c64/cart/kcs.c \
$(EMU)/c64/cart/kingsoft.c \
$(EMU)/c64/cart/mach5.c \
$(EMU)/c64/cart/magicdesk.c \
$(EMU)/c64/cart/magicformel.c \
$(EMU)/c64/cart/magicvoice.c \
$(EMU)/c64/cart/mikroass.c \
$(EMU)/c64/cart/mmc64.c \
$(EMU)/c64/cart/mmcreplay.c \
$(EMU)/c64/cart/ocean.c \
$(EMU)/c64/cart/pagefox.c \
$(EMU)/c64/cart/prophet64.c \
$(EMU)/c64/cart/ramcart.c \
$(EMU)/c64/cart/retroreplay.c \
$(EMU)/c64/cart/reu.c \
$(EMU)/c64/cart/rexep256.c \
$(EMU)/c64/cart/rexutility.c \
$(EMU)/c64/cart/rgcd.c \
$(EMU)/c64/cart/ross.c \
$(EMU)/c64/cart/rrnetmk3.c \
$(EMU)/c64/cart/sfx_soundexpander.c \
$(EMU)/c64/cart/sfx_soundsampler.c \
$(EMU)/c64/cart/shortbus.c \
$(EMU)/c64/cart/shortbus_digimax.c \
$(EMU)/c64/cart/shortbus_etfe.c \
$(EMU)/c64/cart/silverrock128.c \
$(EMU)/c64/cart/simonsbasic.c \
$(EMU)/c64/cart/snapshot64.c \
$(EMU)/c64/cart/stardos.c \
$(EMU)/c64/cart/stb.c \
$(EMU)/c64/cart/superexplode5.c \
$(EMU)/c64/cart/supergames.c \
$(EMU)/c64/cart/supersnapshot.c \
$(EMU)/c64/cart/supersnapshot4.c \
$(EMU)/c64/cart/warpspeed.c \
$(EMU)/c64/cart/westermann.c \
$(EMU)/c64/cart/zaxxon.c \
$(EMU)/c64/plus256k.c \
$(SOURCES_C_C64_CART) \
$(EMU)/c64/reloc65.c \
$(EMU)/cbmdos.c \
$(EMU)/cbmimage.c \
@ -190,16 +107,20 @@ SOURCES_C += \
$(EMU)/core/cs8900.c \
$(EMU)/core/flash040core.c \
$(EMU)/core/fmopl.c \
$(EMU)/core/i8255a.c \
$(EMU)/core/m93c86.c \
$(EMU)/core/mc6821core.c \
$(EMU)/core/riotcore.c \
$(EMU)/core/scsi.c \
$(EMU)/core/ser-eeprom.c \
$(EMU)/core/spi-flash.c \
$(EMU)/core/spi-sdcard.c \
$(EMU)/core/t6721.c \
$(EMU)/core/tpicore.c \
$(EMU)/core/viacore.c \
$(EMU)/crc32.c \
$(EMU)/datasette.c \
$(EMU)/datasette/datasette.c \
$(EMU)/datasette/datasette-sound.c \
$(EMU)/debug.c \
$(EMU)/diskimage/diskimage.c \
$(EMU)/diskimage/fsimage-check.c \
@ -209,7 +130,6 @@ SOURCES_C += \
$(EMU)/diskimage/fsimage-p64.c \
$(EMU)/diskimage/fsimage-probe.c \
$(EMU)/diskimage/fsimage.c \
$(EMU)/diskimage/rawimage.c \
$(EMU)/diskimage/realimage.c \
$(EMU)/dma.c \
$(EMU)/drive/drive-check.c \
@ -235,6 +155,7 @@ SOURCES_C += \
$(EMU)/drive/iec/c64exp/stardos-exp.c \
$(EMU)/drive/iec/cia1571d.c \
$(EMU)/drive/iec/cia1581d.c \
$(EMU)/drive/iec/cmdhd.c \
$(EMU)/drive/iec/fdd.c \
$(EMU)/drive/iec/glue1571.c \
$(EMU)/drive/iec/iec-cmdline-options.c \
@ -274,6 +195,7 @@ SOURCES_C += \
$(EMU)/fliplist.c \
$(EMU)/fsdevice/fsdevice-close.c \
$(EMU)/fsdevice/fsdevice-cmdline-options.c \
$(EMU)/fsdevice/fsdevice-filename.c \
$(EMU)/fsdevice/fsdevice-flush.c \
$(EMU)/fsdevice/fsdevice-open.c \
$(EMU)/fsdevice/fsdevice-read.c \
@ -312,7 +234,6 @@ SOURCES_C += \
$(EMU)/keyboard.c \
$(EMU)/lib.c \
$(EMU)/lib/p64/p64.c \
$(EMU)/libm_math.c \
$(EMU)/log.c \
$(EMU)/machine-bus.c \
$(EMU)/machine.c \
@ -324,10 +245,7 @@ SOURCES_C += \
$(EMU)/parallel/parallel-trap.c \
$(EMU)/parallel/parallel.c \
$(EMU)/printerdrv/driver-select.c \
$(EMU)/printerdrv/drv-1520.c \
$(EMU)/printerdrv/drv-ascii.c \
$(EMU)/printerdrv/drv-mps803.c \
$(EMU)/printerdrv/drv-nl10.c \
$(EMU)/printerdrv/drv-raw.c \
$(EMU)/printerdrv/interface-serial.c \
$(EMU)/printerdrv/interface-userport.c \
@ -369,8 +287,6 @@ SOURCES_C += \
$(EMU)/rtc/rtc-58321a.c \
$(EMU)/rtc/rtc-72421.c \
$(EMU)/rtc/rtc.c \
$(EMU)/samplerdrv/file_drv.c \
$(EMU)/samplerdrv/sampler.c \
$(EMU)/scpu64/scpu64.c \
$(EMU)/scpu64/scpu64-cmdline-options.c \
$(EMU)/scpu64/scpu64cpu.c \
@ -381,7 +297,6 @@ SOURCES_C += \
$(EMU)/scpu64/scpu64model.c \
$(EMU)/scpu64/scpu64-resources.c \
$(EMU)/scpu64/scpu64rom.c \
$(EMU)/scpu64/scpu64-snapshot.c \
$(EMU)/scpu64/scpu64stubs.c \
$(EMU)/screenshot.c \
$(EMU)/serial/fsdrive.c \
@ -407,12 +322,12 @@ SOURCES_C += \
$(EMU)/socket.c \
$(EMU)/socketdrv/socketdrv.c \
$(EMU)/sound.c \
$(EMU)/sounddrv/soundretro.c \
$(EMU)/sysfile.c \
$(EMU)/tape/t64.c \
$(EMU)/tapeport/cp-clockf83.c \
$(EMU)/tapeport/dtl-basic-dongle.c \
$(EMU)/tapeport/sense-dongle.c \
$(EMU)/tick.c \
$(EMU)/traps.c \
$(EMU)/userport/userport.c \
$(EMU)/userport/userport_4bit_sampler.c \
@ -448,26 +363,9 @@ SOURCES_C += \
$(EMU)/viciisc/vicii-timing.c \
$(EMU)/viciisc/vicii.c \
$(EMU)/video/render1x1.c \
$(EMU)/video/render1x1crt.c \
$(EMU)/video/render1x1ntsc.c \
$(EMU)/video/render1x1pal.c \
$(EMU)/video/render1x2.c \
$(EMU)/video/render1x2crt.c \
$(EMU)/video/render2x2.c \
$(EMU)/video/render2x2crt.c \
$(EMU)/video/render2x2ntsc.c \
$(EMU)/video/render2x2pal.c \
$(EMU)/video/render2x4.c \
$(EMU)/video/render2x4crt.c \
$(EMU)/video/renderscale2x.c \
$(EMU)/video/renderyuv.c \
$(EMU)/video/video-canvas.c \
$(EMU)/video/video-cmdline-options.c \
$(EMU)/video/video-color.c \
$(EMU)/video/video-render-1x2.c \
$(EMU)/video/video-render-2x2.c \
$(EMU)/video/video-render-crt.c \
$(EMU)/video/video-render-pal.c \
$(EMU)/video/video-render.c \
$(EMU)/video/video-resources.c \
$(EMU)/video/video-sound.c \
@ -478,13 +376,22 @@ SOURCES_C += \
# stubs
SOURCES_C += \
$(EMU)/arch/libretro/info.c \
$(EMU)/arch/libretro/cart/cpmcart.c \
$(EMU)/arch/libretro/gfxoutputdrv/gfxoutput.c \
$(EMU)/arch/libretro/monitor/asm6502.c \
$(EMU)/arch/libretro/monitor/asm65816.c \
$(EMU)/arch/libretro/monitor/asmR65C02.c \
$(EMU)/arch/libretro/monitor/asmz80.c \
$(EMU)/arch/libretro/monitor/monitor.c \
$(EMU)/arch/libretro/monitor/monitor_network.c \
$(EMU)/arch/libretro/monitor/mon_util.c
$(RETRODEP)/info.c \
$(RETRODEP)/cart/cpmcart.c \
$(RETRODEP)/gfxoutputdrv/gfxoutput.c \
$(RETRODEP)/monitor/asm6502.c \
$(RETRODEP)/monitor/asm65816.c \
$(RETRODEP)/monitor/asmR65C02.c \
$(RETRODEP)/monitor/asmz80.c \
$(RETRODEP)/monitor/monitor.c \
$(RETRODEP)/monitor/monitor_network.c \
$(RETRODEP)/monitor/mon_util.c \
$(RETRODEP)/printerdrv/drv-1520.c \
$(RETRODEP)/printerdrv/drv-mps803.c \
$(RETRODEP)/printerdrv/drv-nl10.c \
$(RETRODEP)/samplerdrv/file_drv.c \
$(RETRODEP)/samplerdrv/sampler.c \
$(RETRODEP)/video/video-render-2x2.c \
$(RETRODEP)/video/video-render-crt.c \
$(RETRODEP)/video/video-render-pal.c \

63
Makefile.xvic
View File

@ -3,21 +3,24 @@ COMMONFLAGS += -D__XVIC__
INCFLAGS += \
-I$(EMU)/sid \
-I$(EMU) \
-I$(EMU)/arch/libretro \
-I$(EMU)/arch/shared \
-I$(EMU)/c64 \
-I$(EMU)/c64/cart \
-I$(EMU)/core \
-I$(EMU)/datasette \
-I$(EMU)/diag \
-I$(EMU)/drive \
-I$(EMU)/drive/iec \
-I$(EMU)/drive/ieee \
-I$(EMU)/drive/tcbm \
-I$(EMU)/fsdevice \
-I$(EMU)/imagecontents \
-I$(EMU)/joyport \
-I$(EMU)/lib/p64 \
-I$(EMU)/monitor \
-I$(EMU)/raster \
-I$(EMU)/resid \
-I$(EMU)/rs232drv \
-I$(EMU)/rtc \
-I$(EMU)/samplerdrv \
-I$(EMU)/socketdrv \
@ -65,16 +68,20 @@ SOURCES_C += \
$(EMU)/core/cs8900.c \
$(EMU)/core/flash040core.c \
$(EMU)/core/fmopl.c \
$(EMU)/core/i8255a.c \
$(EMU)/core/m93c86.c \
$(EMU)/core/mc6821core.c \
$(EMU)/core/riotcore.c \
$(EMU)/core/scsi.c \
$(EMU)/core/ser-eeprom.c \
$(EMU)/core/spi-flash.c \
$(EMU)/core/spi-sdcard.c \
$(EMU)/core/t6721.c \
$(EMU)/core/tpicore.c \
$(EMU)/core/viacore.c \
$(EMU)/crc32.c \
$(EMU)/datasette.c \
$(EMU)/datasette/datasette.c \
$(EMU)/datasette/datasette-sound.c \
$(EMU)/debug.c \
$(EMU)/diag/c64_diag_586220_harness.c \
$(EMU)/diskimage/diskimage.c \
@ -85,7 +92,6 @@ SOURCES_C += \
$(EMU)/diskimage/fsimage-p64.c \
$(EMU)/diskimage/fsimage-probe.c \
$(EMU)/diskimage/fsimage.c \
$(EMU)/diskimage/rawimage.c \
$(EMU)/diskimage/realimage.c \
$(EMU)/dma.c \
$(EMU)/drive/drive-check.c \
@ -104,6 +110,7 @@ SOURCES_C += \
$(EMU)/drive/drivesync.c \
$(EMU)/drive/iec/cia1571d.c \
$(EMU)/drive/iec/cia1581d.c \
$(EMU)/drive/iec/cmdhd.c \
$(EMU)/drive/iec/fdd.c \
$(EMU)/drive/iec/glue1571.c \
$(EMU)/drive/iec/iec-cmdline-options.c \
@ -143,6 +150,7 @@ SOURCES_C += \
$(EMU)/fliplist.c \
$(EMU)/fsdevice/fsdevice-close.c \
$(EMU)/fsdevice/fsdevice-cmdline-options.c \
$(EMU)/fsdevice/fsdevice-filename.c \
$(EMU)/fsdevice/fsdevice-flush.c \
$(EMU)/fsdevice/fsdevice-open.c \
$(EMU)/fsdevice/fsdevice-read.c \
@ -178,7 +186,6 @@ SOURCES_C += \
$(EMU)/keyboard.c \
$(EMU)/lib.c \
$(EMU)/lib/p64/p64.c \
$(EMU)/libm_math.c \
$(EMU)/log.c \
$(EMU)/machine-bus.c \
$(EMU)/machine.c \
@ -190,10 +197,7 @@ SOURCES_C += \
$(EMU)/parallel/parallel-trap.c \
$(EMU)/parallel/parallel.c \
$(EMU)/printerdrv/driver-select.c \
$(EMU)/printerdrv/drv-1520.c \
$(EMU)/printerdrv/drv-ascii.c \
$(EMU)/printerdrv/drv-mps803.c \
$(EMU)/printerdrv/drv-nl10.c \
$(EMU)/printerdrv/drv-raw.c \
$(EMU)/printerdrv/interface-serial.c \
$(EMU)/printerdrv/interface-userport.c \
@ -235,8 +239,6 @@ SOURCES_C += \
$(EMU)/rtc/rtc-58321a.c \
$(EMU)/rtc/rtc-72421.c \
$(EMU)/rtc/rtc.c \
$(EMU)/samplerdrv/file_drv.c \
$(EMU)/samplerdrv/sampler.c \
$(EMU)/screenshot.c \
$(EMU)/serial/fsdrive.c \
$(EMU)/serial/realdevice.c \
@ -261,7 +263,6 @@ SOURCES_C += \
$(EMU)/socket.c \
$(EMU)/socketdrv/socketdrv.c \
$(EMU)/sound.c \
$(EMU)/sounddrv/soundretro.c \
$(EMU)/sysfile.c \
$(EMU)/tape/t64.c \
$(EMU)/tape/tap.c \
@ -276,6 +277,7 @@ SOURCES_C += \
$(EMU)/tapeport/tapecart.c \
$(EMU)/tapeport/tapelog.c \
$(EMU)/tapeport/tapeport.c \
$(EMU)/tick.c \
$(EMU)/traps.c \
$(EMU)/userport/userport_4bit_sampler.c \
$(EMU)/userport/userport_8bss.c \
@ -320,7 +322,6 @@ SOURCES_C += \
$(EMU)/vic20/vic.c \
$(EMU)/vic20/vic20-cmdline-options.c \
$(EMU)/vic20/vic20-resources.c \
$(EMU)/vic20/vic20-snapshot.c \
$(EMU)/vic20/vic20.c \
$(EMU)/vic20/vic20bus.c \
$(EMU)/vic20/vic20cpu.c \
@ -346,26 +347,9 @@ SOURCES_C += \
$(EMU)/vic20/vic20video.c \
$(EMU)/vicefeatures.c \
$(EMU)/video/render1x1.c \
$(EMU)/video/render1x1crt.c \
$(EMU)/video/render1x1ntsc.c \
$(EMU)/video/render1x1pal.c \
$(EMU)/video/render1x2.c \
$(EMU)/video/render1x2crt.c \
$(EMU)/video/render2x2.c \
$(EMU)/video/render2x2crt.c \
$(EMU)/video/render2x2ntsc.c \
$(EMU)/video/render2x2pal.c \
$(EMU)/video/render2x4.c \
$(EMU)/video/render2x4crt.c \
$(EMU)/video/renderscale2x.c \
$(EMU)/video/renderyuv.c \
$(EMU)/video/video-canvas.c \
$(EMU)/video/video-cmdline-options.c \
$(EMU)/video/video-color.c \
$(EMU)/video/video-render-1x2.c \
$(EMU)/video/video-render-2x2.c \
$(EMU)/video/video-render-crt.c \
$(EMU)/video/video-render-pal.c \
$(EMU)/video/video-render.c \
$(EMU)/video/video-resources.c \
$(EMU)/video/video-sound.c \
@ -376,10 +360,19 @@ SOURCES_C += \
# stubs
SOURCES_C += \
$(EMU)/arch/libretro/info.c \
$(EMU)/arch/libretro/gfxoutputdrv/gfxoutput.c \
$(EMU)/arch/libretro/monitor/asm6502.c \
$(EMU)/arch/libretro/monitor/asmR65C02.c \
$(EMU)/arch/libretro/monitor/monitor.c \
$(EMU)/arch/libretro/monitor/monitor_network.c \
$(EMU)/arch/libretro/monitor/mon_util.c
$(RETRODEP)/info.c \
$(RETRODEP)/gfxoutputdrv/gfxoutput.c \
$(RETRODEP)/monitor/asm6502.c \
$(RETRODEP)/monitor/asmR65C02.c \
$(RETRODEP)/monitor/monitor.c \
$(RETRODEP)/monitor/monitor_network.c \
$(RETRODEP)/monitor/mon_util.c \
$(RETRODEP)/printerdrv/drv-1520.c \
$(RETRODEP)/printerdrv/drv-mps803.c \
$(RETRODEP)/printerdrv/drv-nl10.c \
$(RETRODEP)/samplerdrv/file_drv.c \
$(RETRODEP)/samplerdrv/sampler.c \
$(RETRODEP)/video/video-render-2x2.c \
$(RETRODEP)/video/video-render-crt.c \
$(RETRODEP)/video/video-render-pal.c \

160
README.md
View File

@ -2,9 +2,9 @@
# VICE LIBRETRO
Port of VICE, the Versatile Commodore Emulator 3.3
Port of VICE, the Versatile Commodore Emulator 3.5
Source base: [https://sourceforge.net/projects/vice-emu/files/releases/vice-3.3.tar.gz](https://sourceforge.net/projects/vice-emu/files/releases/vice-3.3.tar.gz)
Source base: [https://sourceforge.net/projects/vice-emu/files/releases/vice-3.5.tar.gz](https://sourceforge.net/projects/vice-emu/files/releases/vice-3.5.tar.gz)
Supported platforms: Linux, Windows, Apple, Android, emscripten, Switch, Vita
@ -198,6 +198,7 @@ Remember to run `make clean EMUTYPE=x` when building different EMUTYPEs.
Currently working EMUTYPEs:
- `x64`
- `x64dtv`
- `x64sc`
- `x128`
- `xcbm2`
@ -242,11 +243,10 @@ cd jni
ndk-build
```
## Original readme
## VICE readme
----------------------------------------------------------------------------
VICE 3.3 Dec 2018
VICE 3.5 Dec 2020
_______________
@ -265,26 +265,19 @@ ndk-build
----------------------------------------------------------------------------
This release stabilizes and introduces the GTK3 UI as the primary user
interface for all major ports. For "lesser" platforms we still have the SDL
based interface. All other user interfaces have been removed. RIP
We are still looking for dedicated maintainers for the Windows- and macOS
ports, if you want to help improving these and/or want to provide binaries,
We are still looking for dedicated maintainers for the Windows port, if you
want to help improving these and/or want to provide binaries,
please get in touch.
----------------------------------------------------------------------------
This is version 3.3 of VICE, the multi-platform C64, C128, VIC20,
This is version 3.5 of VICE, the multi-platform C64, C128, VIC20,
PET, PLUS4 and CBM-II emulator. This version can be compiled for
MSDOS, Win32, OS/2, BeOS, QNX 4.x, QNX 6.x, AmigaOS, Dingoo,
Syllable, SkyOS and for most Unix systems provided with
the X Window System version 11, R5 or later.
Win32, macOS, Haiku and for most Unix systems provided with the X Window
System version 11, R5 or later.
The following programs are included:
- x64, a C64 emulator;
- x64sc, a C64 emulator focused on accuracy;
- xscpu64, a C64 emulator with a SuperCPU cart;
@ -311,41 +304,32 @@ ndk-build
- cartconv, a C64/C128 cartridge conversion program.
- x64, the old and less accurate C64 emulator, is no more built by default
and only included if explicitly enabled at configure time;
Moreover, the following documents are provided in both source and
binary distributions:
- README, this file;
- COPYING, the GNU General Public License under which VICE is
distributed -- *please read it before using the program*;
- INSTALL, installation instructions;
- NEWS, list of user-visible changes between this and older versions of VICE;
- FEEDBACK, something you should read before reporting bugs or sending mail
to any of the authors;
- COPYING, the GNU General Public License under which VICE is
distributed -- *please read it before using the program*;
The following documents are provided in the source distribution:
- in the doc directory:
- vice.texi, the complete documentation; documentation in various different
formats may be generated from it (vice.txt, vice.pdf, vice.chm, vice.hlp,
vice.guide, vice.inf, vice.info)
formats may be generated from it (vice.txt, vice.pdf)
- iec-bus.txt, overview of the VICE IEC bus emulation;
- CIA-README.txt, overview of the VICE CIA emulation;
- coding-guidelines.txt, description of VICE coding style
- Documentation-Howto.txt, information on how to edit the documentation
- Doxygen-Howto.txt, how to generate doxygen documentation
- Release-Howto.txt, some hints and reminders on how to create a release
tarball (for maintainers)
- ffmpeg-support.txt, this document details the results of test compiles
with regards to the included ffmpeg library.
- SDL-support.txt, this document details the results of test compiles with
regards to the SDL 1 and SDL 2 support.
- hardware-sids.txt, this document details the hardware SIDs and how they
are supported on the various platforms.
tarball (for maintainers) are supported on the various platforms.
- in the doc/readmes directory:
@ -355,13 +339,23 @@ ndk-build
- in the doc/building directory:
- Windows-MinGW-GTK3-Howto.txt, how to compile the Windows port using MingGW/MSYS2
- Linux-GTK3-Howto.txt, how to compile the GTK3 port on Linux
- GTK3-macOS.txt, how to compile the Mac OSX port with GTK3 UI
- SDL-Howto.txt, how to compile the SDL port on various platforms
- Android-Howto, how to compile the Android SDL port
- FreeBSD-GTK3-Howto.txt, hints on compiling the GTK3 port on FreeBSD
- GTK3-cross-build-setup.md, (incomplete) instructions on how to set up
a windows crosscompiler on linux
- GTK3-debian-frankenvice.md, instructions on how to set up a windows
crosscompiler on debian using precompiled fedora mingw packages
- GTK3-Fedora-cross-build-setup.md, (incomplete) instructions on how to
set up a windows crosscompiler on Fedora linux
- Linux-GTK3-Howto.txt, how to compile the GTK3 port on Linux
- macOS-Distribution-Howto.txt, how to build the macOS binary distribution
- macOS-Howto.txt, how to build on macOS (might be deprecated)
- macOS-Xcode-Howto.txt, how to build the macOS port(s) using Xcode
- NetBSD-Gtk3-Wowto.txt, hints on compiling for NetBSD with Gtk3
- NetBSD-howto.txt, hints on compiling for NetBSD
- SDL-Howto.txt, how to compile the SDL port on various platforms
- Windows-MinGW-GTK3-Howto.txt, how to compile the Windows port using
MingGW/MSYS2
For the latest news, have a look at the VICE home page:
@ -376,39 +370,97 @@ ndk-build
- The list of known BUGS,
http://vice-emu.sourceforge.net/wiki/index.php/Todo#Known_Issues
New versions are made available quite often, so please stay tuned.
New versions are made available usually once per year, so please stay tuned.
You may also check out the automatic nightly builds, which are kindly provided
by the pokefinder crew: https://vice.pokefinder.org/
Have fun!
Feedback
--------
It's always nice to receive feedback and/or bugreports about VICE, but please
read these few notes before sending mail to anybody in the team.
- Please don't send any HTML mail (we really hate that!). Please make sure
you turn off the "rich text" (HTML) feature.
- Please don't send any binaries without asking first.
- Please read the following documents carefully before reporting a bug or a
problem you cannot solve:
- the VICE documentation (you should have received it with the main
distribution--if not, tell us);
Online version - http://vice-emu.sourceforge.net/vice_toc.html
- the VICE wiki at http://vice-emu.pokefinder.org/
- Before reporting a bug, please try a recent nightly build and check if your
issue is already fixed. You can fine nightly builds for windows here:
<SF-uploads via Travis-CI?>
- When you report a bug, please try to be as accurate as possible and describe
how it can be reproduced to the very detail. You should also tell us what
machine you are running on, what operating system you are using as well as
the version of Vice.
- Please don't ask us how to transfer original C64 disk or tapes to your PC. To
transfer disks, you can use the Star Commander (http://sta.c64.org/sc.html).
- Please don't ask us where to find games for the emulator on the Internet.
- Please don't ask us when the next version will be out, because we really
don't know. We are trying to make at least one release per year, around
christmas.
- Please write in English.
In any case, we would be really glad to receive your comments about VICE.
The central place for bug reports is the bug tracker at sourceforge:
https://sourceforge.net/p/vice-emu/bugs/
At sourceforge you can also submit feature requests:
https://sourceforge.net/p/vice-emu/feature-requests/
The email address for feedback is: vice-emu-mail@lists.sourceforge.net
Thanks!
Copyright notice
----------------
VICE, the Versatile Commodore Emulator
Core Team Members:
2005-2018 Marco van den Heuvel
2007-2018 Fabrizio Gennari
2009-2018 Groepaz
2010-2018 Olaf Seibert
2011-2018 Marcus Sutton
2011-2018 Kajtar Zsolt
2016-2018 AreaScout
2016-2018 Bas Wassink
2017-2018 Michael C. Martin
1999-2020 Martin Pottendorfer
2005-2020 Marco van den Heuvel
2007-2020 Fabrizio Gennari
2009-2020 Groepaz
2009-2020 Errol Smith
2009-2020 Ingo Korb
2010-2020 Olaf Seibert
2011-2020 Marcus Sutton
2011-2020 Kajtar Zsolt
2016-2020 AreaScout
2016-2020 Bas Wassink
2017-2020 Michael C. Martin
2018-2020 Christopher Phillips
2019-2020 David Hogan
Inactive/Ex Team Members:
1999-2017 Martin Pottendorfer
2011-2016 Stefan Haubenthal
2015-2016 BSzili
1999-2016 Andreas Matthies
2007-2015 Daniel Kahlin
2009-2015 Errol Smith
2012-2014 Benjamin 'BeRo' Rosseaux
2011-2014 Ulrich Schulz
2011-2014 Thomas Giesel
2009-2014 Ingo Korb
2008-2014 Antti S. Lankila
2006-2014 Christian Vogelgsang
1998-2014 Dag Lem
@ -458,16 +510,16 @@ ndk-build
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
02111-1307 USA
The ROM files in the `C128`, `C64`, `CBM-II`, `DRIVES`, `PET`, `PLUS4`
`PRINTER` and `VIC20` directories are Copyright C by Commodore
The ROM files in the 'C128', 'C64', 'CBM-II', 'DRIVES', 'PET', 'PLUS4'
'PRINTER' and 'VIC20' directories are Copyright C by Commodore
Business Machines.
The ROM files in the `C64DTV` directory are Copyright C by Commodore
The ROM files in the 'C64DTV' directory are Copyright C by Commodore
Business Machines, as well as Mammoth Toys, a division of nsi ltd.,
Digital Concepts DC studios inc., Ironstone Partners ltd., and
Toy:Lobster company ltd.
### NIBTOOLS
## NIBTOOLS
(C) 2005 Pete Rittwage and the C64 Preservation Project team

13
include/config.h
View File

@ -1,6 +1,7 @@
#include <retro_endianness.h>
#define USE_EMBEDDED 1
#ifdef __WIN32__
#define HAVE_HTONS 1
#define HAVE_HTONL 1
@ -16,7 +17,6 @@
#endif
*/
#define AC_APPLE_UNIVERSAL_BUILD
#define HAVE_TIME_T_IN_TIME_H 1
#endif
@ -38,13 +38,8 @@
#undef HAVE_NETWORK
#define USE_EMBEDDED 1
#define HAVE_U_SHORT 1
/* Dingoo has atexit */
#define HAVE_ATEXIT 1
/* Define to 1 if you have the declaration of `sys_siglist', and to 0 if you don't. */
#define HAVE_DECL_SYS_SIGLIST 0
@ -85,6 +80,9 @@
/* Enable 1351 mouse support */
#define HAVE_MOUSE 1
/* FastSID */
#define HAVE_FASTSID
/* This version provides ReSID support. */
#define HAVE_RESID
@ -158,4 +156,3 @@
/* Define to 1 if `lex' declares `yytext' as a `char *' by default, not a `char[]'. */
#define YYTEXT_POINTER 1

2050
include/embedded/drivedos9000.h Normal file
View File

File diff suppressed because it is too large Load Diff

260
include/embedded/viciidtv_spiff_vpl.h
View File

@ -1,260 +0,0 @@
/* Autogenerated file, do not edit */
unsigned char viciidtv_spiff_vpl[] = {
0x02, 0x05, 0x0a, 0x0,
0x0c, 0x10, 0x13, 0x0,
0x1d, 0x1c, 0x1e, 0x0,
0x24, 0x2b, 0x2b, 0x0,
0x36, 0x35, 0x34, 0x0,
0x3f, 0x44, 0x43, 0x0,
0x52, 0x4f, 0x50, 0x0,
0x5b, 0x5e, 0x5e, 0x0,
0x67, 0x66, 0x68, 0x0,
0x72, 0x74, 0x72, 0x0,
0x82, 0x80, 0x83, 0x0,
0x8b, 0x8f, 0x8f, 0x0,
0x9d, 0x99, 0x9a, 0x0,
0xa7, 0xa7, 0xa9, 0x0,
0xb5, 0xb4, 0xb2, 0x0,
0xc1, 0xc4, 0xc2, 0x0,
0x23, 0x02, 0x00, 0x0,
0x2d, 0x0d, 0x00, 0x0,
0x3a, 0x1b, 0x00, 0x0,
0x44, 0x2b, 0x00, 0x0,
0x50, 0x36, 0x00, 0x0,
0x5c, 0x44, 0x00, 0x0,
0x6d, 0x50, 0x00, 0x0,
0x78, 0x5e, 0x00, 0x0,
0x82, 0x66, 0x04, 0x0,
0x8d, 0x75, 0x15, 0x0,
0x9d, 0x81, 0x23, 0x0,
0xa7, 0x8e, 0x33, 0x0,
0xb6, 0x9a, 0x3f, 0x0,
0xc2, 0xa8, 0x4d, 0x0,
0xd2, 0xb4, 0x5b, 0x0,
0xdf, 0xc4, 0x68, 0x0,
0x34, 0x00, 0x00, 0x0,
0x3f, 0x08, 0x00, 0x0,
0x4c, 0x10, 0x00, 0x0,
0x55, 0x22, 0x00, 0x0,
0x63, 0x2e, 0x00, 0x0,
0x6c, 0x3d, 0x00, 0x0,
0x7f, 0x48, 0x0e, 0x0,
0x8b, 0x55, 0x1b, 0x0,
0x96, 0x5d, 0x27, 0x0,
0xa2, 0x6b, 0x31, 0x0,
0xaf, 0x78, 0x3b, 0x0,
0xb9, 0x86, 0x4a, 0x0,
0xc9, 0x90, 0x55, 0x0,
0xd4, 0x9e, 0x64, 0x0,
0xe5, 0xab, 0x71, 0x0,
0xf3, 0xbc, 0x81, 0x0,
0x3e, 0x00, 0x00, 0x0,
0x4b, 0x00, 0x00, 0x0,
0x56, 0x00, 0x00, 0x0,
0x60, 0x1a, 0x06, 0x0,
0x6e, 0x26, 0x15, 0x0,
0x79, 0x34, 0x24, 0x0,
0x8b, 0x3f, 0x2f, 0x0,
0x98, 0x4d, 0x3e, 0x0,
0xa3, 0x55, 0x46, 0x0,
0xae, 0x63, 0x4f, 0x0,
0xbc, 0x6f, 0x5f, 0x0,
0xc7, 0x7e, 0x6a, 0x0,
0xd4, 0x88, 0x79, 0x0,
0xe2, 0x97, 0x84, 0x0,
0xf4, 0xa3, 0x93, 0x0,
0xff, 0xb2, 0xa6, 0x0,
0x40, 0x00, 0x0c, 0x0,
0x4e, 0x00, 0x16, 0x0,
0x59, 0x00, 0x24, 0x0,
0x65, 0x0f, 0x34, 0x0,
0x70, 0x20, 0x3e, 0x0,
0x7e, 0x2e, 0x4c, 0x0,
0x8f, 0x3a, 0x58, 0x0,
0x9b, 0x48, 0x69, 0x0,
0xa7, 0x4f, 0x6d, 0x0,
0xb0, 0x5d, 0x7c, 0x0,
0xc0, 0x6a, 0x8b, 0x0,
0xc8, 0x78, 0x97, 0x0,
0xd8, 0x84, 0xa1, 0x0,
0xe2, 0x92, 0xb0, 0x0,
0xf6, 0x9e, 0xc0, 0x0,
0xfe, 0xad, 0xcf, 0x0,
0x3a, 0x00, 0x31, 0x0,
0x44, 0x00, 0x3c, 0x0,
0x52, 0x00, 0x4d, 0x0,
0x5a, 0x13, 0x58, 0x0,
0x6b, 0x1e, 0x67, 0x0,
0x74, 0x2e, 0x70, 0x0,
0x87, 0x3a, 0x7e, 0x0,
0x92, 0x47, 0x89, 0x0,
0x9e, 0x50, 0x91, 0x0,
0xaa, 0x5c, 0xa5, 0x0,
0xb5, 0x6a, 0xae, 0x0,
0xc1, 0x78, 0xc0, 0x0,
0xd1, 0x83, 0xc6, 0x0,
0xdb, 0x91, 0xd7, 0x0,
0xec, 0x9e, 0xe3, 0x0,
0xfc, 0xae, 0xf1, 0x0,
0x28, 0x00, 0x4d, 0x0,
0x32, 0x00, 0x5a, 0x0,
0x42, 0x03, 0x66, 0x0,
0x49, 0x18, 0x77, 0x0,
0x59, 0x23, 0x82, 0x0,
0x63, 0x31, 0x90, 0x0,
0x76, 0x3d, 0x99, 0x0,
0x82, 0x4a, 0xa7, 0x0,
0x8b, 0x53, 0xb0, 0x0,
0x98, 0x60, 0xbe, 0x0,
0xa5, 0x6c, 0xce, 0x0,
0xaf, 0x7b, 0xd9, 0x0,
0xbf, 0x85, 0xe8, 0x0,
0xcb, 0x94, 0xf2, 0x0,
0xdc, 0xa0, 0xfd, 0x0,
0xe8, 0xb0, 0xff, 0x0,
0x14, 0x00, 0x61, 0x0,
0x1f, 0x00, 0x68, 0x0,
0x2c, 0x0e, 0x77, 0x0,
0x38, 0x1c, 0x85, 0x0,
0x44, 0x28, 0x92, 0x0,
0x4f, 0x35, 0x9e, 0x0,
0x61, 0x41, 0xaa, 0x0,
0x6c, 0x50, 0xb6, 0x0,
0x76, 0x57, 0xbf, 0x0,
0x82, 0x65, 0xd0, 0x0,
0x93, 0x71, 0xdc, 0x0,
0x9a, 0x80, 0xec, 0x0,
0xac, 0x8a, 0xf5, 0x0,
0xb6, 0x99, 0xff, 0x0,
0xc7, 0xa5, 0xff, 0x0,
0xd9, 0xb4, 0xff, 0x0,
0x00, 0x00, 0x62, 0x0,
0x05, 0x08, 0x6b, 0x0,
0x17, 0x14, 0x79, 0x0,
0x20, 0x22, 0x87, 0x0,
0x30, 0x2d, 0x96, 0x0,
0x39, 0x3b, 0xa3, 0x0,
0x4a, 0x47, 0xae, 0x0,
0x54, 0x55, 0xbb, 0x0,
0x60, 0x5e, 0xc5, 0x0,
0x6c, 0x6b, 0xd4, 0x0,
0x7b, 0x78, 0xe1, 0x0,
0x86, 0x86, 0xf1, 0x0,
0x95, 0x91, 0xfe, 0x0,
0x9d, 0xa0, 0xff, 0x0,
0xae, 0xac, 0xff, 0x0,
0xbd, 0xbb, 0xff, 0x0,
0x00, 0x06, 0x58, 0x0,
0x00, 0x0f, 0x63, 0x0,
0x00, 0x1b, 0x6f, 0x0,
0x00, 0x29, 0x81, 0x0,
0x14, 0x34, 0x8c, 0x0,
0x1f, 0x42, 0x9a, 0x0,
0x2f, 0x4e, 0xa7, 0x0,
0x3b, 0x5d, 0xb3, 0x0,
0x45, 0x65, 0xbe, 0x0,
0x54, 0x73, 0xcc, 0x0,
0x66, 0x7f, 0xdc, 0x0,
0x6f, 0x8e, 0xe9, 0x0,
0x7e, 0x98, 0xf6, 0x0,
0x86, 0xa7, 0xfe, 0x0,
0x95, 0xb4, 0xff, 0x0,
0xa1, 0xc4, 0xff, 0x0,
0x00, 0x0d, 0x44, 0x0,
0x00, 0x17, 0x4f, 0x0,
0x00, 0x23, 0x5d, 0x0,
0x00, 0x30, 0x6e, 0x0,
0x00, 0x3c, 0x76, 0x0,
0x00, 0x49, 0x84, 0x0,
0x0c, 0x56, 0x93, 0x0,
0x19, 0x66, 0xa0, 0x0,
0x2b, 0x6e, 0xa8, 0x0,
0x39, 0x7c, 0xb8, 0x0,
0x4e, 0x88, 0xc7, 0x0,
0x59, 0x96, 0xd5, 0x0,
0x66, 0xa1, 0xdf, 0x0,
0x6f, 0xb0, 0xe9, 0x0,
0x7d, 0xbd, 0xf9, 0x0,
0x8c, 0xcd, 0xfe, 0x0,
0x00, 0x14, 0x24, 0x0,
0x00, 0x1e, 0x2e, 0x0,
0x00, 0x29, 0x3e, 0x0,
0x00, 0x38, 0x48, 0x0,
0x00, 0x42, 0x57, 0x0,
0x00, 0x50, 0x61, 0x0,
0x00, 0x5d, 0x71, 0x0,
0x00, 0x6c, 0x7c, 0x0,
0x05, 0x76, 0x84, 0x0,
0x20, 0x83, 0x98, 0x0,
0x38, 0x90, 0xa1, 0x0,
0x45, 0x9e, 0xb1, 0x0,
0x57, 0xa9, 0xbc, 0x0,
0x5f, 0xb7, 0xc6, 0x0,
0x6d, 0xc4, 0xd4, 0x0,
0x79, 0xd5, 0xdf, 0x0,
0x00, 0x19, 0x00, 0x0,
0x00, 0x23, 0x00, 0x0,
0x00, 0x2e, 0x0e, 0x0,
0x00, 0x3c, 0x1e, 0x0,
0x00, 0x46, 0x28, 0x0,
0x00, 0x56, 0x37, 0x0,
0x00, 0x61, 0x44, 0x0,
0x06, 0x71, 0x52, 0x0,
0x19, 0x7a, 0x5d, 0x0,
0x2b, 0x88, 0x69, 0x0,
0x3d, 0x94, 0x77, 0x0,
0x4d, 0xa2, 0x83, 0x0,
0x5b, 0xae, 0x8f, 0x0,
0x64, 0xbc, 0x9c, 0x0,
0x71, 0xc9, 0xa9, 0x0,
0x7f, 0xd9, 0xba, 0x0,
0x00, 0x1a, 0x00, 0x0,
0x00, 0x24, 0x00, 0x0,
0x00, 0x30, 0x00, 0x0,
0x00, 0x3d, 0x00, 0x0,
0x00, 0x48, 0x00, 0x0,
0x00, 0x56, 0x15, 0x0,
0x13, 0x63, 0x20, 0x0,
0x22, 0x72, 0x2f, 0x0,
0x2e, 0x7a, 0x38, 0x0,
0x39, 0x89, 0x42, 0x0,
0x4e, 0x94, 0x4f, 0x0,
0x58, 0xa3, 0x59, 0x0,
0x66, 0xad, 0x6a, 0x0,
0x6f, 0xbc, 0x78, 0x0,
0x7c, 0xc9, 0x84, 0x0,
0x89, 0xd6, 0x91, 0x0,
0x03, 0x19, 0x00, 0x0,
0x05, 0x23, 0x00, 0x0,
0x00, 0x2f, 0x00, 0x0,
0x02, 0x3d, 0x00, 0x0,
0x05, 0x47, 0x00, 0x0,
0x17, 0x56, 0x00, 0x0,
0x27, 0x62, 0x00, 0x0,
0x34, 0x70, 0x10, 0x0,
0x3f, 0x79, 0x19, 0x0,
0x4c, 0x86, 0x28, 0x0,
0x5e, 0x93, 0x2f, 0x0,
0x69, 0xa1, 0x40, 0x0,
0x77, 0xad, 0x49, 0x0,
0x7e, 0xbb, 0x5c, 0x0,
0x8c, 0xc7, 0x6a, 0x0,
0x9b, 0xd9, 0x77, 0x0,
0x00, 0x14, 0x00, 0x0,
0x00, 0x1f, 0x00, 0x0,
0x07, 0x2a, 0x00, 0x0,
0x0f, 0x3a, 0x00, 0x0,
0x24, 0x43, 0x00, 0x0,
0x2b, 0x52, 0x00, 0x0,
0x3e, 0x5e, 0x00, 0x0,
0x4a, 0x6c, 0x00, 0x0,
0x55, 0x74, 0x00, 0x0,
0x62, 0x82, 0x0b, 0x0,
0x70, 0x8f, 0x20, 0x0,
0x7e, 0x9c, 0x2d, 0x0,
0x89, 0xa8, 0x3b, 0x0,
0x94, 0xb6, 0x48, 0x0,
0xa4, 0xc2, 0x59, 0x0,
0xb1, 0xd2, 0x63, 0x0,
256};

121
libretro/libretro-core.c
View File

@ -70,7 +70,7 @@ bool prev_ui_finalized = false;
#endif
extern uint8_t mem_ram[];
extern int g_mem_ram_size;
int mem_ram_size;
/* Core geometry */
unsigned int retroXS = 0;
@ -152,15 +152,19 @@ extern bool turbo_fire_locked;
extern unsigned int turbo_fire_button;
extern unsigned int turbo_pulse;
#if defined(__X64DTV__)
const char *cartridge_current_filename(void) { return NULL; }
#elif defined(__XVIC__) || defined(__XPLUS4__) || defined(__XCBM2__) || defined(__XCBM5x0__)
const char *cartridge_current_filename(void) { return NULL; }
#if defined(__XVIC__)
void cartridge_trigger_freeze(void) {}
#elif defined(__XCBM2__) || defined(__XCBM5x0__)
void cartridge_trigger_freeze(void) {}
const char *cartridge_get_file_name(int type) { return NULL; }
#elif defined(__XPET__)
const char *cartridge_current_filename(void) { return NULL; }
void cartridge_trigger_freeze(void) {}
void cartridge_detach_image(int type) {}
const char *cartridge_get_file_name(int type) { return NULL; }
#elif defined(__XPLUS4__)
void cartridge_trigger_freeze(void) {}
const char *cartridge_get_file_name(int type) { return NULL; }
#else
extern int cart_getid_slotmain(void);
#endif
retro_input_state_t input_state_cb = NULL;
@ -1139,13 +1143,13 @@ static void autodetect_drivetype(int unit)
snprintf(drive_type_resource_var, sizeof(drive_type_resource_var), "Drive%dType", unit);
resources_get_int(drive_type_resource_var, &drive_type);
const char* attached_image = NULL;
attached_image = file_system_get_disk_name(unit);
attached_image = file_system_get_disk_name(unit, 0);
/* Autodetect drive type */
vdrive_t *vdrive;
struct disk_image_s *diskimg;
vdrive = file_system_get_vdrive(unit);
vdrive = file_system_get_vdrive(unit, 0);
if (vdrive == NULL)
log_cb(RETRO_LOG_ERROR, "Failed to get vdrive reference for unit %d.\n", unit);
else
@ -1171,7 +1175,7 @@ static void autodetect_drivetype(int unit)
log_cb(RETRO_LOG_ERROR, "Failed to set drive type.\n");
/* Change from 1581 to 1541 will not detect disk properly without reattaching (?!) */
file_system_attach_disk(unit, attached_image);
file_system_attach_disk(unit, 0, attached_image);
/* Don't bother with drive sound muting when autoloadwarp is on */
if (opt_autoloadwarp & AUTOLOADWARP_DISK)
@ -1242,18 +1246,18 @@ void update_work_disk()
if (path_is_valid(opt_work_disk_filepath))
{
/* Detach previous disks */
if ((attached_image = file_system_get_disk_name(8)) != NULL)
file_system_detach_disk(8);
if ((attached_image = file_system_get_disk_name(8, 0)) != NULL)
file_system_detach_disk(8, 0);
if ((attached_image = file_system_get_disk_name(9)) != NULL)
if ((attached_image = file_system_get_disk_name(9, 0)) != NULL)
{
file_system_detach_disk(9);
file_system_detach_disk(9, 0);
log_resources_set_int("Drive9Type", DRIVE_TYPE_NONE);
}
if (opt_work_disk_unit == 9)
log_resources_set_int("Drive9Type", opt_work_disk_type);
file_system_attach_disk(opt_work_disk_unit, opt_work_disk_filepath);
file_system_attach_disk(opt_work_disk_unit, 0, opt_work_disk_filepath);
autodetect_drivetype(opt_work_disk_unit);
log_cb(RETRO_LOG_INFO, "Work disk '%s' attached in drive #%d\n", opt_work_disk_filepath, opt_work_disk_unit);
display_current_image(opt_work_disk_filename, true);
@ -1262,21 +1266,21 @@ void update_work_disk()
else
{
/* Detach work disk if disabled while running */
if ((attached_image = file_system_get_disk_name(8)) != NULL && strstr(attached_image, "vice_work"))
if ((attached_image = file_system_get_disk_name(8, 0)) != NULL && strstr(attached_image, "vice_work"))
{
if (string_is_empty(full_path) || (!string_is_empty(full_path) && !strstr(full_path, "vice_work")))
{
log_cb(RETRO_LOG_INFO, "Work disk '%s' detached from drive #%d\n", attached_image, 8);
file_system_detach_disk(8);
file_system_detach_disk(8, 0);
log_resources_set_int("Drive8Type", DRIVE_TYPE_1541);
display_current_image(attached_image, false);
}
}
if ((attached_image = file_system_get_disk_name(9)) != NULL && strstr(attached_image, "vice_work"))
if ((attached_image = file_system_get_disk_name(9, 0)) != NULL && strstr(attached_image, "vice_work"))
{
log_cb(RETRO_LOG_INFO, "Work disk '%s' detached from drive #%d\n", attached_image, 9);
file_system_detach_disk(9);
file_system_detach_disk(9, 0);
log_resources_set_int("Drive9Type", DRIVE_TYPE_NONE);
}
}
@ -1363,7 +1367,11 @@ void update_from_vice()
/* If flip list is empty, get current tape or floppy image name and add to the list */
if (dc->count == 0)
{
if ((attachedImage = cartridge_current_filename()) != NULL)
#if defined(__X64__) || defined(__X64SC__) || defined(__XSCPU64__) || defined(__X128__)
if ((attachedImage = cartridge_get_file_name(cart_getid_slotmain())) != NULL)
#else
if ((attachedImage = cartridge_get_file_name(0)) != NULL)
#endif
{
dc->unit = 0;
dc_add_file(dc, attachedImage, NULL, NULL, NULL);
@ -1379,7 +1387,7 @@ void update_from_vice()
int unit;
for (unit = 8; unit <= 11; ++unit)
{
if ((attachedImage = file_system_get_disk_name(unit)) != NULL)
if ((attachedImage = file_system_get_disk_name(unit, 0)) != NULL)
{
dc->unit = unit;
dc_add_file(dc, attachedImage, NULL, NULL, NULL);
@ -1390,7 +1398,7 @@ void update_from_vice()
/* Only add images to the list from device 8, otherwise leads to confusion when other devices have disks,
* because Disk Control operates only on device 8 for now. */
int unit = 8;
if ((attachedImage = file_system_get_disk_name(unit)) != NULL)
if ((attachedImage = file_system_get_disk_name(unit, 0)) != NULL)
{
dc->unit = unit;
dc_add_file(dc, attachedImage, NULL, NULL, NULL);
@ -1451,7 +1459,7 @@ void update_from_vice()
}
else if (dc->unit == 8)
{
if ((attachedImage = file_system_get_disk_name(dc->unit)) == NULL)
if ((attachedImage = file_system_get_disk_name(dc->unit, 0)) == NULL)
{
attachedImage = dc->files[0];
autostartProgram = x_strdup(dc->load[0]);
@ -1459,7 +1467,7 @@ void update_from_vice()
if (autostartString != NULL || noautostart)
{
log_cb(RETRO_LOG_INFO, "Attaching first disk '%s' to drive #%d\n", attachedImage, dc->unit);
file_system_attach_disk(dc->unit, attachedImage);
file_system_attach_disk(dc->unit, 0, attachedImage);
}
}
}
@ -1855,8 +1863,10 @@ void retro_set_environment(retro_environment_t cb)
{
{ "C128 PAL", "C128 PAL" },
{ "C128 NTSC", "C128 NTSC" },
{ "C128 DCR PAL", "C128DCR PAL" },
{ "C128 DCR NTSC", "C128DCR NTSC" },
{ "C128 D PAL", "C128 D PAL" },
{ "C128 D NTSC", "C128 D NTSC" },
{ "C128 DCR PAL", "C128 DCR PAL" },
{ "C128 DCR NTSC", "C128 DCR NTSC" },
{ NULL, NULL },
},
"C128 PAL"
@ -1875,7 +1885,7 @@ void retro_set_environment(retro_environment_t cb)
{
"vice_c128_go64",
"System > GO64",
"Start in C64 compatibility mode.\nFull restart required.",
"Start in C64 compatibility mode.\nChanging while running resets the system!",
{
{ "disabled", NULL },
{ "enabled", NULL },
@ -2070,6 +2080,7 @@ void retro_set_environment(retro_environment_t cb)
},
"enabled"
},
#if !defined(__X64DTV__)
{
"vice_reset",
"System > Reset Type",
@ -2083,7 +2094,8 @@ void retro_set_environment(retro_environment_t cb)
},
"autostart"
},
#if !defined(__XPET__)
#endif
#if !defined(__XPET__) && !defined(__X64DTV__)
/* Sublabel and options filled dynamically in retro_set_environment() */
{
"vice_cartridge",
@ -2095,6 +2107,7 @@ void retro_set_environment(retro_environment_t cb)
NULL
},
#endif
#if !defined(__X64DTV__)
{
"vice_autostart",
"Media > Autostart",
@ -2182,6 +2195,7 @@ void retro_set_environment(retro_environment_t cb)
},
"disabled"
},
#endif /* !defined(__X64DTV__) */
{
"vice_video_options_display",
"Show Video Options",
@ -2408,7 +2422,7 @@ void retro_set_environment(retro_environment_t cb)
},
"default"
},
#else
#elif !defined(__X64DTV__)
{
"vice_external_palette",
"Video > VIC-II Color Palette",
@ -2589,10 +2603,18 @@ void retro_set_environment(retro_environment_t cb)
{
"vice_sid_engine",
"Audio > SID Engine",
#if defined(__X64DTV__)
"'ReSID-DTV' is accurate, 'FastSID' is the last resort.",
#else
"'ReSID' is accurate, 'ReSID-FP' is more accurate, 'FastSID' is the last resort.",
#endif
{
{ "FastSID", NULL },
#if defined(__X64DTV__)
{ "ReSID", "ReSID-DTV" },
#else
{ "ReSID", NULL },
#endif
#if defined(__X64__) || defined(__X64SC__) || defined(__XSCPU64__) || defined(__X128__)
#ifdef HAVE_RESID33
{ "ReSID-3.3", NULL },
@ -2603,6 +2625,7 @@ void retro_set_environment(retro_environment_t cb)
},
"ReSID"
},
#if !defined(__X64DTV__)
{
"vice_sid_model",
"Audio > SID Model",
@ -2630,6 +2653,7 @@ void retro_set_environment(retro_environment_t cb)
},
"disabled"
},
#endif
{
"vice_resid_sampling",
"Audio > ReSID Sampling",
@ -2641,7 +2665,7 @@ void retro_set_environment(retro_environment_t cb)
{ "resampling", "Resampling" },
{ NULL, NULL },
},
#if defined(__X64__) || defined(PSP) || defined(VITA) || defined(__SWITCH__) || defined(DINGUX) || defined(ANDROID)
#if defined(__X64__) || defined(__XCBM5x0__) || defined(__XCBM2__) || defined(PSP) || defined(VITA) || defined(__SWITCH__) || defined(DINGUX) || defined(ANDROID)
"fast"
#else
"resampling"
@ -2888,6 +2912,7 @@ void retro_set_environment(retro_environment_t cb)
"disabled"
},
#endif
#if !defined(__XPET__) && !defined(__XCBM2__)
{
"vice_keyrah_keypad_mappings",
"Input > Keyrah Keypad Mappings",
@ -2899,6 +2924,7 @@ void retro_set_environment(retro_environment_t cb)
},
"disabled"
},
#endif
#if !defined(__XPET__) && !defined(__XCBM2__) && !defined(__XCBM5x0__)
{
"vice_keyboard_keymap",
@ -3845,6 +3871,8 @@ static void update_variables(void)
if (!strcmp(var.value, "C128 PAL")) model = C128MODEL_C128_PAL;
else if (!strcmp(var.value, "C128 NTSC")) model = C128MODEL_C128_NTSC;
else if (!strcmp(var.value, "C128 D PAL")) model = C128MODEL_C128D_PAL;
else if (!strcmp(var.value, "C128 D NTSC")) model = C128MODEL_C128D_NTSC;
else if (!strcmp(var.value, "C128 DCR PAL")) model = C128MODEL_C128DCR_PAL;
else if (!strcmp(var.value, "C128 DCR NTSC")) model = C128MODEL_C128DCR_NTSC;
@ -3889,8 +3917,7 @@ static void update_variables(void)
if (retro_ui_finalized && vice_opt.Go64Mode != c128go64)
{
log_resources_set_int("Go64Mode", c128go64);
/* Skip reset for now, because going into 64 mode while running produces VDC related endless garbage, but typing GO64 works?! */
/*machine_trigger_reset(MACHINE_RESET_MODE_HARD);*/
request_restart = true;
}
vice_opt.Go64Mode = c128go64;
}
@ -4122,7 +4149,7 @@ static void update_variables(void)
log_resources_set_int("SidStereo", 0);
else
{
log_resources_set_int("SidStereoAddressStart", sid_extra);
log_resources_set_int("Sid2AddressStart", sid_extra);
if (!vice_opt.SidExtra)
log_resources_set_int("SidStereo", 1);
}
@ -5351,7 +5378,7 @@ bool retro_disk_set_eject_state(bool ejected)
tape_image_detach(unit);
break;
default:
file_system_detach_disk(unit);
file_system_detach_disk(unit, 0);
break;
}
}
@ -5377,7 +5404,7 @@ bool retro_disk_set_eject_state(bool ejected)
tape_image_attach(unit, dc->files[dc->index]);
break;
default:
file_system_attach_disk(unit, dc->files[dc->index]);
file_system_attach_disk(unit, 0, dc->files[dc->index]);
autodetect_drivetype(unit);
break;
}
@ -5693,7 +5720,7 @@ void retro_get_system_info(struct retro_system_info *info)
#endif
memset(info, 0, sizeof(*info));
info->library_name = "VICE " CORE_NAME;
info->library_version = "3.3" GIT_VERSION;
info->library_version = "3.5" GIT_VERSION;
#if defined(__XVIC__)
info->valid_extensions = "d64|d71|d80|d81|d82|g64|g41|x64|t64|tap|prg|p00|crt|bin|zip|7z|gz|d6z|d7z|d8z|g6z|g4z|x6z|cmd|m3u|vfl|vsf|nib|nbz|20|40|60|a0|b0|rom";
#else
@ -6244,9 +6271,9 @@ bool retro_load_game(const struct retro_game_info *info)
void retro_unload_game(void)
{
file_system_detach_disk(8);
file_system_detach_disk(8, 0);
if (opt_work_disk_type && opt_work_disk_unit == 9)
file_system_detach_disk(9);
file_system_detach_disk(9, 0);
tape_image_detach(1);
cartridge_detach_image(-1);
file_system_detach_disk_shutdown();
@ -6291,22 +6318,12 @@ static void dc_sync_index(void)
{
unsigned dc_index;
char* filename = strdup(dc_savestate_filename);
drive_t *drive = drive_context[0]->drive;
drive_t *drive = diskunit_context[0]->drives[0];
if (drive == NULL || string_is_empty(filename))
return;
switch (drive->type)
{
case DISK_IMAGE_TYPE_D64:
case DISK_IMAGE_TYPE_G64:
case DISK_IMAGE_TYPE_D71:
case DISK_IMAGE_TYPE_G71:
if (!drive->GCR_image_loaded)
return;
break;
default:
return;
}
if (!drive->GCR_image_loaded)
return;
for (dc_index = 0; dc_index < dc->count; dc_index++)
{
@ -6437,7 +6454,7 @@ void *retro_get_memory_data(unsigned id)
size_t retro_get_memory_size(unsigned id)
{
if (id == RETRO_MEMORY_SYSTEM_RAM)
return g_mem_ram_size;
return mem_ram_size;
return 0;
}

4
libretro/libretro-dc.c
View File

@ -1102,7 +1102,7 @@ void dc_parse_list(dc_storage* dc, const char* list_file, bool is_vfl, const cha
{
case 1:
/* Detach & disable drive 8 */
file_system_detach_disk(8);
file_system_detach_disk(8, 0);
log_resources_set_int("Drive8Type", DRIVE_TYPE_NONE);
break;
@ -1115,7 +1115,7 @@ void dc_parse_list(dc_storage* dc, const char* list_file, bool is_vfl, const cha
case 0:
/* Detach & disable tape, detach & disable drive 8 */
tape_deinstall();
file_system_detach_disk(8);
file_system_detach_disk(8, 0);
log_resources_set_int("Drive8Type", DRIVE_TYPE_NONE);
break;
}

13
libretro/libretro-mapper.c
View File

@ -51,6 +51,15 @@ int vkbd_y_max = 0;
/* Mouse D-Pad acceleration */
#define MOUSE_DPAD_ACCEL
extern unsigned int opt_mouse_speed;
static void retro_mouse_move(int x, int y)
{
mouse_move(
(x * (float)opt_mouse_speed / 100.0f),
(y * (float)opt_mouse_speed / 100.0f)
);
}
/* Core flags */
int mapper_keys[RETRO_MAPPER_LAST] = {0};
int vkflag[10] = {0};
@ -70,7 +79,7 @@ extern short int retro_vkbd_ready;
extern unsigned int retro_devices[RETRO_DEVICES];
static unsigned retro_key_state[RETROK_LAST] = {0};
static unsigned retro_key_event_state[RETROK_LAST] = {0};
unsigned retro_key_event_state[RETROK_LAST] = {0};
static int16_t joypad_bits[RETRO_DEVICES];
extern bool libretro_supports_bitmasks;
extern dc_storage *dc;
@ -1573,7 +1582,7 @@ void retro_poll_event()
if (retro_mouse_x[j] < -1 && mouse_value[retro_j] & 0x08)
mouse_value[retro_j] &= ~0x08;
mouse_move(retro_mouse_x[j], retro_mouse_y[j]);
retro_mouse_move(retro_mouse_x[j], retro_mouse_y[j]);
}
}
}

76
vice/src/arch/libretro/archdep.c → retrodep/archdep.c
View File

@ -64,8 +64,13 @@
#include "util.h"
#include "keyboard.h"
#include "../shared/archdep_atexit.c"
#include "../shared/archdep_extra_title_text.c"
#include "arch/shared/archdep_exit.c"
#include "arch/shared/archdep_extra_title_text.c"
#include "arch/shared/archdep_default_portable_resource_file_name.c"
#include "arch/shared/archdep_join_paths.c"
#include "arch/shared/archdep_pref_path.c"
#include "arch/shared/archdep_stat.c"
#include "arch/shared/archdep_quote_unzip.c"
#include "libretro-core.h"
extern unsigned int opt_read_vicerc;
@ -75,7 +80,7 @@ static char *argv0 = NULL;
static char *boot_path = NULL;
/* alternate storage of preferences */
const char *archdep_pref_path = NULL; /* NULL -> use home_path + ".vice" */
//const char *archdep_pref_path = NULL; /* NULL -> use home_path + ".vice" */
#include <stddef.h>
@ -142,22 +147,22 @@ int archdep_rtc_get_centisecond(void)
int archdep_init(int *argc, char **argv)
{
argv0 = lib_stralloc(argv[0]);
argv0 = lib_strdup(argv[0]);
archdep_pref_path = archdep_boot_path();
archdep_pref_path();
return 0;
}
char *archdep_default_rtc_file_name(void)
{
if (archdep_pref_path == NULL) {
if (pref_path == NULL) {
const char *home;
home = archdep_home_path();
return util_concat(home, "/.vice/vice.rtc", NULL);
} else {
return util_concat(archdep_pref_path, "/vice.rtc", NULL);
return util_concat(pref_path, "/vice.rtc", NULL);
}
}
@ -178,9 +183,9 @@ const char *archdep_program_name(void)
p = strrchr(argv0, '/');
#endif
if (p == NULL)
program_name = lib_stralloc(argv0);
program_name = lib_strdup(argv0);
else
program_name = lib_stralloc(p + 1);
program_name = lib_strdup(p + 1);
}
return program_name;
@ -198,13 +203,13 @@ const char *archdep_home_path(void)
char *archdep_default_autostart_disk_image_file_name(void)
{
if (archdep_pref_path == NULL) {
if (pref_path == NULL) {
const char *home;
home = archdep_home_path();
return util_concat(home, "/.vice/autostart-", machine_name, ".d64", NULL);
} else {
return util_concat(archdep_pref_path, "/autostart-", machine_name, ".d64", NULL);
return util_concat(pref_path, "/autostart-", machine_name, ".d64", NULL);
}
}
@ -287,7 +292,7 @@ char *archdep_make_backup_filename(const char *fname)
char *archdep_default_resource_file_name(void)
{
if(archdep_pref_path==NULL) {
if (pref_path == NULL) {
const char *home;
home = archdep_home_path();
return util_concat(home, "/.vice/vicerc", NULL);
@ -314,10 +319,10 @@ char *archdep_default_resource_file_name(void)
else
log_message(LOG_DEFAULT, "No configuration file found at '%s'.", content_vicerc);
/* Process "system/vice/vicerc" */
snprintf(content_vicerc, sizeof(content_vicerc), "%s%svicerc", archdep_pref_path, FSDEV_DIR_SEP_STR);
snprintf(content_vicerc, sizeof(content_vicerc), "%s%svicerc", pref_path, FSDEV_DIR_SEP_STR);
if (ioutil_access(content_vicerc, IOUTIL_ACCESS_R_OK))
log_message(LOG_DEFAULT, "No configuration file found at '%s'.", content_vicerc);
return util_concat(archdep_pref_path, FSDEV_DIR_SEP_STR, "vicerc", NULL);
return util_concat(pref_path, FSDEV_DIR_SEP_STR, "vicerc", NULL);
}
else
return NULL;
@ -326,27 +331,27 @@ char *archdep_default_resource_file_name(void)
char *archdep_default_fliplist_file_name(void)
{
if(archdep_pref_path==NULL) {
if (pref_path == NULL) {
const char *home;
home = archdep_home_path();
return util_concat(home, "/.vice/fliplist-", machine_name, ".vfl", NULL);
} else {
return util_concat(archdep_pref_path, "/fliplist-", machine_name, ".vfl", NULL);
return util_concat(pref_path, "/fliplist-", machine_name, ".vfl", NULL);
}
}
/*
char *archdep_default_save_resource_file_name(void)
{
char *fname;
const char *home;
const char *viceuserdir;
if(archdep_pref_path==NULL) {
if (pref_path == NULL) {
home = archdep_home_path();
viceuserdir = util_concat(home, "/.vice", NULL);
} else {
viceuserdir = archdep_pref_path;
viceuserdir = pref_path;
}
if (ioutil_access(viceuserdir, IOUTIL_ACCESS_F_OK)) {
@ -361,13 +366,13 @@ char *archdep_default_save_resource_file_name(void)
fname = util_concat(viceuserdir, "/vicerc", NULL);
if(archdep_pref_path==NULL) {
if (pref_path == NULL) {
lib_free(viceuserdir);
}
return fname;
}
*/
FILE *archdep_open_default_log_file(void)
{
return NULL;
@ -483,7 +488,7 @@ int archdep_expand_path(char **return_path, const char *orig_name)
{
/* Unix version. */
if (*orig_name == '/') {
*return_path = lib_stralloc(orig_name);
*return_path = lib_strdup(orig_name);
} else {
static char *cwd;
@ -510,13 +515,13 @@ void archdep_startup_log_error(const char *format, ...)
char *archdep_filename_parameter(const char *name)
{
/* nothing special(?) */
return lib_stralloc(name);
return lib_strdup(name);
}
char *archdep_quote_parameter(const char *name)
{
/*not needed(?) */
return lib_stralloc(name);
return lib_strdup(name);
}
char *archdep_tmpnam(void)
@ -541,9 +546,9 @@ char *archdep_tmpnam(void)
close(fd);
lib_free(tmpName);
return lib_stralloc(tmpName);
return lib_strdup(tmpName);
#else
return lib_stralloc(tmpnam(NULL));
return lib_strdup(tmpnam(NULL));
#endif
}
@ -598,7 +603,7 @@ FILE *archdep_mkstemp_fd(char **filename, const char *mode)
if (fd == NULL)
return NULL;
*filename = lib_stralloc(tmp);
*filename = lib_strdup(tmp);
return fd;
#endif
@ -650,6 +655,7 @@ int archdep_rmdir(const char *pathname)
return 0;
}
/*
int archdep_stat(const char *file_name, unsigned int *len, unsigned int *isdir)
{
struct stat statbuf;
@ -662,6 +668,7 @@ int archdep_stat(const char *file_name, unsigned int *len, unsigned int *isdir)
return 0;
}
*/
int archdep_file_is_blockdev(const char *name)
{
@ -728,3 +735,18 @@ char *archdep_get_runtime_cpu(void)
{
return "Unknown CPU";
}
/* 3.5 -> */
void archdep_kbd_get_host_mapping(void)
{
}
int archdep_is_haiku(void)
{
return -1;
}
void archdep_sound_enable_default_device_tracking(void)
{
}

23
vice/src/arch/libretro/archdep.h → retrodep/archdep.h
View File

@ -47,9 +47,6 @@ extern char retro_save_directory[512];
/* Default sound output mode */
#define ARCHDEP_SOUND_OUTPUT_MODE SOUND_OUTPUT_STEREO
/* Default sound fragment size */
#define ARCHDEP_SOUND_FRAGMENT_SIZE SOUND_FRAGMENT_VERY_SMALL
#if defined(__WIN32__)
/* Filesystem dependant operators. */
#define FSDEVICE_DEFAULT_DIR "."
@ -157,20 +154,20 @@ extern char retro_save_directory[512];
/* Video chip scaling. */
#define ARCHDEP_VICII_DSIZE 1
#define ARCHDEP_VICII_DSCAN 1
#define ARCHDEP_VICII_HWSCALE 1
#define ARCHDEP_VICII_DSCAN 0
#define ARCHDEP_VICII_HWSCALE 0
#define ARCHDEP_VDC_DSIZE 1
#define ARCHDEP_VDC_DSCAN 1
#define ARCHDEP_VDC_DSCAN 0
#define ARCHDEP_VDC_HWSCALE 0
#define ARCHDEP_VIC_DSIZE 1
#define ARCHDEP_VIC_DSCAN 1
#define ARCHDEP_VIC_HWSCALE 1
#define ARCHDEP_VIC_DSCAN 0
#define ARCHDEP_VIC_HWSCALE 0
#define ARCHDEP_CRTC_DSIZE 1
#define ARCHDEP_CRTC_DSCAN 1
#define ARCHDEP_CRTC_DSCAN 0
#define ARCHDEP_CRTC_HWSCALE 0
#define ARCHDEP_TED_DSIZE 1
#define ARCHDEP_TED_DSCAN 1
#define ARCHDEP_TED_HWSCALE 1
#define ARCHDEP_TED_DSCAN 0
#define ARCHDEP_TED_HWSCALE 0
/* Video chip double buffering. */
#define ARCHDEP_VICII_DBUF 0
@ -186,10 +183,6 @@ extern char retro_save_directory[512];
/* Keyword to use for a static prototype */
#define STATIC_PROTOTYPE static
/* set this path to customize the preference storage */
extern const char *archdep_pref_path;
extern const char *archdep_home_path(void);
/* Define the default system directory (where the ROMs are). */
#ifndef __LIBRETRO__
#ifdef __NetBSD__

0
vice/src/arch/libretro/c64ui.c → retrodep/c64ui.c
View File

0
vice/src/arch/libretro/cart/cpmcart.c → retrodep/cart/cpmcart.c
View File

0
vice/src/arch/libretro/console.c → retrodep/console.c
View File

0
vice/src/arch/libretro/gfxoutputdrv/gfxoutput.c → retrodep/gfxoutputdrv/gfxoutput.c
View File

0
vice/src/arch/libretro/info.c → retrodep/info.c
View File

4
vice/src/arch/libretro/joy.c → retrodep/joy.c
View File

@ -45,6 +45,10 @@ static const resource_int_t resources_int[] = {
#endif
/* ------------------------------------------------------------------------- */
void joystick(void)
{
}
int joystick_arch_init_resources(void)
{
return 0;

1
vice/src/arch/libretro/joy.h → retrodep/joy.h
View File

@ -34,6 +34,7 @@ extern void joystick_close(void);
extern int joystick_arch_init_resources(void);
extern int joystick_init_cmdline_options(void);
extern void joystick_update(void);
extern void joystick(void);
#define JOYDEV_NONE 0
#define JOYDEV_NUMPAD 1

62
retrodep/kbd.c Normal file
View File

@ -0,0 +1,62 @@
#include "libretro.h"
#include <stdio.h>
#include <string.h>
#include "kbd.h"
#include "joystick.h"
#include "keyboard.h"
extern unsigned retro_key_event_state[RETROK_LAST];
static int kbd_get_modifier()
{
int ret = 0;
if (retro_key_event_state[RETROK_LSHIFT]) {
ret |= KBD_MOD_LSHIFT;
}
if (retro_key_event_state[RETROK_RSHIFT]) {
ret |= KBD_MOD_RSHIFT;
}
if (retro_key_event_state[RETROK_LALT]) {
ret |= KBD_MOD_LALT;
}
if (retro_key_event_state[RETROK_RALT]) {
ret |= KBD_MOD_RALT;
}
if (retro_key_event_state[RETROK_LCTRL]) {
ret |= KBD_MOD_LCTRL;
}
return ret;
}
void kbd_handle_keydown(int kcode)
{
keyboard_key_pressed((signed long)kcode, kbd_get_modifier());
}
void kbd_handle_keyup(int kcode)
{
keyboard_key_released((signed long)kcode, kbd_get_modifier());
}
signed long kbd_arch_keyname_to_keynum(char *keyname) {
return (signed long)atoi(keyname);
}
const char *kbd_arch_keynum_to_keyname(signed long keynum) {
static char keyname[20];
memset(keyname, 0, 20);
sprintf(keyname, "%li", keynum);
return keyname;
}
void kbd_arch_init()
{
keyboard_clear_keymatrix();
}
void kbd_initialize_numpad_joykeys(int* joykeys)
{
}

0
vice/src/arch/libretro/kbd.h → retrodep/kbd.h
View File

182
vice/src/arch/libretro/keymap.c → retrodep/keymap.c
View File

@ -70,7 +70,7 @@ static void libretro_keyboard()
keyboard_parse_set_pos_row(RETROK_COMMA, 15, 4, 8); /* , -> , */
keyboard_parse_set_pos_row(RETROK_PERIOD, 15, 5, 8); /* . -> . */
keyboard_parse_set_pos_row(RETROK_OEM_102, 15, 4, 33); /* < -> < */
keyboard_parse_set_pos_row(RETROK_OEM_102, 15, 5, 1); /* > -> > */
keyboard_parse_set_pos_row(RETROK_OEM_102, 15, 5, 145); /* > -> > */
keyboard_parse_set_pos_row(RETROK_SLASH, 0, 5, 8); /* / -> / */
keyboard_parse_set_pos_row(RETROK_RSHIFT, 8, 4, 2); /* Right Shift -> Right Shift */
keyboard_parse_set_pos_row(RETROK_RCTRL, 3, 4, 8); /* Right Ctrl -> C= */
@ -127,6 +127,7 @@ static void libretro_keyboard()
kbd_rshiftrow = 6;
kbd_rshiftcol = 6;
vshift = KEY_RSHIFT;
shiftl = KEY_LSHIFT;
keyboard_parse_set_pos_row(RETROK_BACKQUOTE, 9, 0, 8); /* ` -> Left Arrow */
keyboard_parse_set_pos_row(RETROK_1, 1, 0, 8); /* 1 -> 1 */
@ -217,6 +218,7 @@ static void libretro_keyboard()
kbd_rshiftrow = 8;
kbd_rshiftcol = 5;
vshift = KEY_RSHIFT;
shiftl = KEY_LSHIFT;
keyboard_parse_set_pos_row(RETROK_1, 0, 0, 8); /* 1 -> ! */
keyboard_parse_set_pos_row(RETROK_2, 1, 0, 8); /* 2 -> " */
@ -310,30 +312,37 @@ static void libretro_keyboard()
kbd_rshiftcol = 4;
vshift = KEY_RSHIFT;
shiftl = KEY_LSHIFT;
kbd_lcbmrow = 0;
kbd_lcbmcol = 5;
vcbm = KEY_LCBM;
switch (opt_keyboard_keymap)
{
case 0: /* Symbolic */
keyboard_parse_set_pos_row(RETROK_BACKQUOTE, 0, 1, 8); /* ` -> Left Arrow */
keyboard_parse_set_pos_row(RETROK_1, 0, 0, 8); /* 1 -> 1 */
keyboard_parse_set_pos_row(RETROK_2, 0, 7, 32); /* 2 -> 2 */
keyboard_parse_set_pos_row(RETROK_2, 5, 6, 16); /* @ -> @ */
keyboard_parse_set_pos_row(RETROK_2, 5, 6, 144); /* @ -> @ */
keyboard_parse_set_pos_row(RETROK_AT, 5, 6, 0); /* @ -> @ */
keyboard_parse_set_pos_row(RETROK_3, 1, 0, 8); /* 3 -> 3 */
keyboard_parse_set_pos_row(RETROK_4, 1, 7, 32); /* 4 -> 4 */
keyboard_parse_set_pos_row(RETROK_4, 1, 7, 8); /* 4 -> 4 */
keyboard_parse_set_pos_row(RETROK_DOLLAR, 1, 3, 1); /* $ -> $ */
keyboard_parse_set_pos_row(RETROK_5, 2, 0, 8); /* 5 -> 5 */
keyboard_parse_set_pos_row(RETROK_6, 2, 7, 32); /* 6 -> 6 */
keyboard_parse_set_pos_row(RETROK_6, 6, 6, 16); /* ^ -> ^ */
keyboard_parse_set_pos_row(RETROK_6, 6, 6, 145); /* ^ -> ^ */
keyboard_parse_set_pos_row(RETROK_7, 3, 0, 32); /* 7 -> 7 */
keyboard_parse_set_pos_row(RETROK_7, 2, 7, 1); /* & -> & */
keyboard_parse_set_pos_row(RETROK_7, 2, 7, 129); /* & -> & */
keyboard_parse_set_pos_row(RETROK_8, 3, 7, 32); /* 8 -> 8 */
keyboard_parse_set_pos_row(RETROK_8, 6, 1, 16); /* * -> * */
keyboard_parse_set_pos_row(RETROK_8, 6, 1, 144); /* * -> * */
keyboard_parse_set_pos_row(RETROK_9, 4, 0, 32); /* 9 -> 9 */
keyboard_parse_set_pos_row(RETROK_9, 3, 7, 1); /* ( -> ) */
keyboard_parse_set_pos_row(RETROK_9, 3, 7, 129); /* ( -> ) */
keyboard_parse_set_pos_row(RETROK_0, 4, 7, 32); /* 0 -> 0 */
keyboard_parse_set_pos_row(RETROK_0, 4, 0, 1); /* ) -> ) */
keyboard_parse_set_pos_row(RETROK_MINUS, 5, 7, 8); /* - -> - */
keyboard_parse_set_pos_row(RETROK_0, 4, 0, 129); /* ) -> ) */
keyboard_parse_set_pos_row(RETROK_MINUS, 5, 7, 32); /* - -> - */
keyboard_parse_set_pos_row(RETROK_MINUS, 5, 6, 2192);/* _ -> _ */
keyboard_parse_set_pos_row(RETROK_EQUALS, 6, 5, 32); /* = -> = */
keyboard_parse_set_pos_row(RETROK_EQUALS, 5, 0, 16); /* + -> + */
keyboard_parse_set_pos_row(RETROK_EQUALS, 5, 0, 144); /* + -> + */
keyboard_parse_set_pos_row(RETROK_PLUS, 5, 0, 0); /* + -> + */
keyboard_parse_set_pos_row(RETROK_BACKSLASH, 6, 0, 8); /* \ -> Pound */
keyboard_parse_set_pos_row(RETROK_HOME, 6, 7, 8); /* Home -> CLR/HOME */
keyboard_parse_set_pos_row(RETROK_INSERT, 6, 0, 8); /* Insert -> INS */
keyboard_parse_set_pos_row(RETROK_BACKSPACE, 7, 0, 8); /* Backspace -> DEL */
@ -366,10 +375,9 @@ static void libretro_keyboard()
keyboard_parse_set_pos_row(RETROK_k, 4, 5, 8); /* K -> K */
keyboard_parse_set_pos_row(RETROK_l, 5, 2, 8); /* L -> L */
keyboard_parse_set_pos_row(RETROK_SEMICOLON, 6, 2, 32); /* ; -> ; */
keyboard_parse_set_pos_row(RETROK_SEMICOLON, 5, 5, 16); /* : -> : */
keyboard_parse_set_pos_row(RETROK_SEMICOLON, 5, 5, 144); /* : -> : */
keyboard_parse_set_pos_row(RETROK_QUOTE, 3, 0, 33); /* ' -> ' */
keyboard_parse_set_pos_row(RETROK_QUOTE, 0, 7, 1); /* " -> " */
keyboard_parse_set_pos_row(RETROK_BACKSLASH, 6, 0, 8); /* \ -> Pound */
keyboard_parse_set_pos_row(RETROK_QUOTE, 0, 7, 129); /* " -> " */
keyboard_parse_set_pos_row(RETROK_RETURN, 7, 1, 8); /* Return -> RETURN */
keyboard_parse_set_pos_row(RETROK_TAB, 7, 5, 8); /* Tab -> C= */
@ -384,7 +392,7 @@ static void libretro_keyboard()
keyboard_parse_set_pos_row(RETROK_COMMA, 5, 3, 8); /* , -> , */
keyboard_parse_set_pos_row(RETROK_PERIOD, 5, 4, 8); /* . -> . */
keyboard_parse_set_pos_row(RETROK_OEM_102, 5, 3, 33); /* < -> < */
keyboard_parse_set_pos_row(RETROK_OEM_102, 5, 4, 1); /* > -> > */
keyboard_parse_set_pos_row(RETROK_OEM_102, 5, 4, 145); /* > -> > */
keyboard_parse_set_pos_row(RETROK_SLASH, 6, 3, 8); /* / -> / */
keyboard_parse_set_pos_row(RETROK_RSHIFT, 6, 4, 4); /* Right Shift -> Right Shift */
keyboard_parse_set_pos_row(RETROK_SPACE, 0, 4, 8); /* Space -> Space */
@ -466,7 +474,7 @@ static void libretro_keyboard()
keyboard_parse_set_pos_row(RETROK_COMMA, 5, 3, 8); /* , -> , */
keyboard_parse_set_pos_row(RETROK_PERIOD, 5, 4, 8); /* . -> . */
keyboard_parse_set_pos_row(RETROK_OEM_102, 5, 3, 33); /* < -> < */
keyboard_parse_set_pos_row(RETROK_OEM_102, 5, 4, 1); /* > -> > */
keyboard_parse_set_pos_row(RETROK_OEM_102, 5, 4, 145); /* > -> > */
keyboard_parse_set_pos_row(RETROK_SLASH, 6, 3, 8); /* / -> / */
keyboard_parse_set_pos_row(RETROK_RSHIFT, 6, 4, 4); /* Right Shift -> Right Shift */
keyboard_parse_set_pos_row(RETROK_SPACE, 0, 4, 8); /* Space -> Space */
@ -490,35 +498,45 @@ static void libretro_keyboard()
#elif defined(__XPLUS4__)
kbd_lshiftrow = 1;
kbd_lshiftcol = 7;
kbd_rshiftrow = 6;
kbd_rshiftcol = 4;
vshift = KEY_RSHIFT;
kbd_rshiftrow = 1;
kbd_rshiftcol = 7;
vshift = KEY_LSHIFT;
shiftl = KEY_LSHIFT;
kbd_lcbmrow = 7;
kbd_lcbmcol = 5;
vcbm = KEY_LCBM;
kbd_lctrlrow = 7;
kbd_lctrlcol = 2;
vctrl = KEY_LCTRL;
switch (opt_keyboard_keymap)
{
case 0: /* Symbolic */
keyboard_parse_set_pos_row(RETROK_BACKQUOTE, 6, 4, 32); /* ` -> Esc */
keyboard_parse_set_pos_row(RETROK_BACKQUOTE, 6, 5, 1); /* ~ -> Pi */
keyboard_parse_set_pos_row(RETROK_1, 7, 0, 8); /* 1 -> 1 */
keyboard_parse_set_pos_row(RETROK_2, 7, 3, 32); /* 2 -> 2 */
keyboard_parse_set_pos_row(RETROK_2, 0, 7, 16); /* @ -> @ */
keyboard_parse_set_pos_row(RETROK_2, 0, 7, 144); /* @ -> @ */
keyboard_parse_set_pos_row(RETROK_AT, 0, 7, 0); /* @ -> @ */
keyboard_parse_set_pos_row(RETROK_3, 1, 0, 8); /* 3 -> 3 */
keyboard_parse_set_pos_row(RETROK_4, 1, 3, 8); /* 4 -> 4 */
keyboard_parse_set_pos_row(RETROK_DOLLAR, 1, 3, 1); /* $ -> $ */
keyboard_parse_set_pos_row(RETROK_5, 2, 0, 8); /* 5 -> 5 */
keyboard_parse_set_pos_row(RETROK_6, 2, 3, 32); /* 6 -> 6 */
keyboard_parse_set_pos_row(RETROK_6, 4, 3, 2); /* ^ -> ^ */
keyboard_parse_set_pos_row(RETROK_6, 4, 3, 145); /* ^ -> ^ */
keyboard_parse_set_pos_row(RETROK_7, 3, 0, 32); /* 7 -> 7 */
keyboard_parse_set_pos_row(RETROK_7, 2, 3, 2); /* & -> & */
keyboard_parse_set_pos_row(RETROK_7, 2, 3, 129); /* & -> & */
keyboard_parse_set_pos_row(RETROK_8, 3, 3, 32); /* 8 -> 8 */
keyboard_parse_set_pos_row(RETROK_8, 6, 1, 17); /* * -> * */
keyboard_parse_set_pos_row(RETROK_8, 6, 1, 144); /* * -> * */
keyboard_parse_set_pos_row(RETROK_9, 4, 0, 32); /* 9 -> 9 */
keyboard_parse_set_pos_row(RETROK_9, 3, 3, 2); /* ( -> ) */
keyboard_parse_set_pos_row(RETROK_9, 3, 3, 129); /* ( -> ) */
keyboard_parse_set_pos_row(RETROK_0, 4, 3, 32); /* 0 -> 0 */
keyboard_parse_set_pos_row(RETROK_0, 4, 0, 2); /* ) -> ) */
keyboard_parse_set_pos_row(RETROK_MINUS, 5, 6, 8); /* - -> - */
keyboard_parse_set_pos_row(RETROK_0, 4, 0, 129); /* ) -> ) */
keyboard_parse_set_pos_row(RETROK_MINUS, 5, 6, 32); /* - -> - */
keyboard_parse_set_pos_row(RETROK_MINUS, 5, 6, 2192);/* _ -> _ */
keyboard_parse_set_pos_row(RETROK_EQUALS, 6, 5, 32); /* = -> = */
keyboard_parse_set_pos_row(RETROK_EQUALS, 6, 6, 16); /* + -> + */
keyboard_parse_set_pos_row(RETROK_BACKQUOTE, 6, 5, 2); /* ~ -> Pi */
keyboard_parse_set_pos_row(RETROK_EQUALS, 6, 6, 144); /* + -> + */
keyboard_parse_set_pos_row(RETROK_PLUS, 6, 6, 0); /* + -> + */
keyboard_parse_set_pos_row(RETROK_BACKSLASH, 0, 2, 8); /* \ -> Pound */
keyboard_parse_set_pos_row(RETROK_HOME, 7, 1, 8); /* Home -> CLR/HOME */
keyboard_parse_set_pos_row(RETROK_INSERT, 0, 0, 1); /* Insert -> INS */
keyboard_parse_set_pos_row(RETROK_DELETE, 0, 0, 8); /* Delete -> DEL */
@ -535,9 +553,8 @@ static void libretro_keyboard()
keyboard_parse_set_pos_row(RETROK_i, 4, 1, 8); /* I -> I */
keyboard_parse_set_pos_row(RETROK_o, 4, 6, 8); /* O -> O */
keyboard_parse_set_pos_row(RETROK_p, 5, 1, 8); /* P -> P */
keyboard_parse_set_pos_row(RETROK_LEFTBRACKET, 5, 5, 2); /* [ -> [ */
keyboard_parse_set_pos_row(RETROK_BACKSLASH, 0, 2, 8); /* \ -> Pound */
keyboard_parse_set_pos_row(RETROK_RIGHTBRACKET, 6, 2, 2); /* ] -> ] */
keyboard_parse_set_pos_row(RETROK_LEFTBRACKET, 5, 5, 1); /* [ -> [ */
keyboard_parse_set_pos_row(RETROK_RIGHTBRACKET, 6, 2, 1); /* ] -> ] */
keyboard_parse_set_pos_row(RETROK_RCTRL, 9, 4, 8); /* Right Ctrl -> Right Control*/
keyboard_parse_set_pos_row(RETROK_ESCAPE, 7, 7, 8); /* Esc -> Run/Stop */
@ -552,9 +569,9 @@ static void libretro_keyboard()
keyboard_parse_set_pos_row(RETROK_k, 4, 5, 8); /* K -> K */
keyboard_parse_set_pos_row(RETROK_l, 5, 2, 8); /* L -> L */
keyboard_parse_set_pos_row(RETROK_SEMICOLON, 6, 2, 32); /* ; -> ; */
keyboard_parse_set_pos_row(RETROK_SEMICOLON, 5, 5, 16); /* : -> : */
keyboard_parse_set_pos_row(RETROK_SEMICOLON, 5, 5, 144); /* : -> : */
keyboard_parse_set_pos_row(RETROK_QUOTE, 3, 0, 33); /* ' -> ' */
keyboard_parse_set_pos_row(RETROK_QUOTE, 7, 3, 1); /* " -> " */
keyboard_parse_set_pos_row(RETROK_QUOTE, 7, 3, 129); /* " -> " */
keyboard_parse_set_pos_row(RETROK_RETURN, 0, 1, 8); /* Return -> Return */
keyboard_parse_set_pos_row(RETROK_TAB, 7, 5, 8); /* Tab -> C= */
@ -569,9 +586,9 @@ static void libretro_keyboard()
keyboard_parse_set_pos_row(RETROK_COMMA, 5, 7, 8); /* , -> , */
keyboard_parse_set_pos_row(RETROK_PERIOD, 5, 4, 8); /* . -> . */
keyboard_parse_set_pos_row(RETROK_OEM_102, 5, 7, 33); /* < -> < */
keyboard_parse_set_pos_row(RETROK_OEM_102, 5, 4, 1); /* > -> > */
keyboard_parse_set_pos_row(RETROK_OEM_102, 5, 4, 145); /* > -> > */
keyboard_parse_set_pos_row(RETROK_SLASH, 6, 7, 8); /* / -> / */
keyboard_parse_set_pos_row(RETROK_RSHIFT, 1, 7, 2); /* Right Shift -> Right Shift */
keyboard_parse_set_pos_row(RETROK_RSHIFT, 1, 7, 4); /* Right Shift -> Right Shift */
keyboard_parse_set_pos_row(RETROK_SPACE, 7, 4, 8); /* Space -> Space */
keyboard_parse_set_pos_row(RETROK_UP, 5, 3, 8); /* Up -> CRSR UP */
@ -582,12 +599,12 @@ static void libretro_keyboard()
keyboard_parse_set_pos_row(RETROK_F1, 0, 4, 8); /* F1 -> F1 */
keyboard_parse_set_pos_row(RETROK_F2, 0, 5, 8); /* F2 -> F2 */
keyboard_parse_set_pos_row(RETROK_F3, 0, 6, 8); /* F3 -> F3 */
keyboard_parse_set_pos_row(RETROK_F4, 0, 4, 2); /* F4 -> F4 */
keyboard_parse_set_pos_row(RETROK_F5, 0, 5, 2); /* F5 -> F5 */
keyboard_parse_set_pos_row(RETROK_F6, 0, 6, 2); /* F6 -> F6 */
keyboard_parse_set_pos_row(RETROK_F7, 0, 3, 2); /* F7 -> F7 */
keyboard_parse_set_pos_row(RETROK_F4, 0, 4, 1); /* F4 -> F4 */
keyboard_parse_set_pos_row(RETROK_F5, 0, 5, 1); /* F5 -> F5 */
keyboard_parse_set_pos_row(RETROK_F6, 0, 6, 1); /* F6 -> F6 */
keyboard_parse_set_pos_row(RETROK_F7, 0, 3, 1); /* F7 -> F7 */
keyboard_parse_set_pos_row(RETROK_F8, 0, 3, 40); /* F8 -> HELP */
keyboard_parse_set_pos_row(RETROK_F8, 0, 3, 2); /* sF8 -> F7 */
keyboard_parse_set_pos_row(RETROK_F8, 0, 3, 129); /* sF8 -> F7 */
break;
case 1: /* Positional */
@ -620,8 +637,8 @@ static void libretro_keyboard()
keyboard_parse_set_pos_row(RETROK_o, 4, 6, 8); /* O -> O */
keyboard_parse_set_pos_row(RETROK_p, 5, 1, 8); /* P -> P */
keyboard_parse_set_pos_row(RETROK_LEFTBRACKET, 0, 7, 8); /* [ -> @ */
keyboard_parse_set_pos_row(RETROK_INSERT, 0, 2, 8); /* Ins -> Pound */
keyboard_parse_set_pos_row(RETROK_RIGHTBRACKET, 6, 1, 8); /* ] -> * */
keyboard_parse_set_pos_row(RETROK_INSERT, 0, 2, 8); /* Ins -> Pound */
keyboard_parse_set_pos_row(RETROK_RCTRL, 7, 2, 8); /* Right Ctrl -> Right Control*/
keyboard_parse_set_pos_row(RETROK_ESCAPE, 7, 7, 0); /* Esc -> Run/Stop */
@ -650,8 +667,10 @@ static void libretro_keyboard()
keyboard_parse_set_pos_row(RETROK_m, 4, 4, 8); /* M -> M */
keyboard_parse_set_pos_row(RETROK_COMMA, 5, 7, 8); /* , -> , */
keyboard_parse_set_pos_row(RETROK_PERIOD, 5, 4, 8); /* . -> . */
keyboard_parse_set_pos_row(RETROK_OEM_102, 5, 7, 33); /* < -> < */
keyboard_parse_set_pos_row(RETROK_OEM_102, 5, 4, 145); /* > -> > */
keyboard_parse_set_pos_row(RETROK_SLASH, 6, 7, 8); /* / -> / */
keyboard_parse_set_pos_row(RETROK_RSHIFT, 1, 7, 2); /* Right Shift -> Right Shift */
keyboard_parse_set_pos_row(RETROK_RSHIFT, 1, 7, 4); /* Right Shift -> Right Shift */
keyboard_parse_set_pos_row(RETROK_SPACE, 7, 4, 8); /* Space -> Space */
keyboard_parse_set_pos_row(RETROK_UP, 5, 3, 8); /* Up -> CRSR UP */
@ -662,12 +681,12 @@ static void libretro_keyboard()
keyboard_parse_set_pos_row(RETROK_F1, 0, 4, 8); /* F1 -> F1 */
keyboard_parse_set_pos_row(RETROK_F2, 0, 5, 8); /* F2 -> F2 */
keyboard_parse_set_pos_row(RETROK_F3, 0, 6, 8); /* F3 -> F3 */
keyboard_parse_set_pos_row(RETROK_F4, 0, 4, 2); /* F4 -> F4 */
keyboard_parse_set_pos_row(RETROK_F5, 0, 5, 2); /* F5 -> F5 */
keyboard_parse_set_pos_row(RETROK_F6, 0, 6, 2); /* F6 -> F6 */
keyboard_parse_set_pos_row(RETROK_F7, 0, 3, 2); /* F7 -> F7 */
keyboard_parse_set_pos_row(RETROK_F4, 0, 4, 1); /* F4 -> F4 */
keyboard_parse_set_pos_row(RETROK_F5, 0, 5, 1); /* F5 -> F5 */
keyboard_parse_set_pos_row(RETROK_F6, 0, 6, 1); /* F6 -> F6 */
keyboard_parse_set_pos_row(RETROK_F7, 0, 3, 1); /* F7 -> F7 */
keyboard_parse_set_pos_row(RETROK_F8, 0, 3, 40); /* F8 -> HELP */
keyboard_parse_set_pos_row(RETROK_F8, 0, 3, 2); /* sF8 -> F7 */
keyboard_parse_set_pos_row(RETROK_F8, 0, 3, 129); /* sF8 -> F7 */
break;
}
@ -684,38 +703,41 @@ static void libretro_keyboard()
keyboard_parse_set_pos_row(RETROK_ESCAPE, 9, 0, 8); /* Esc -> ESC */
keyboard_parse_set_pos_row(RETROK_TAB, 8, 3, 8); /* Tab -> TAB */
keyboard_parse_set_pos_row(RETROK_LALT, 10, 0, 8); /* Left Alt -> ALT */
keyboard_parse_set_neg_row(RETROK_PAGEDOWN, -4, 1); /* PageDn -> CAPS */
keyboard_parse_set_neg_row(RETROK_RALT, -4, 1); /* Right Alt -> CAPS */
keyboard_parse_set_pos_row(RETROK_HELP, 8, 0, 8); /* Help -> HELP */
keyboard_parse_set_pos_row(RETROK_END, 9, 3, 8); /* End -> LINE FEED */
keyboard_parse_set_pos_row(RETROK_BACKQUOTE, 7, 1, 32); /* ` -> Left Arrow */
keyboard_parse_set_pos_row(RETROK_BACKQUOTE, 6, 6, 1); /* ~ -> Pi */
keyboard_parse_set_pos_row(RETROK_1, 7, 0, 8); /* 1 -> 1 */
keyboard_parse_set_pos_row(RETROK_2, 7, 3, 32); /* 2 -> 2 */
keyboard_parse_set_pos_row(RETROK_2, 5, 6, 16); /* @ -> @ */
keyboard_parse_set_pos_row(RETROK_2, 5, 6, 144); /* @ -> @ */
keyboard_parse_set_pos_row(RETROK_AT, 5, 6, 0); /* @ -> @ */
keyboard_parse_set_pos_row(RETROK_3, 1, 0, 8); /* 3 -> 3 */
keyboard_parse_set_pos_row(RETROK_4, 1, 3, 8); /* 4 -> 4 */
keyboard_parse_set_pos_row(RETROK_DOLLAR, 1, 3, 1); /* $ -> $ */
keyboard_parse_set_pos_row(RETROK_5, 2, 0, 8); /* 5 -> 5 */
keyboard_parse_set_pos_row(RETROK_6, 2, 3, 32); /* 6 -> 6 */
keyboard_parse_set_pos_row(RETROK_6, 6, 6, 16); /* ^ -> ^ */
keyboard_parse_set_pos_row(RETROK_6, 6, 6, 144); /* ^ -> ^ */
keyboard_parse_set_pos_row(RETROK_7, 3, 0, 32); /* 7 -> 7 */
keyboard_parse_set_pos_row(RETROK_7, 2, 3, 1); /* & -> & */
keyboard_parse_set_pos_row(RETROK_7, 2, 3, 129); /* & -> & */
keyboard_parse_set_pos_row(RETROK_8, 3, 3, 32); /* 8 -> 8 */
keyboard_parse_set_pos_row(RETROK_8, 6, 1, 16); /* * -> * */
keyboard_parse_set_pos_row(RETROK_8, 6, 1, 144); /* * -> * */
keyboard_parse_set_pos_row(RETROK_9, 4, 0, 32); /* 9 -> 9 */
keyboard_parse_set_pos_row(RETROK_9, 3, 3, 1); /* ( -> ) */
keyboard_parse_set_pos_row(RETROK_9, 3, 3, 129); /* ( -> ) */
keyboard_parse_set_pos_row(RETROK_0, 4, 3, 32); /* 0 -> 0 */
keyboard_parse_set_pos_row(RETROK_0, 4, 0, 1); /* ) -> ) */
keyboard_parse_set_pos_row(RETROK_MINUS, 5, 3, 8); /* - -> - */
keyboard_parse_set_pos_row(RETROK_0, 4, 0, 129); /* ) -> ) */
keyboard_parse_set_pos_row(RETROK_MINUS, 5, 3, 32); /* - -> - */
keyboard_parse_set_pos_row(RETROK_MINUS, 5, 6, 2192);/* _ -> _ */
keyboard_parse_set_pos_row(RETROK_EQUALS, 6, 5, 32); /* = -> = */
keyboard_parse_set_pos_row(RETROK_EQUALS, 5, 0, 16); /* + -> + */
keyboard_parse_set_pos_row(RETROK_EQUALS, 5, 0, 144); /* + -> + */
keyboard_parse_set_pos_row(RETROK_PLUS, 5, 0, 8); /* + -> + */
keyboard_parse_set_pos_row(RETROK_BACKSLASH, 6, 0, 8); /* \ -> Pound */
keyboard_parse_set_pos_row(RETROK_HOME, 6, 3, 8); /* Home -> CLR/HOME */
keyboard_parse_set_pos_row(RETROK_INSERT, 0, 0, 1); /* Insert -> INS */
keyboard_parse_set_pos_row(RETROK_DELETE, 0, 0, 8); /* Delete -> DEL */
keyboard_parse_set_pos_row(RETROK_BACKSPACE, 0, 0, 8); /* Backspace -> DEL */
keyboard_parse_set_pos_row(RETROK_BACKSPACE, 0, 0, 0); /* Backspace -> DEL */
keyboard_parse_set_pos_row(RETROK_LCTRL, 7, 2, 8); /* Left Ctrl -> CONTROL */
keyboard_parse_set_pos_row(RETROK_q, 7, 6, 8); /* Q -> Q */
@ -730,9 +752,8 @@ static void libretro_keyboard()
keyboard_parse_set_pos_row(RETROK_p, 5, 1, 8); /* P -> P */
keyboard_parse_set_pos_row(RETROK_LEFTBRACKET, 5, 5, 1); /* [ -> [ */
keyboard_parse_set_pos_row(RETROK_RIGHTBRACKET, 6, 2, 1); /* ] -> ] */
keyboard_parse_set_pos_row(RETROK_PAGEDOWN, 6, 6, 8); /* PageDn -> Up Arrow */
keyboard_parse_set_pos_row(RETROK_BACKQUOTE, 6, 6, 1); /* ~ -> Pi */
keyboard_parse_set_neg_row(RETROK_PAGEUP, -3, 0); /* PageUp -> Restore */
keyboard_parse_set_pos_row(RETROK_PAGEDOWN, 6, 6, 8); /* PageDn -> Up Arrow */
keyboard_parse_set_pos_row(RETROK_CAPSLOCK, 1, 7, 64); /* Caps Lock -> Shift Lock */
keyboard_parse_set_pos_row(RETROK_a, 1, 2, 8); /* A -> A */
@ -745,9 +766,9 @@ static void libretro_keyboard()
keyboard_parse_set_pos_row(RETROK_k, 4, 5, 8); /* K -> K */
keyboard_parse_set_pos_row(RETROK_l, 5, 2, 8); /* L -> L */
keyboard_parse_set_pos_row(RETROK_SEMICOLON, 6, 2, 32); /* ; -> ; */
keyboard_parse_set_pos_row(RETROK_SEMICOLON, 5, 5, 16); /* : -> : */
keyboard_parse_set_pos_row(RETROK_SEMICOLON, 5, 5, 144); /* : -> : */
keyboard_parse_set_pos_row(RETROK_QUOTE, 3, 0, 33); /* ' -> ' */
keyboard_parse_set_pos_row(RETROK_QUOTE, 7, 3, 1); /* " -> " */
keyboard_parse_set_pos_row(RETROK_QUOTE, 7, 3, 129); /* " -> " */
keyboard_parse_set_pos_row(RETROK_RETURN, 0, 1, 8); /* Return -> RETURN */
keyboard_parse_set_pos_row(RETROK_LALT, 7, 5, 8); /* Left Alt -> C= */
@ -762,7 +783,7 @@ static void libretro_keyboard()
keyboard_parse_set_pos_row(RETROK_COMMA, 5, 7, 8); /* , -> , */
keyboard_parse_set_pos_row(RETROK_PERIOD, 5, 4, 8); /* . -> . */
keyboard_parse_set_pos_row(RETROK_OEM_102, 5, 7, 33); /* < -> < */
keyboard_parse_set_pos_row(RETROK_OEM_102, 5, 4, 1); /* > -> > */
keyboard_parse_set_pos_row(RETROK_OEM_102, 5, 4, 145); /* > -> > */
keyboard_parse_set_pos_row(RETROK_SLASH, 6, 7, 8); /* / -> / */
keyboard_parse_set_pos_row(RETROK_RSHIFT, 6, 4, 4); /* Right Shift -> Right Shift */
keyboard_parse_set_pos_row(RETROK_SPACE, 7, 4, 8); /* Space -> Space */
@ -872,6 +893,8 @@ static void libretro_keyboard()
keyboard_parse_set_pos_row(RETROK_m, 4, 4, 8); /* M -> M */
keyboard_parse_set_pos_row(RETROK_COMMA, 5, 7, 8); /* , -> , */
keyboard_parse_set_pos_row(RETROK_PERIOD, 5, 4, 8); /* . -> . */
keyboard_parse_set_pos_row(RETROK_OEM_102, 5, 7, 33); /* < -> < */
keyboard_parse_set_pos_row(RETROK_OEM_102, 5, 4, 145); /* > -> > */
keyboard_parse_set_pos_row(RETROK_SLASH, 6, 7, 8); /* / -> / */
keyboard_parse_set_pos_row(RETROK_RSHIFT, 6, 4, 4); /* Right Shift -> Right Shift */
keyboard_parse_set_pos_row(RETROK_SPACE, 7, 4, 8); /* Space -> Space */
@ -905,35 +928,45 @@ static void libretro_keyboard()
kbd_rshiftcol = 4;
vshift = KEY_RSHIFT;
shiftl = KEY_LSHIFT;
kbd_lcbmrow = 7;
kbd_lcbmcol = 5;
vcbm = KEY_LCBM;
kbd_lctrlrow = 7;
kbd_lctrlcol = 2;
vctrl = KEY_LCTRL;
switch (opt_keyboard_keymap)
{
case 0: /* Symbolic */
keyboard_parse_set_pos_row(RETROK_BACKQUOTE, 7, 1, 32); /* ` -> Left Arrow */
keyboard_parse_set_pos_row(RETROK_BACKQUOTE, 6, 6, 1); /* ~ -> Pi */
keyboard_parse_set_pos_row(RETROK_1, 7, 0, 8); /* 1 -> 1 */
keyboard_parse_set_pos_row(RETROK_2, 7, 3, 32); /* 2 -> 2 */
keyboard_parse_set_pos_row(RETROK_2, 5, 6, 16); /* @ -> @ */
keyboard_parse_set_pos_row(RETROK_2, 5, 6, 144); /* @ -> @ */
keyboard_parse_set_pos_row(RETROK_AT, 5, 6, 0); /* @ -> @ */
keyboard_parse_set_pos_row(RETROK_3, 1, 0, 8); /* 3 -> 3 */
keyboard_parse_set_pos_row(RETROK_4, 1, 3, 8); /* 4 -> 4 */
keyboard_parse_set_pos_row(RETROK_DOLLAR, 1, 3, 1); /* $ -> $ */
keyboard_parse_set_pos_row(RETROK_5, 2, 0, 8); /* 5 -> 5 */
keyboard_parse_set_pos_row(RETROK_6, 2, 3, 32); /* 6 -> 6 */
keyboard_parse_set_pos_row(RETROK_6, 6, 6, 16); /* ^ -> ^ */
keyboard_parse_set_pos_row(RETROK_6, 6, 6, 144); /* ^ -> ^ */
keyboard_parse_set_pos_row(RETROK_7, 3, 0, 32); /* 7 -> 7 */
keyboard_parse_set_pos_row(RETROK_7, 2, 3, 1); /* & -> & */
keyboard_parse_set_pos_row(RETROK_7, 2, 3, 129); /* & -> & */
keyboard_parse_set_pos_row(RETROK_8, 3, 3, 32); /* 8 -> 8 */
keyboard_parse_set_pos_row(RETROK_8, 6, 1, 16); /* * -> * */
keyboard_parse_set_pos_row(RETROK_8, 6, 1, 144); /* * -> * */
keyboard_parse_set_pos_row(RETROK_9, 4, 0, 32); /* 9 -> 9 */
keyboard_parse_set_pos_row(RETROK_9, 3, 3, 1); /* ( -> ) */
keyboard_parse_set_pos_row(RETROK_9, 3, 3, 129); /* ( -> ) */
keyboard_parse_set_pos_row(RETROK_0, 4, 3, 32); /* 0 -> 0 */
keyboard_parse_set_pos_row(RETROK_0, 4, 0, 1); /* ) -> ) */
keyboard_parse_set_pos_row(RETROK_MINUS, 5, 3, 8); /* - -> - */
keyboard_parse_set_pos_row(RETROK_0, 4, 0, 129); /* ) -> ) */
keyboard_parse_set_pos_row(RETROK_MINUS, 5, 3, 32); /* - -> - */
keyboard_parse_set_pos_row(RETROK_MINUS, 5, 6, 2192);/* _ -> _ */
keyboard_parse_set_pos_row(RETROK_EQUALS, 6, 5, 32); /* = -> = */
keyboard_parse_set_pos_row(RETROK_EQUALS, 5, 0, 16); /* + -> + */
keyboard_parse_set_pos_row(RETROK_EQUALS, 5, 0, 144); /* + -> + */
keyboard_parse_set_pos_row(RETROK_PLUS, 5, 0, 8); /* + -> + */
keyboard_parse_set_pos_row(RETROK_BACKSLASH, 6, 0, 8); /* \ -> Pound */
keyboard_parse_set_pos_row(RETROK_HOME, 6, 3, 8); /* Home -> CLR/HOME */
keyboard_parse_set_pos_row(RETROK_INSERT, 0, 0, 1); /* Insert -> INS */
keyboard_parse_set_pos_row(RETROK_DELETE, 0, 0, 8); /* Delete -> DEL */
keyboard_parse_set_pos_row(RETROK_BACKSPACE, 0, 0, 8); /* Backspace -> DEL */
keyboard_parse_set_pos_row(RETROK_BACKSPACE, 0, 0, 0); /* Backspace -> DEL */
keyboard_parse_set_pos_row(RETROK_LCTRL, 7, 2, 8); /* Left Ctrl -> Ctrl */
keyboard_parse_set_pos_row(RETROK_q, 7, 6, 8); /* Q -> Q */
@ -948,7 +981,6 @@ static void libretro_keyboard()
keyboard_parse_set_pos_row(RETROK_p, 5, 1, 8); /* P -> P */
keyboard_parse_set_pos_row(RETROK_LEFTBRACKET, 5, 5, 1); /* [ -> [ */
keyboard_parse_set_pos_row(RETROK_RIGHTBRACKET, 6, 2, 1); /* ] -> ] */
keyboard_parse_set_pos_row(RETROK_BACKQUOTE, 6, 6, 1); /* ~ -> Pi */
keyboard_parse_set_neg_row(RETROK_PAGEUP, -3, 0); /* PageUp -> Restore */
keyboard_parse_set_pos_row(RETROK_ESCAPE, 7, 7, 8); /* Esc -> RUN/STOP */
@ -963,9 +995,9 @@ static void libretro_keyboard()
keyboard_parse_set_pos_row(RETROK_k, 4, 5, 8); /* K -> K */
keyboard_parse_set_pos_row(RETROK_l, 5, 2, 8); /* L -> L */
keyboard_parse_set_pos_row(RETROK_SEMICOLON, 6, 2, 32); /* ; -> ; */
keyboard_parse_set_pos_row(RETROK_SEMICOLON, 5, 5, 16); /* : -> : */
keyboard_parse_set_pos_row(RETROK_SEMICOLON, 5, 5, 144); /* : -> : */
keyboard_parse_set_pos_row(RETROK_QUOTE, 3, 0, 33); /* ' -> ' */
keyboard_parse_set_pos_row(RETROK_QUOTE, 7, 3, 1); /* " -> " */
keyboard_parse_set_pos_row(RETROK_QUOTE, 7, 3, 129); /* " -> " */
keyboard_parse_set_pos_row(RETROK_RETURN, 0, 1, 8); /* Return -> Return */
keyboard_parse_set_pos_row(RETROK_TAB, 7, 5, 8); /* Tab -> C= */
@ -980,7 +1012,7 @@ static void libretro_keyboard()
keyboard_parse_set_pos_row(RETROK_COMMA, 5, 7, 8); /* , -> , */
keyboard_parse_set_pos_row(RETROK_PERIOD, 5, 4, 8); /* . -> . */
keyboard_parse_set_pos_row(RETROK_OEM_102, 5, 7, 33); /* < -> < */
keyboard_parse_set_pos_row(RETROK_OEM_102, 5, 4, 1); /* > -> > */
keyboard_parse_set_pos_row(RETROK_OEM_102, 5, 4, 145); /* > -> > */
keyboard_parse_set_pos_row(RETROK_SLASH, 6, 7, 8); /* / -> / */
keyboard_parse_set_pos_row(RETROK_RSHIFT, 6, 4, 4); /* Right Shift -> Right Shift */
keyboard_parse_set_pos_row(RETROK_SPACE, 7, 4, 8); /* Space -> Space */
@ -1062,7 +1094,7 @@ static void libretro_keyboard()
keyboard_parse_set_pos_row(RETROK_COMMA, 5, 7, 8); /* , -> , */
keyboard_parse_set_pos_row(RETROK_PERIOD, 5, 4, 8); /* . -> . */
keyboard_parse_set_pos_row(RETROK_OEM_102, 5, 7, 33); /* < -> < */
keyboard_parse_set_pos_row(RETROK_OEM_102, 5, 4, 1); /* > -> > */
keyboard_parse_set_pos_row(RETROK_OEM_102, 5, 4, 145); /* > -> > */
keyboard_parse_set_pos_row(RETROK_SLASH, 6, 7, 8); /* / -> / */
keyboard_parse_set_pos_row(RETROK_RSHIFT, 6, 4, 4); /* Right Shift -> Right Shift */
keyboard_parse_set_pos_row(RETROK_SPACE, 7, 4, 8); /* Space -> Space */

2
vice/src/arch/libretro/main.c → retrodep/main.c
View File

@ -10,7 +10,7 @@ int skel_main(int argc, char *argv[])
return main_program(argc, argv);
}
void vice_main_exit()
void main_exit()
{
machine_shutdown();
}

0
vice/src/arch/libretro/monitor/asm6502.c → retrodep/monitor/asm6502.c
View File

0
vice/src/arch/libretro/monitor/asm6502dtv.c → retrodep/monitor/asm6502dtv.c
View File

0
vice/src/arch/libretro/monitor/asm65816.c → retrodep/monitor/asm65816.c
View File

0
vice/src/arch/libretro/monitor/asm6809.c → retrodep/monitor/asm6809.c
View File

0
vice/src/arch/libretro/monitor/asmR65C02.c → retrodep/monitor/asmR65C02.c
View File

0
vice/src/arch/libretro/monitor/asmz80.c → retrodep/monitor/asmz80.c
View File

0
vice/src/arch/libretro/monitor/mon_util.c → retrodep/monitor/mon_util.c
View File

33
vice/src/arch/libretro/monitor/monitor.c → retrodep/monitor/monitor.c
View File

@ -598,7 +598,7 @@ void mon_start_assemble_mode(MON_ADDR addr, char *asm_line)
/* Memory. */
void mon_display_screen(void)
void mon_display_screen(long addr)
{
}
@ -614,8 +614,8 @@ void mon_display_io_regs(MON_ADDR addr)
{
}
void mon_ioreg_add_list(mem_ioreg_list_t **list, const char *name,
int start_, int end_, void *dump, void *context)
void mon_ioreg_add_list(struct mem_ioreg_list_s **list, const char *name,
int start, int end, void *dump, void *context, int mirror_mode)
{
}
@ -842,3 +842,30 @@ void monitor_startup_trap(void)
void mon_maincpu_toggle_trace(int state)
{
}
void monitor_vsync_hook(void)
{
}
/* 3.5 -> */
void mon_update_all_checkpoint_state(void)
{
}
int monitor_is_binary(void)
{
return 0;
}
void monitor_binary_ui_jam_dialog(const char *format, ...)
{
}
void monitor_reset_hook(void)
{
}
void monitor_resources_shutdown(void)
{
}

6
vice/src/arch/libretro/monitor/monitor_network.c → retrodep/monitor/monitor_network.c
View File

@ -144,7 +144,7 @@ static char * monitor_network_extract_text_command_line(char * pbuffer, int buff
assert(cr_end != NULL);
*cr_start = 0;
p = lib_stralloc(pbuffer);
p = lib_strdup(pbuffer);
memmove(pbuffer, cr_end + 1, strlen(cr_end + 1));
@ -155,7 +155,7 @@ static char * monitor_network_extract_text_command_line(char * pbuffer, int buff
/* we have a command that is too large:
* process it anyway, so the sender knows something is wrong
*/
p = lib_stralloc(pbuffer);
p = lib_strdup(pbuffer);
*pbuffer_pos = 0;
pbuffer[0] = 0;
break;
@ -587,7 +587,7 @@ int monitor_network_transmit(const char * buffer, size_t buffer_length)
return 0;
}
char * monitor_network_get_command_line(void)
int monitor_network_get_command_line(char **prompt)
{
return 0;
}

41
vice/src/arch/libretro/mousedrv.c → retrodep/mousedrv.c
View File

@ -34,11 +34,6 @@
#include "ui.h"
#include "vsyncapi.h"
extern unsigned int opt_mouse_speed;
int mouse_x, mouse_y;
int mouse_accelx = 1, mouse_accely = 1;
static unsigned long mouse_timestamp = 0;
static mouse_func_t mouse_funcs;
void mousedrv_mouse_changed(void)
@ -103,39 +98,3 @@ void mouse_button(int bnumber, int state)
}
}
int mousedrv_get_x(void)
{
return mouse_x;
}
int mousedrv_get_y(void)
{
return mouse_y;
}
void mouse_move(int x, int y)
{
#if 0
printf("x:%3d y:%3d, mx:%5d my:%5d\n", x, y, mouse_x, mouse_y);
#endif
int x_new = (x * (float)opt_mouse_speed) / 100.0f;
int y_new = (y * (float)opt_mouse_speed) / 100.0f;
if (abs(x_new) < 1 && x != 0)
x_new = (x < 0) ? -1 : 1;
if (abs(y_new) < 1 && y != 0)
y_new = (y < 0) ? -1 : 1;
mouse_x += x_new;
mouse_y -= y_new;
mouse_timestamp = vsyncarch_gettime() * 100;
#if 0
printf(" mx:%5d my:%5d, x_new:%4d y_new:%4d, ts:%d\n", mouse_x, mouse_y, x_new, y_new, mouse_timestamp);
#endif
}
unsigned long mousedrv_get_timestamp(void)
{
return mouse_timestamp;
}

13
vice/src/arch/libretro/mousedrv.h → retrodep/mousedrv.h
View File

@ -27,6 +27,7 @@
#define VICE_MOUSEDRV_H
#include "types.h"
#include "mouse.h"
extern int mousedrv_resources_init(mouse_func_t *funcs);
@ -35,14 +36,12 @@ extern void mousedrv_init(void);
extern void mousedrv_mouse_changed(void);
extern int mousedrv_get_x(void);
extern int mousedrv_get_y(void);
extern unsigned long mousedrv_get_timestamp(void);
extern void mouse_button(int bnumber, int state);
extern void mouse_move(int x, int y);
extern int mouse_x, mouse_y;
extern int mouse_accelx, mouse_accely;
extern void mousedrv_button_left(int pressed);
extern void mousedrv_button_right(int pressed);
extern void mousedrv_button_middle(int pressed);
extern void mousedrv_button_up(int pressed);
extern void mousedrv_button_down(int pressed);
#endif

14
retrodep/printerdrv/drv-1520.c Normal file
View File

@ -0,0 +1,14 @@
int drv_1520_init_resources(void)
{
return 0;
}
int drv_1520_init(void)
{
return 0;
}
void drv_1520_shutdown(void)
{
}

13
retrodep/printerdrv/drv-mps803.c Normal file
View File

@ -0,0 +1,13 @@
int drv_mps803_init_resources(void)
{
return 0;
}
int drv_mps803_init(void)
{
return 0;
}
void drv_mps803_shutdown(void)
{
}

17
retrodep/printerdrv/drv-nl10.c Normal file
View File

@ -0,0 +1,17 @@
int drv_nl10_init_resources(void)
{
return 0;
}
int drv_nl10_init(void)
{
return 0;
}
void drv_nl10_shutdown(void)
{
}
void drv_nl10_reset(void)
{
}

7
retrodep/samplerdrv/file_drv.c Normal file
View File

@ -0,0 +1,7 @@
void fileaudio_init(void)
{
}
void fileaudio_shutdown(void)
{
}

31
retrodep/samplerdrv/sampler.c Normal file
View File

@ -0,0 +1,31 @@
int sampler_resources_init(void)
{
return 0;
}
void sampler_resources_shutdown(void)
{
}
int sampler_cmdline_options_init(void)
{
return 0;
}
void sampler_reset(void)
{
}
void sampler_start(int channels, char *devname)
{
}
void sampler_stop(void)
{
}
int sampler_get_sample(int channel)
{
return 0;
}

0
vice/src/arch/gtk3/signals.c → retrodep/signals.c
View File

2397
retrodep/snapshot_stream.c Normal file
View File

File diff suppressed because it is too large Load Diff

169
retrodep/snapshot_stream.h Normal file
View File

@ -0,0 +1,169 @@
#ifndef SNAPSHOT_STREAM_H
#define SNAPSHOT_STREAM_H
#include "types.h"
#define SNAPSHOT_MACHINE_NAME_LEN 16
#define SNAPSHOT_MODULE_NAME_LEN 16
#define SNAPSHOT_NO_ERROR 0
#define SNAPSHOT_WRITE_EOF_ERROR 1
#define SNAPSHOT_WRITE_BYTE_ARRAY_ERROR 2
#define SNAPSHOT_READ_EOF_ERROR 3
#define SNAPSHOT_READ_BYTE_ARRAY_ERROR 4
#define SNAPSHOT_ILLEGAL_STRING_LENGTH_ERROR 5
#define SNAPSHOT_READ_OUT_OF_BOUNDS_ERROR 6
#define SNAPSHOT_ILLEGAL_OFFSET_ERROR 7
#define SNAPSHOT_FIRST_MODULE_NOT_FOUND_ERROR 8
#define SNAPSHOT_MODULE_HEADER_READ_ERROR 9
#define SNAPSHOT_MODULE_NOT_FOUND_ERROR 10
#define SNAPSHOT_MODULE_CLOSE_ERROR 11
#define SNAPSHOT_MODULE_SKIP_ERROR 12
#define SNAPSHOT_CANNOT_CREATE_SNAPSHOT_ERROR 13
#define SNAPSHOT_CANNOT_WRITE_MAGIC_STRING_ERROR 14
#define SNAPSHOT_CANNOT_WRITE_VERSION_ERROR 15
#define SNAPSHOT_CANNOT_WRITE_MACHINE_NAME_ERROR 16
#define SNAPSHOT_CANNOT_OPEN_FOR_READ_ERROR 17
#define SNAPSHOT_MAGIC_STRING_MISMATCH_ERROR 18
#define SNAPSHOT_CANNOT_READ_VERSION_ERROR 19
#define SNAPSHOT_CANNOT_READ_MACHINE_NAME_ERROR 20
#define SNAPSHOT_MACHINE_MISMATCH_ERROR 21
#define SNAPSHOT_READ_CLOSE_EOF_ERROR 22
#define SNAPSHOT_WRITE_CLOSE_EOF_ERROR 23
#define SNAPSHOT_MODULE_HIGHER_VERSION 24
#define SNAPSHOT_MODULE_INCOMPATIBLE 25
#define SNAPSHOT_CANNOT_WRITE_SNAPSHOT 26
#define SNAPSHOT_CANNOT_READ_SNAPSHOT 27
#define SNAPSHOT_MODULE_NOT_IMPLEMENTED 28
typedef struct snapshot_module_s snapshot_module_t;
typedef struct snapshot_s snapshot_t;
extern void snapshot_display_error(void);
extern int snapshot_module_write_byte(snapshot_module_t *m, uint8_t data);
extern int snapshot_module_write_word(snapshot_module_t *m, uint16_t data);
extern int snapshot_module_write_dword(snapshot_module_t *m, uint32_t data);
extern int snapshot_module_write_double(snapshot_module_t *m, double db);
extern int snapshot_module_write_padded_string(snapshot_module_t *m,
const char *s, uint8_t pad_char,
int len);
extern int snapshot_module_write_byte_array(snapshot_module_t *m, const uint8_t *data,
unsigned int num);
extern int snapshot_module_write_word_array(snapshot_module_t *m, const uint16_t *data,
unsigned int num);
extern int snapshot_module_write_dword_array(snapshot_module_t *m, const uint32_t *data,
unsigned int num);
extern int snapshot_module_write_string(snapshot_module_t *m, const char *s);
extern int snapshot_module_read_byte(snapshot_module_t *m, uint8_t *b_return);
extern int snapshot_module_read_word(snapshot_module_t *m, uint16_t *w_return);
extern int snapshot_module_read_dword(snapshot_module_t *m, uint32_t *dw_return);
extern int snapshot_module_read_double(snapshot_module_t *m, double *db_return);
extern int snapshot_module_read_byte_array(snapshot_module_t *m,
uint8_t *b_return, unsigned int num);
extern int snapshot_module_read_word_array(snapshot_module_t *m,
uint16_t *w_return, unsigned int num);
extern int snapshot_module_read_dword_array(snapshot_module_t *m,
uint32_t *dw_return,
unsigned int num);
extern int snapshot_module_read_string(snapshot_module_t *m, char **s);
extern int snapshot_module_read_byte_into_int(snapshot_module_t *m,
int *value_return);
extern int snapshot_module_read_word_into_int(snapshot_module_t *m,
int *value_return);
extern int snapshot_module_read_dword_into_ulong(snapshot_module_t *m,
unsigned long *value_return);
extern int snapshot_module_read_dword_into_int(snapshot_module_t *m,
int *value_return);
extern int snapshot_module_read_dword_into_uint(snapshot_module_t *m,
unsigned int *value_return);
#define SMW_B snapshot_module_write_byte
#define SMW_W snapshot_module_write_word
#define SMW_DW snapshot_module_write_dword
#define SMW_DB snapshot_module_write_double
#define SMW_PSTR snapshot_module_write_padded_string
#define SMW_BA snapshot_module_write_byte_array
#define SMW_WA snapshot_module_write_word_array
#define SMW_DWA snapshot_module_write_dword_array
#define SMW_STR snapshot_module_write_string
#define SMR_B snapshot_module_read_byte
#define SMR_W snapshot_module_read_word
#define SMR_DW snapshot_module_read_dword
#define SMR_DB snapshot_module_read_double
#define SMR_BA snapshot_module_read_byte_array
#define SMR_WA snapshot_module_read_word_array
#define SMR_DWA snapshot_module_read_dword_array
#define SMR_STR snapshot_module_read_string
#define SMR_B_INT snapshot_module_read_byte_into_int
#define SMR_W_INT snapshot_module_read_word_into_int
#define SMR_DW_UL snapshot_module_read_dword_into_ulong
#define SMR_DW_INT snapshot_module_read_dword_into_int
#define SMR_DW_UINT snapshot_module_read_dword_into_uint
extern snapshot_module_t *snapshot_module_create(snapshot_t *s,
const char *name,
uint8_t major_version,
uint8_t minor_version);
extern snapshot_module_t *snapshot_module_open(snapshot_t *s,
const char *name,
uint8_t *major_version_return,
uint8_t *minor_version_return);
extern int snapshot_module_close(snapshot_module_t *m);
extern snapshot_t *snapshot_create(const char *filename,
uint8_t major_version, uint8_t minor_version,
const char *snapshot_machine_name);
extern snapshot_t *snapshot_open(const char *filename,
uint8_t *major_version_return,
uint8_t *minor_version_return,
const char *snapshot_machine_name);
extern int snapshot_close(snapshot_t *s);
extern void snapshot_set_error(int error);
extern int snapshot_get_error(void);
extern int snapshot_version_is_equal(uint8_t major_version, uint8_t minor_version,
uint8_t major_version_required, uint8_t minor_version_required);
extern int snapshot_version_is_bigger(uint8_t major_version, uint8_t minor_version,
uint8_t major_version_required, uint8_t minor_version_required);
extern int snapshot_version_is_smaller(uint8_t major_version, uint8_t minor_version,
uint8_t major_version_required, uint8_t minor_version_required);
/* Stream */
struct snapshot_stream_s;
typedef struct snapshot_stream_s snapshot_stream_t;
extern int machine_write_snapshot_to_stream(struct snapshot_stream_s *stream, int save_roms, int save_disks,
int event_mode);
extern int machine_read_snapshot_from_stream(struct snapshot_stream_s *stream, int event_mode);
extern int snapshot_free(snapshot_t *s);
extern snapshot_t *snapshot_create_from_stream(snapshot_stream_t *f,
uint8_t major_version, uint8_t minor_version,
const char *snapshot_machine_name);
extern snapshot_t *snapshot_open_from_stream(snapshot_stream_t *f,
uint8_t *major_version_return,
uint8_t *minor_version_return,
const char *snapshot_machine_name);
extern snapshot_stream_t* snapshot_file_read_fopen(const char* pathname);
extern snapshot_stream_t* snapshot_file_write_fopen(const char* pathname);
extern snapshot_stream_t* snapshot_memory_read_fopen(const void* buffer, size_t buffer_size);
extern snapshot_stream_t* snapshot_memory_write_fopen(void* buffer, size_t buffer_size);
extern size_t snapshot_read(snapshot_stream_t* f, void* ptr, size_t size);
extern size_t snapshot_write(snapshot_stream_t* f, const void* ptr, size_t size);
extern int snapshot_fseek(snapshot_stream_t *f, long offset, int whence);
extern long snapshot_ftell(snapshot_stream_t *f);
extern int snapshot_fclose(snapshot_stream_t *f);
extern int snapshot_fclose_erase(snapshot_stream_t *f);
#endif

0
vice/src/arch/libretro/socketimpl.h → retrodep/socketimpl.h
View File

4
vice/src/sounddrv/soundretro.c → retrodep/soundretro.c
View File

@ -3,7 +3,7 @@
*
*/
#include <stdio.h>
#ifdef __LIBRETRO__
#include "vice.h"
#include "sound.h"
@ -56,3 +56,5 @@ int sound_init_retro_device(void)
{
return sound_register_device(&retro_device);
}
#endif

12
vice/src/arch/libretro/ui.c → retrodep/ui.c
View File

@ -178,14 +178,16 @@ int ui_init_finalize(void)
resources_set_int("SoundVolume", 0);
/* Sensible defaults */
log_resources_set_int("SoundFragmentSize", SOUND_FRAGMENT_VERY_SMALL);
log_resources_set_int("Mouse", 1);
log_resources_set_int("Printer4", 1);
log_resources_set_int("AutostartPrgMode", 1);
log_resources_set_int("AutostartDelayRandom", 0);
log_resources_set_int("FileSystemDevice8", 0);
log_resources_set_int("FSDevice8ConvertP00", 0);
#if defined(__XCBM2__) || defined(__XPET__)
log_resources_set_int("CrtcFilter", 0);
log_resources_set_int("CrtcStretchVertical", 0);
#if defined(__X64DTV__)
log_resources_set_int("Drive8Type", 0);
#endif
/*** Core options ***/
@ -223,7 +225,7 @@ int ui_init_finalize(void)
log_resources_set_string("CrtcPaletteFile", vice_opt.ExternalPalette);
log_resources_set_int("CrtcExternalPalette", 1);
}
#else
#elif !defined(__X64DTV__)
if (!strcmp(vice_opt.ExternalPalette, "default"))
log_resources_set_int("VICIIExternalPalette", 0);
else
@ -394,7 +396,7 @@ int ui_init_finalize(void)
if (vice_opt.SidExtra)
{
log_resources_set_int("SidStereoAddressStart", vice_opt.SidExtra);
log_resources_set_int("Sid2AddressStart", vice_opt.SidExtra);
log_resources_set_int("SidStereo", 1);
}
else

3
vice/src/arch/libretro/ui.h → retrodep/ui.h
View File

@ -11,11 +11,8 @@
#include "types.h"
#include "uiapi.h"
extern int ui_vblank_sync_enabled();
extern void ui_exit(void);
extern void ui_message(const char *format, ...);
extern void ui_display_speed(float percent, float framerate, int warp_flag);
extern void ui_display_paused(int flag);
extern void ui_dispatch_next_event(void);
extern void ui_dispatch_events(void);

0
vice/src/arch/libretro/uicmdline.c → retrodep/uicmdline.c
View File

0
vice/src/arch/libretro/uimon.c → retrodep/uimon.c
View File

26
vice/src/arch/libretro/uistatusbar.c → retrodep/uistatusbar.c Executable file → Normal file
View File

@ -37,6 +37,7 @@
#include "uiapi.h"
#include "uistatusbar.h"
#include "videoarch.h"
#include "vsyncapi.h"
#include "joystick.h"
#include "archdep.h"
@ -325,15 +326,20 @@ void display_current_image(const char *image, bool inserted)
/* ----------------------------------------------------------------- */
/* ui.h */
void ui_display_speed(float percent, float framerate, int warp_flag)
static void ui_display_speed(void)
{
per = (int)(percent + .5);
double vsync_metric_cpu_percent;
double vsync_metric_emulated_fps;
int vsync_metric_warp_enabled;
vsyncarch_get_metrics(&vsync_metric_cpu_percent, &vsync_metric_emulated_fps, &vsync_metric_warp_enabled);
per = (int)(vsync_metric_cpu_percent + .5);
if (per > 999) {
per = 999;
}
fps = (int)(framerate + .5);
fps = (int)(vsync_metric_emulated_fps + .5);
if (fps > 999) {
fps /= 1000;
fps = (fps > 9) ? 9 : fps;
@ -346,7 +352,7 @@ void ui_display_speed(float percent, float framerate, int warp_flag)
sprintf(fps_str, "%2d", fps);
}
warp = warp_flag;
warp = vsync_metric_warp_enabled;
display_speed();
}
@ -378,7 +384,7 @@ void ui_enable_drive_status(ui_drive_enable_t state, int *drive_led_color)
for (drive_number = 0; drive_number < 4; ++drive_number) {
if (drive_state & 1) {
ui_display_drive_led(drive_number, 0, 0);
ui_display_drive_led(drive_number, 0, 0, 0);
} else {
statusbar_text[STATUSBAR_DRIVE_POS + drive_number] = ' ';
}
@ -427,7 +433,7 @@ void ui_display_drive_track(unsigned int drive_number, unsigned int drive_base,
}
/* The pwm value will vary between 0 and 1000. */
void ui_display_drive_led(int drive_number, unsigned int pwm1, unsigned int led_pwm2)
void ui_display_drive_led(unsigned int drive_number, unsigned int drive_base, unsigned int pwm1, unsigned int led_pwm2)
{
drive_pwm = pwm1;
vice_led_state[1] = (drive_pwm > 1) ? 1 : 0;
@ -447,7 +453,7 @@ void ui_display_drive_led(int drive_number, unsigned int pwm1, unsigned int led_
}
}
void ui_display_drive_current_image(unsigned int drive_number, const char *image)
void ui_display_drive_current_image(unsigned int unit_number, unsigned int drive_number, const char *image)
{
#ifdef SDL_DEBUG
fprintf(stderr, "%s\n", __func__);
@ -679,6 +685,8 @@ void uistatusbar_draw(void)
draw_fbox(bkg_x, bkg_y, bkg_width, bkg_height, 0, GRAPH_ALPHA_100);
ui_display_speed();
if (imagename_timer == 0)
display_joyport();

0
vice/src/arch/libretro/uistatusbar.h → retrodep/uistatusbar.h Executable file → Normal file
View File

62
vice/src/arch/libretro/video.c → retrodep/video.c
View File

@ -22,7 +22,7 @@
#include "libretro-core.h"
struct video_canvas_s *RCANVAS;
struct video_canvas_s *retro_canvas;
int machine_ui_done = 0;
@ -44,12 +44,6 @@ void video_canvas_resize(struct video_canvas_s *canvas, char resizecv)
{
}
#if 0
static video_canvas_t *retro_canvas_create(video_canvas_t *canvas, unsigned int *width, unsigned int *height)
{
return canvas;
}
#endif
video_canvas_t *video_canvas_create(video_canvas_t *canvas,
unsigned int *width, unsigned int *height, int mapped)
{
@ -63,65 +57,22 @@ void video_canvas_destroy(struct video_canvas_s *canvas)
{
}
#if 0
static int video_frame_buffer_alloc(video_canvas_t *canvas,
BYTE **draw_buffer,
unsigned int fb_width,
unsigned int fb_height,
unsigned int *fb_pitch);
static void video_frame_buffer_free(video_canvas_t *canvas,
BYTE *draw_buffer);
static void video_frame_buffer_clear(video_canvas_t *canvas,
BYTE *draw_buffer,
BYTE value,
unsigned int fb_width,
unsigned int fb_height,
unsigned int fb_pitch);
#endif
void video_arch_canvas_init(struct video_canvas_s *canvas)
{
}
#if 0
static int video_frame_buffer_alloc(video_canvas_t *canvas,
BYTE **draw_buffer,
unsigned int fb_width,
unsigned int fb_height,
unsigned int *fb_pitch)
{
return 0;
}
static void video_frame_buffer_free(video_canvas_t *canvas, BYTE *draw_buffer)
{
}
static void video_frame_buffer_clear(video_canvas_t *canvas,
BYTE *draw_buffer,
BYTE value,
unsigned int fb_width,
unsigned int fb_height,
unsigned int fb_pitch)
{
memset(draw_buffer, value, fb_pitch * fb_height);
}
#endif
char video_canvas_can_resize(video_canvas_t *canvas)
{
return 1;
}
int video_canvas_set_palette(struct video_canvas_s *canvas,
struct palette_s *palette)
struct palette_s *palette)
{
unsigned int col;
int i;
unsigned int i, col = 0;
if (palette == NULL) {
return 0; /* no palette, nothing to do */
if (!canvas || !palette) {
return 0; /* No palette, nothing to do */
}
canvas->palette = palette;
@ -134,6 +85,7 @@ int video_canvas_set_palette(struct video_canvas_s *canvas,
video_render_setphysicalcolor(canvas->videoconfig, i, col, canvas->depth);
}
for (i = 0; i < 256; i++) {
if (pix_bytes == 2)
video_render_setrawrgb(i, RGB565(i, 0, 0), RGB565(0, i, 0), RGB565(0, 0, i));
@ -153,7 +105,7 @@ void video_canvas_refresh(struct video_canvas_s *canvas,
#ifdef RETRO_DEBUG
printf("XS:%d YS:%d XI:%d YI:%d W:%d H:%d\n",xs,ys,xi,yi,w,h);
#endif
RCANVAS=canvas;
retro_canvas = canvas;
}
int video_init()

49
retrodep/video/video-render-1x2.c Normal file
View File

@ -0,0 +1,49 @@
/*
* video-render-1x2.c
*
* Written by
* Andreas Boose <viceteam@t-online.de>
* John Selck <graham@cruise.de>
*
* This file is part of VICE, the Versatile Commodore Emulator.
* See README for copyright notice.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
* 02111-1307 USA.
*
*/
#include "vice.h"
#include "render1x2.h"
#include "types.h"
#include "video-render.h"
#include "video.h"
static void video_render_1x2_main(video_render_config_t *config,
const uint8_t *src, uint8_t *trg,
unsigned int width, const unsigned int height,
const unsigned int xs, const unsigned int ys,
const unsigned int xt, const unsigned int yt,
const unsigned int pitchs,
const unsigned int pitcht,
int depth)
{
}
void video_render_1x2_init(void)
{
}

49
retrodep/video/video-render-2x2.c Normal file
View File

@ -0,0 +1,49 @@
/*
* video-render-2x2.c
*
* Written by
* Andreas Boose <viceteam@t-online.de>
* John Selck <graham@cruise.de>
*
* This file is part of VICE, the Versatile Commodore Emulator.
* See README for copyright notice.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
* 02111-1307 USA.
*
*/
#include "vice.h"
#include "render2x2.h"
#include "renderscale2x.h"
#include "types.h"
#include "video-render.h"
#include "video.h"
static void video_render_2x2_main(video_render_config_t *config,
const uint8_t *src, uint8_t *trg,
unsigned int width, const unsigned int height,
const unsigned int xs, const unsigned int ys,
const unsigned int xt, const unsigned int yt,
const unsigned int pitchs,
const unsigned int pitcht,
int depth)
{
}
void video_render_2x2_init(void)
{
}

67
retrodep/video/video-render-crt.c Normal file
View File

@ -0,0 +1,67 @@
/*
* video-render-crt.c - Implementation of framebuffer to physical screen copy
*
* Written by
* groepaz <groepaz@gmx.net>
* John Selck <graham@cruise.de>
* Dag Lem <resid@nimrod.no>
* Andreas Boose <viceteam@t-online.de>
*
* This file is part of VICE, the Versatile Commodore Emulator.
* See README for copyright notice.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
* 02111-1307 USA.
*
*/
#include "vice.h"
#include <stdio.h>
#include "log.h"
#include "machine.h"
#include "render1x1.h"
#include "render1x1crt.h"
#include "render1x1pal.h"
#include "render1x1ntsc.h"
#include "render1x2.h"
#include "render1x2crt.h"
#include "render2x2.h"
#include "render2x2crt.h"
#include "render2x2pal.h"
#include "render2x2ntsc.h"
#include "render2x4.h"
#include "render2x4crt.h"
#include "renderscale2x.h"
#include "resources.h"
#include "types.h"
#include "video-render.h"
#include "video.h"
static int rendermode_error = -1;
static void video_render_crt_main(video_render_config_t *config,
uint8_t *src, uint8_t *trg,
int width, int height, int xs, int ys, int xt,
int yt, int pitchs, int pitcht, int depth,
viewport_t *viewport)
{
}
void video_render_crt_init(void)
{
}

60
retrodep/video/video-render-pal.c Normal file
View File

@ -0,0 +1,60 @@
/*
* video-render-pal.c - Implementation of framebuffer to physical screen copy
*
* Written by
* John Selck <graham@cruise.de>
* Dag Lem <resid@nimrod.no>
* Andreas Boose <viceteam@t-online.de>
*
* This file is part of VICE, the Versatile Commodore Emulator.
* See README for copyright notice.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
* 02111-1307 USA.
*
*/
#include "vice.h"
#include <stdio.h>
#include "log.h"
#include "machine.h"
#include "render1x1.h"
#include "render1x1pal.h"
#include "render1x1ntsc.h"
#include "render1x2.h"
#include "render1x2crt.h"
#include "render2x2.h"
#include "render2x2pal.h"
#include "render2x2ntsc.h"
#include "renderscale2x.h"
#include "resources.h"
#include "types.h"
#include "video-render.h"
#include "video.h"
static void video_render_pal_main(video_render_config_t *config,
uint8_t *src, uint8_t *trg,
int width, int height, int xs, int ys, int xt,
int yt, int pitchs, int pitcht, int depth,
viewport_t *viewport)
{
}
void video_render_pal_init(void)
{
}

37
retrodep/videoarch.h Normal file
View File

@ -0,0 +1,37 @@
#ifndef _VIDEOARCH_H
#define _VIDEOARCH_H
typedef struct video_canvas_s {
/** \brief Nonzero if the structure has been fully realized. */
unsigned int created;
/** \brief Rendering configuration as seen by the emulator
* core. */
struct video_render_config_s *videoconfig;
/** \brief Drawing buffer as seen by the emulator core. */
struct draw_buffer_s *draw_buffer;
/** \brief Display window as seen by the emulator core. */
struct viewport_s *viewport;
/** \brief Machine screen geometry as seen by the emulator
* core. */
struct geometry_s *geometry;
/** \brief Color palette for translating display results into
* window colors. */
struct palette_s *palette;
/** \brief Methods for managing the draw buffer when the core
* rasterizer handles it. */
struct video_draw_buffer_callback_s *video_draw_buffer_callback;
unsigned int depth;
} video_canvas_t;
typedef struct vice_renderer_backend_s {
} vice_renderer_backend_t;
#endif

0
vice/src/arch/libretro/vsidui.c → retrodep/vsidui.c
View File

79
retrodep/vsyncarch.c Normal file
View File

@ -0,0 +1,79 @@
/*
* vsyncarch.c - End-of-frame handling for libretro
*
*/
#include "vice.h"
#include "kbdbuf.h"
#include "ui.h"
#include "uistatusbar.h"
#include "vsyncapi.h"
#include "videoarch.h"
#include "video.h"
#include "resources.h"
#include "libretro-core.h"
#if defined(VITA)
#include <psp2/kernel/threadmgr.h>
#endif
extern struct video_canvas_s *retro_canvas;
#include <time.h>
/*#define TICKSPERSECOND 1000000L*/ /* Microseconds resolution. */
#ifdef HAVE_NANOSLEEP
#define TICKSPERSECOND 1000000000L /* Nanoseconds resolution. */
#define TICKSPERMSEC 1000000L
#define TICKSPERUSEC 1000L
#define TICKSPERNSEC 1L
#else
#define TICKSPERSECOND 1000000L /* Microseconds resolution. */
#define TICKSPERMSEC 1000L
#define TICKSPERUSEC 1L
#endif
/* ------------------------------------------------------------------------- */
/* Number of timer units per second. */
unsigned long vsyncarch_frequency(void)
{
/* Microseconds resolution. */
return TICKSPERSECOND;
}
/* Get time in timer units. */
unsigned long vsyncarch_gettime(void)
{
/* Microseconds resolution. */
return retro_ticks();
}
void vsyncarch_init(void)
{
}
void vsyncarch_presync(void)
{
video_canvas_render(
retro_canvas, (BYTE *)&retro_bmp,
retrow, retroh,
retroXS, retroYS,
0, 0, /*xi, yi,*/
retrow*pix_bytes, 8*pix_bytes
);
if (uistatusbar_state & UISTATUSBAR_ACTIVE) {
uistatusbar_draw();
}
retro_renderloop = 0;
}
void vsyncarch_postsync(void)
{
/* Dispatch all the pending UI events. */
ui_dispatch_events();
}

1
vice/.descr
View File

@ -1 +0,0 @@
Emulates C64, C64DTV, C128, VIC20, PET, PLUS4, CBM-II

60
vice/AUTHORS
View File

@ -1,60 +0,0 @@
Core Team Members:
Marco van den Heuvel <blackystardust68@yahoo.com>
Fabrizio Gennari <fabrizio.ge@tiscalinet.it>
Groepaz <groepaz@gmx.net>
Olaf Seibert <rhialto@falu.nl>
Marcus Sutton <loggedoubt@gmail.com>
Kajtar Zsolt <soci@c64.rulez.org>
AreaScout <areascout@gmx.at>
Bas Wassink <b.wassink@ziggo.nl>
Michael C. Martin <mcmartin@gmail.com>
Inactive/Ex Team Members:
Martin Pottendorfer <pottendo@gmx.net>
Stefan Haubenthal <polluks@users.sourceforge.net>
BSzili <col.lawrence@gmail.com>
Andreas Matthies <andreas.matthies@gmx.net>
Daniel Kahlin <daniel@kahlin.net>
Errol Smith <strobey@users.sourceforge.net>
Benjamin 'BeRo' Rosseaux <benjamin@rosseaux.com>
Ulrich Schulz <peiselulli@t-online.de>
Thomas Giesel <skoe@directbox.com>
Ingo Korb <ingo@akana.de>
Antti S. Lankila <alankila@bel.fi>
Christian Vogelgsang <chris@vogelgsang.org>
Dag Lem <resid@nimrod.no>
Spiro Trikaliotis <Spiro.Trikaliotis@gmx.de>
Hannu Nuotio <hannu.nuotio@tut.fi>
Andreas Boose <viceteam@t-online.de>
Tibor Biczo <crown@mail.matav.hu>
M. Kiesel <mayne@users.sourceforge.net>
Andreas Dehmel <zarquon@t-online.de>
David Hansel <david@hansels.net>
Markus Brenner <markus@brenner.de>
Thomas Bretz <tbretz@ph.tum.de>
Daniel Sladic <sladic@eecg.toronto.edu>
André Fachat <fachat@physik.tu-chemnitz.de>
Ettore Perazzoli <ettore@comm2000.it>
Teemu Rantanen <tvr@cs.hut.fi>
Jouko Valta <jopi@stekt.oulu.fi>
Jarkko Sonninen <sonninen@lut.fi>
Translation Team Members:
Mikkel Holm Olsen <vice-dk@symlink.dk>
Martin Pottendorfer <pottendo@gmx.net>
Manuel Antonio Rodriguez Bas <formater@winuaespanol.com>
Paul Dubé
Czirkos Zoltan <cirix@fw.hu>
Karai Csaba <cskarai@freemail.hu>
Andrea Musuruane <musuruan@bmm.it>
Jesse Lee <interpreters.jesse@gmail.com>
Marco van den Heuvel <blackystardust68@yahoo.com>
Jarek Sobolewski <r@sledinmay.com>
Michael Litvinov <litvinov.m@i.ua>
Peter Krefting <peter@softwolves.pp.se>
Emir Akaydin (aka: Skate) <emir@akaydin.com>

23227
vice/ChangeLog
View File

File diff suppressed because it is too large Load Diff

24875
vice/ChangeLog.1
View File

File diff suppressed because it is too large Load Diff

26180
vice/ChangeLog.2
View File

File diff suppressed because it is too large Load Diff

25543
vice/ChangeLog.3
View File

File diff suppressed because it is too large Load Diff

6712
vice/ChangeLog.4
View File

File diff suppressed because it is too large Load Diff

48
vice/FEEDBACK
View File

@ -1,48 +0,0 @@
It's always nice to receive feedback and/or bugreports about VICE, but
please read these few notes before sending mail to anybody in the
team.
- Please don't send any HTML mail (we really hate that!). If you use
M$ Outlook or Netscape Communicator, make sure you turn off the
"rich text" (HTML) feature.
- Please don't send any binaries without asking first.
- Please read the following documents carefully before reporting a bug
or a problem you cannot solve:
- the VICE documentation (you should have received it with the main
distribution--if not, tell us);
- the VICE knowledge base at http://www.vicekb.de.vu/
- the comp.emulators.cbm and comp.sys.cbm FAQs (available from many
places; one famous repository is at ftp://rtfm.mit.edu/).
- When you report a bug, please try to be as accurate as possible and
describe how it can be reproduced to the very detail. You should
also tell us what machine you are running on, what operating system
you are using as well as the version of it.
- Please don't ask us how to transfer original C64 disk or tapes to
your PC. To transfer disks, you can use the Star Commander
(http://sta.c64.org/sc.html).
- Please don't ask us where to find games for the emulator on the
Internet.
- Please don't ask us when the next version will be out, because we
really don't know.
- Please write in English, or in the native language of the person you
are writing to (All Andreas are German).
In any case, we would be really glad to receive your comments about
VICE.
The central place for bug reports is the bug tracker at sourceforge:
https://sourceforge.net/p/vice-emu/bugs/
The email address for feedback is: vice-emu-mail@lists.sourceforge.net
Thanks!

370
vice/INSTALL
View File

@ -1,370 +0,0 @@
Installation Instructions
*************************
Copyright (C) 1994-1996, 1999-2002, 2004-2013 Free Software Foundation,
Inc.
Copying and distribution of this file, with or without modification,
are permitted in any medium without royalty provided the copyright
notice and this notice are preserved. This file is offered as-is,
without warranty of any kind.
Basic Installation
==================
Briefly, the shell command `./configure && make && make install'
should configure, build, and install this package. The following
more-detailed instructions are generic; see the `README' file for
instructions specific to this package. Some packages provide this
`INSTALL' file but do not implement all of the features documented
below. The lack of an optional feature in a given package is not
necessarily a bug. More recommendations for GNU packages can be found
in *note Makefile Conventions: (standards)Makefile Conventions.
The `configure' shell script attempts to guess correct values for
various system-dependent variables used during compilation. It uses
those values to create a `Makefile' in each directory of the package.
It may also create one or more `.h' files containing system-dependent
definitions. Finally, it creates a shell script `config.status' that
you can run in the future to recreate the current configuration, and a
file `config.log' containing compiler output (useful mainly for
debugging `configure').
It can also use an optional file (typically called `config.cache'
and enabled with `--cache-file=config.cache' or simply `-C') that saves
the results of its tests to speed up reconfiguring. Caching is
disabled by default to prevent problems with accidental use of stale
cache files.
If you need to do unusual things to compile the package, please try
to figure out how `configure' could check whether to do them, and mail
diffs or instructions to the address given in the `README' so they can
be considered for the next release. If you are using the cache, and at
some point `config.cache' contains results you don't want to keep, you
may remove or edit it.
The file `configure.ac' (or `configure.in') is used to create
`configure' by a program called `autoconf'. You need `configure.ac' if
you want to change it or regenerate `configure' using a newer version
of `autoconf'.
The simplest way to compile this package is:
1. `cd' to the directory containing the package's source code and type
`./configure' to configure the package for your system.
Running `configure' might take a while. While running, it prints
some messages telling which features it is checking for.
2. Type `make' to compile the package.
3. Optionally, type `make check' to run any self-tests that come with
the package, generally using the just-built uninstalled binaries.
4. Type `make install' to install the programs and any data files and
documentation. When installing into a prefix owned by root, it is
recommended that the package be configured and built as a regular
user, and only the `make install' phase executed with root
privileges.
5. Optionally, type `make installcheck' to repeat any self-tests, but
this time using the binaries in their final installed location.
This target does not install anything. Running this target as a
regular user, particularly if the prior `make install' required
root privileges, verifies that the installation completed
correctly.
6. You can remove the program binaries and object files from the
source code directory by typing `make clean'. To also remove the
files that `configure' created (so you can compile the package for
a different kind of computer), type `make distclean'. There is
also a `make maintainer-clean' target, but that is intended mainly
for the package's developers. If you use it, you may have to get
all sorts of other programs in order to regenerate files that came
with the distribution.
7. Often, you can also type `make uninstall' to remove the installed
files again. In practice, not all packages have tested that
uninstallation works correctly, even though it is required by the
GNU Coding Standards.
8. Some packages, particularly those that use Automake, provide `make
distcheck', which can by used by developers to test that all other
targets like `make install' and `make uninstall' work correctly.
This target is generally not run by end users.
Compilers and Options
=====================
Some systems require unusual options for compilation or linking that
the `configure' script does not know about. Run `./configure --help'
for details on some of the pertinent environment variables.
You can give `configure' initial values for configuration parameters
by setting variables in the command line or in the environment. Here
is an example:
./configure CC=c99 CFLAGS=-g LIBS=-lposix
*Note Defining Variables::, for more details.
Compiling For Multiple Architectures
====================================
You can compile the package for more than one kind of computer at the
same time, by placing the object files for each architecture in their
own directory. To do this, you can use GNU `make'. `cd' to the
directory where you want the object files and executables to go and run
the `configure' script. `configure' automatically checks for the
source code in the directory that `configure' is in and in `..'. This
is known as a "VPATH" build.
With a non-GNU `make', it is safer to compile the package for one
architecture at a time in the source code directory. After you have
installed the package for one architecture, use `make distclean' before
reconfiguring for another architecture.
On MacOS X 10.5 and later systems, you can create libraries and
executables that work on multiple system types--known as "fat" or
"universal" binaries--by specifying multiple `-arch' options to the
compiler but only a single `-arch' option to the preprocessor. Like
this:
./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
CPP="gcc -E" CXXCPP="g++ -E"
This is not guaranteed to produce working output in all cases, you
may have to build one architecture at a time and combine the results
using the `lipo' tool if you have problems.
Installation Names
==================
By default, `make install' installs the package's commands under
`/usr/local/bin', include files under `/usr/local/include', etc. You
can specify an installation prefix other than `/usr/local' by giving
`configure' the option `--prefix=PREFIX', where PREFIX must be an
absolute file name.
You can specify separate installation prefixes for
architecture-specific files and architecture-independent files. If you
pass the option `--exec-prefix=PREFIX' to `configure', the package uses
PREFIX as the prefix for installing programs and libraries.
Documentation and other data files still use the regular prefix.
In addition, if you use an unusual directory layout you can give
options like `--bindir=DIR' to specify different values for particular
kinds of files. Run `configure --help' for a list of the directories
you can set and what kinds of files go in them. In general, the
default for these options is expressed in terms of `${prefix}', so that
specifying just `--prefix' will affect all of the other directory
specifications that were not explicitly provided.
The most portable way to affect installation locations is to pass the
correct locations to `configure'; however, many packages provide one or
both of the following shortcuts of passing variable assignments to the
`make install' command line to change installation locations without
having to reconfigure or recompile.
The first method involves providing an override variable for each
affected directory. For example, `make install
prefix=/alternate/directory' will choose an alternate location for all
directory configuration variables that were expressed in terms of
`${prefix}'. Any directories that were specified during `configure',
but not in terms of `${prefix}', must each be overridden at install
time for the entire installation to be relocated. The approach of
makefile variable overrides for each directory variable is required by
the GNU Coding Standards, and ideally causes no recompilation.
However, some platforms have known limitations with the semantics of
shared libraries that end up requiring recompilation when using this
method, particularly noticeable in packages that use GNU Libtool.
The second method involves providing the `DESTDIR' variable. For
example, `make install DESTDIR=/alternate/directory' will prepend
`/alternate/directory' before all installation names. The approach of
`DESTDIR' overrides is not required by the GNU Coding Standards, and
does not work on platforms that have drive letters. On the other hand,
it does better at avoiding recompilation issues, and works well even
when some directory options were not specified in terms of `${prefix}'
at `configure' time.
Optional Features
=================
If the package supports it, you can cause programs to be installed
with an extra prefix or suffix on their names by giving `configure' the
option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
Some packages pay attention to `--enable-FEATURE' options to
`configure', where FEATURE indicates an optional part of the package.
They may also pay attention to `--with-PACKAGE' options, where PACKAGE
is something like `gnu-as' or `x' (for the X Window System). The
`README' should mention any `--enable-' and `--with-' options that the
package recognizes.
For packages that use the X Window System, `configure' can usually
find the X include and library files automatically, but if it doesn't,
you can use the `configure' options `--x-includes=DIR' and
`--x-libraries=DIR' to specify their locations.
Some packages offer the ability to configure how verbose the
execution of `make' will be. For these packages, running `./configure
--enable-silent-rules' sets the default to minimal output, which can be
overridden with `make V=1'; while running `./configure
--disable-silent-rules' sets the default to verbose, which can be
overridden with `make V=0'.
Particular systems
==================
On HP-UX, the default C compiler is not ANSI C compatible. If GNU
CC is not installed, it is recommended to use the following options in
order to use an ANSI C compiler:
./configure CC="cc -Ae -D_XOPEN_SOURCE=500"
and if that doesn't work, install pre-built binaries of GCC for HP-UX.
HP-UX `make' updates targets which have the same time stamps as
their prerequisites, which makes it generally unusable when shipped
generated files such as `configure' are involved. Use GNU `make'
instead.
On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
parse its `<wchar.h>' header file. The option `-nodtk' can be used as
a workaround. If GNU CC is not installed, it is therefore recommended
to try
./configure CC="cc"
and if that doesn't work, try
./configure CC="cc -nodtk"
On Solaris, don't put `/usr/ucb' early in your `PATH'. This
directory contains several dysfunctional programs; working variants of
these programs are available in `/usr/bin'. So, if you need `/usr/ucb'
in your `PATH', put it _after_ `/usr/bin'.
On Haiku, software installed for all users goes in `/boot/common',
not `/usr/local'. It is recommended to use the following options:
./configure --prefix=/boot/common
Specifying the System Type
==========================
There may be some features `configure' cannot figure out
automatically, but needs to determine by the type of machine the package
will run on. Usually, assuming the package is built to be run on the
_same_ architectures, `configure' can figure that out, but if it prints
a message saying it cannot guess the machine type, give it the
`--build=TYPE' option. TYPE can either be a short name for the system
type, such as `sun4', or a canonical name which has the form:
CPU-COMPANY-SYSTEM
where SYSTEM can have one of these forms:
OS
KERNEL-OS
See the file `config.sub' for the possible values of each field. If
`config.sub' isn't included in this package, then this package doesn't
need to know the machine type.
If you are _building_ compiler tools for cross-compiling, you should
use the option `--target=TYPE' to select the type of system they will
produce code for.
If you want to _use_ a cross compiler, that generates code for a
platform different from the build platform, you should specify the
"host" platform (i.e., that on which the generated programs will
eventually be run) with `--host=TYPE'.
Sharing Defaults
================
If you want to set default values for `configure' scripts to share,
you can create a site shell script called `config.site' that gives
default values for variables like `CC', `cache_file', and `prefix'.
`configure' looks for `PREFIX/share/config.site' if it exists, then
`PREFIX/etc/config.site' if it exists. Or, you can set the
`CONFIG_SITE' environment variable to the location of the site script.
A warning: not all `configure' scripts look for a site script.
Defining Variables
==================
Variables not defined in a site shell script can be set in the
environment passed to `configure'. However, some packages may run
configure again during the build, and the customized values of these
variables may be lost. In order to avoid this problem, you should set
them in the `configure' command line, using `VAR=value'. For example:
./configure CC=/usr/local2/bin/gcc
causes the specified `gcc' to be used as the C compiler (unless it is
overridden in the site shell script).
Unfortunately, this technique does not work for `CONFIG_SHELL' due to
an Autoconf limitation. Until the limitation is lifted, you can use
this workaround:
CONFIG_SHELL=/bin/bash ./configure CONFIG_SHELL=/bin/bash
`configure' Invocation
======================
`configure' recognizes the following options to control how it
operates.
`--help'
`-h'
Print a summary of all of the options to `configure', and exit.
`--help=short'
`--help=recursive'
Print a summary of the options unique to this package's
`configure', and exit. The `short' variant lists options used
only in the top level, while the `recursive' variant lists options
also present in any nested packages.
`--version'
`-V'
Print the version of Autoconf used to generate the `configure'
script, and exit.
`--cache-file=FILE'
Enable the cache: use and save the results of the tests in FILE,
traditionally `config.cache'. FILE defaults to `/dev/null' to
disable caching.
`--config-cache'
`-C'
Alias for `--cache-file=config.cache'.
`--quiet'
`--silent'
`-q'
Do not print messages saying which checks are being made. To
suppress all normal output, redirect it to `/dev/null' (any error
messages will still be shown).
`--srcdir=DIR'
Look for the package's source code in directory DIR. Usually
`configure' can determine that directory automatically.
`--prefix=DIR'
Use DIR as the installation prefix. *note Installation Names::
for more details, including other options available for fine-tuning
the installation locations.
`--no-create'
`-n'
Run the configure checks, but stop before creating any output
files.
`configure' also accepts some other, not widely useful, options. Run
`configure --help' for more details.

0
vice/Importing
View File

195
vice/Makefile.am
View File

@ -1,72 +1,61 @@
ACLOCAL_AMFLAGS=-Im4
# Install HTML docs?
if ENABLE_HTML_DOCS
HTML_DOCS=yes
else
HTML_DOCS=no
endif
if VICE_QUIET
.SILENT:
endif
# Process this file with automake to produce Makefile.in
SUBDIRS = src build data man doc
SUBDIRS = src build data doc
# COMMON_EXTRA_DIST is what used to be the EXTRA_DIST, when adding dist
# files, please add them to the COMMON_EXTRA_DIST list.
COMMON_EXTRA_DIST = \
.descr \
AUTHORS \
autogen.sh \
config.rpath \
configure.proto \
ChangeLog \
ChangeLog.1 \
ChangeLog.2 \
ChangeLog.3 \
ChangeLog.4 \
configure.ac \
cmake-bootstrap.sh \
COPYING \
FEEDBACK \
INSTALL \
NEWS \
gcccpu.sh \
tixbuildinfo \
vice-mint-sdl.spec \
vice-mint-sdl.spec.in
NEWS
EXTRA_DIST = $(COMMON_EXTRA_DIST)
if SUPPORT_X64SC
X64SC_INCLUDED = yes
if SUPPORT_X64
X64_INCLUDED = yes
else
X64SC_INCLUDED = no
X64_INCLUDED = no
endif
if SUPPORT_XSCPU64
XSCPU64_INCLUDED = yes
else
XSCPU64_INCLUDED = no
endif
.PHONY: vsid x64 x64sc x128 x64dtv xvic xpet xplus4 xcbm2 xcbm5x0 xscpu64 c1541 petcat cartconv
vsid:
(cd src; $(MAKE) vsid-all)
if SUPPORT_X64
x64:
(cd src; $(MAKE) x64-all)
endif
if SUPPORT_X64SC
x64sc:
(cd src; $(MAKE) x64sc-all)
endif
x128:
(cd src; $(MAKE) x128-all)
if SUPPORT_X64DTV
x64dtv:
(cd src; $(MAKE) x64dtv-all)
endif
if SUPPORT_XSCPU64
xscpu64:
(cd src; $(MAKE) xscpu64-all)
endif
xvic:
(cd src; $(MAKE) xvic-all)
@ -103,11 +92,9 @@ ffmpeglibs-clean:
install: installvice
# If we have no ChangeLog (which should be generated from SVN), generate a
# dummy one.
ChangeLog:
touch ChangeLog
if MAKE_BINDIST
if AMIGA_COMPILE
if SDL_COMPILE
@ -122,7 +109,7 @@ endif
if BEOS_COMPILE
if SDL_COMPILE
bindist:
$(SHELL) @ARCH_SRC_DIR@/make-bindist_beos.sh $(STRIP) $(VICE_VERSION) $(host_cpu) $(host_os) @ENABLE_ARCH@ nozip $(XSCPU64_INCLUDED) $(top_srcdir) $(SDL_VERSION)
$(SHELL) @ARCH_SRC_DIR@/make-bindist_beos.sh $(STRIP) $(VICE_VERSION) $(host_cpu) $(host_os) @ENABLE_ARCH@ nozip $(top_srcdir) $(SDL_VERSION)
bindistzip:
$(SHELL) @ARCH_SRC_DIR@/make-bindist_beos.sh $(STRIP) $(VICE_VERSION) $(host_cpu) $(host_os) @ENABLE_ARCH@ zip $(XSCPU64_INCLUDED) $(top_srcdir) $(SDL_VERSION)
@ -145,134 +132,36 @@ bindistzip:
endif
endif
if UNIX_SKYOS_COMPILE
if SDL_COMPILE
bindist:
$(SHELL) @ARCH_SRC_DIR@/make-bindist_skyos.sh $(STRIP) $(VICE_VERSION) $(prefix) @ENABLE_ARCH@ nozip $(X64SC_INCLUDED) $(top_srcdir)
bindistzip:
$(SHELL) @ARCH_SRC_DIR@/make-bindist_skyos.sh $(STRIP) $(VICE_VERSION) $(prefix) @ENABLE_ARCH@ zip $(X64SC_INCLUDED) $(top_srcdir)
else
bindist:
$(SHELL) @ARCH_SRC_DIR@/skyos/make-bindist.sh $(STRIP) $(VICE_VERSION) $(prefix) @ENABLE_ARCH@ nozip $(X64SC_INCLUDED) $(top_srcdir)
bindistzip:
$(SHELL) @ARCH_SRC_DIR@/skyos/make-bindist.sh $(STRIP) $(VICE_VERSION) $(prefix) @ENABLE_ARCH@ zip $(X64SC_INCLUDED) $(top_srcdir)
endif
endif
if UNIX_QNX6_COMPILE
if SDL_COMPILE
bindist:
$(SHELL) @ARCH_SRC_DIR@/make-bindist_qnx6.sh $(STRIP) $(VICE_VERSION) $(prefix) $(CROSS) @ENABLE_ARCH@ nozip $(X64SC_INCLUDED) $(top_srcdir) $(MAKE) $(host_cpu)
bindistzip:
$(SHELL) @ARCH_SRC_DIR@/make-bindist_qnx6.sh $(STRIP) $(VICE_VERSION) $(prefix) $(CROSS) @ENABLE_ARCH@ zip $(X64SC_INCLUDED) $(top_srcdir) $(MAKE) $(host_cpu)
else
bindist:
$(SHELL) @ARCH_SRC_DIR@/qnx6/make-bindist.sh $(STRIP) $(VICE_VERSION) $(prefix) $(CROSS) @ENABLE_ARCH@ nozip $(X64SC_INCLUDED) $(top_srcdir) $(MAKE) $(host_cpu)
bindistzip:
$(SHELL) @ARCH_SRC_DIR@/qnx6/make-bindist.sh $(STRIP) $(VICE_VERSION) $(prefix) $(CROSS) @ENABLE_ARCH@ zip $(X64SC_INCLUDED) $(top_srcdir) $(MAKE) $(host_cpu)
endif
endif
if UNIX_QNX4_COMPILE
bindist:
$(SHELL) @ARCH_SRC_DIR@/qnx4/make-bindist.sh $(VICE_VERSION) $(prefix) @ENABLE_ARCH@ nozip $(X64SC_INCLUDED) $(top_srcdir)
bindistzip:
$(SHELL) @ARCH_SRC_DIR@/qnx4/make-bindist.sh $(VICE_VERSION) $(prefix) @ENABLE_ARCH@ zip $(X64SC_INCLUDED) $(top_srcdir)
endif
if UNIX_SOLARIS_COMPILE
if SDL_COMPILE
bindist:
$(SHELL) @ARCH_SRC_DIR@/make-bindist_scosol.sh $(STRIP) $(VICE_VERSION) $(prefix) $(CROSS) @ENABLE_ARCH@ nozip $(X64SC_INCLUDED) sol $(infodir) $(mandir) $(top_srcdir) $(MAKE) $(host_cpu) $(host_os)
bindistzip:
$(SHELL) @ARCH_SRC_DIR@/make-bindist_scosol.sh $(STRIP) $(VICE_VERSION) $(prefix) $(CROSS) @ENABLE_ARCH@ zip $(X64SC_INCLUDED) sol $(infodir) $(mandir) $(top_srcdir) $(MAKE) $(host_cpu) $(host_os)
endif
endif
if UNIX_RHAPSODY_COMPILE
bindist:
$(SHELL) @ARCH_SRC_DIR@/next_open_rhap/make-bindist.sh $(STRIP) $(VICE_VERSION) $(prefix) @ENABLE_ARCH@ nozip $(X64SC_INCLUDED) rhapsody $(top_srcdir) $(MAKE)
bindistzip:
$(SHELL) @ARCH_SRC_DIR@/next_open_rhap/make-bindist.sh $(STRIP) $(VICE_VERSION) $(prefix) @ENABLE_ARCH@ zip $(X64SC_INCLUDED) rhapsody $(top_srcdir) $(MAKE)
endif
if UNIX_OPENSTEP_COMPILE
bindist:
$(SHELL) @ARCH_SRC_DIR@/next_open_rhap/make-bindist.sh $(STRIP) $(VICE_VERSION) $(prefix) @ENABLE_ARCH@ nozip $(X64SC_INCLUDED) openstep $(top_srcdir) $(MAKE)
bindistzip:
$(SHELL) @ARCH_SRC_DIR@/next_open_rhap/make-bindist.sh $(STRIP) $(VICE_VERSION) $(prefix) @ENABLE_ARCH@ zip $(X64SC_INCLUDED) openstep $(top_srcdir) $(MAKE)
endif
if UNIX_NEXTSTEP_COMPILE
bindist:
$(SHELL) @ARCH_SRC_DIR@/next_open_rhap/make-bindist.sh $(STRIP) $(VICE_VERSION) $(prefix) @ENABLE_ARCH@ nozip $(X64SC_INCLUDED) nextstep $(top_srcdir) $(MAKE)
bindistzip:
$(SHELL) @ARCH_SRC_DIR@/next_open_rhap/make-bindist.sh $(STRIP) $(VICE_VERSION) $(prefix) @ENABLE_ARCH@ zip $(X64SC_INCLUDED) nextstep $(top_srcdir) $(MAKE)
endif
if UNIX_OPENSERVER5_COMPILE
if SDL_COMPILE
bindist:
$(SHELL) @ARCH_SRC_DIR@/make-bindist_scosol.sh $(STRIP) $(VICE_VERSION) $(prefix) $(CROSS) @ENABLE_ARCH@ nozip $(X64SC_INCLUDED) sco5 $(infodir) $(mandir) $(top_srcdir) $(MAKE)
bindistzip:
$(SHELL) @ARCH_SRC_DIR@/make-bindist_scosol.sh $(STRIP) $(VICE_VERSION) $(prefix) $(CROSS) @ENABLE_ARCH@ zip $(X64SC_INCLUDED) sco5 $(infodir) $(mandir) $(top_srcdir) $(MAKE)
endif
endif
if UNIX_OPENSERVER6_COMPILE
if SDL_COMPILE
bindist:
$(SHELL) @ARCH_SRC_DIR@/make-bindist_scosol.sh $(STRIP) $(VICE_VERSION) $(prefix) $(CROSS) @ENABLE_ARCH@ nozip $(X64SC_INCLUDED) sco6 $(infodir) $(mandir) $(top_srcdir) $(MAKE)
bindistzip:
$(SHELL) @ARCH_SRC_DIR@/make-bindist_scosol.sh $(STRIP) $(VICE_VERSION) $(prefix) $(CROSS) @ENABLE_ARCH@ zip $(X64SC_INCLUDED) sco6 $(infodir) $(mandir) $(top_srcdir) $(MAKE)
endif
endif
if UNIX_UNIXWARE_COMPILE
if SDL_COMPILE
bindist:
$(SHELL) @ARCH_SRC_DIR@/make-bindist_scosol.sh $(STRIP) $(VICE_VERSION) $(prefix) $(CROSS) @ENABLE_ARCH@ nozip $(X64SC_INCLUDED) sco7 $(infodir) $(mandir) $(top_srcdir) $(MAKE)
bindistzip:
$(SHELL) @ARCH_SRC_DIR@/make-bindist_scosol.sh $(STRIP) $(VICE_VERSION) $(prefix) $(CROSS) @ENABLE_ARCH@ zip $(X64SC_INCLUDED) sco7 $(infodir) $(mandir) $(top_srcdir) $(MAKE)
endif
endif
if WIN32_COMPILE
if NATIVE_GTK3_COMPILE
bindist:
$(SHELL) @ARCH_SRC_DIR@/make-bindist_win32.sh $(STRIP) $(VICE_VERSION) @ENABLE_ARCH@ nozip $(X64SC_INCLUDED) $(top_srcdir) $(host_cpu) $(abs_top_builddir) $(CROSS) $(objdump) $(CC)
$(SHELL) @ARCH_SRC_DIR@/make-bindist_win32.sh $(STRIP) $(VICE_VERSION) @ENABLE_ARCH@ nozip $(X64_INCLUDED) $(top_srcdir) $(host_cpu) $(abs_top_builddir) $(CROSS) $(objdump) $(CC) $(HTMLDOCS)
bindistzip:
$(SHELL) @ARCH_SRC_DIR@/make-bindist_win32.sh $(STRIP) $(VICE_VERSION) @ENABLE_ARCH@ zip $(X64SC_INCLUDED) $(top_srcdir) $(host_cpu) $(abs_top_builddir) $(CROSS) $(objdump) $(CC)
$(SHELL) @ARCH_SRC_DIR@/make-bindist_win32.sh $(STRIP) $(VICE_VERSION) @ENABLE_ARCH@ zip $(X64_INCLUDED) $(top_srcdir) $(host_cpu) $(abs_top_builddir) $(CROSS) $(objdump) $(CC) $(HTML_DOCS)
bindist7zip:
$(SHELL) @ARCH_SRC_DIR@/make-bindist_win32.sh $(STRIP) $(VICE_VERSION) @ENABLE_ARCH@ 7zip $(X64_INCLUDED) $(top_srcdir) $(host_cpu) $(abs_top_builddir) $(CROSS) $(objdump) $(CC) $(HTML_DOCS)
else
if SDL_COMPILE
bindist:
$(SHELL) @ARCH_SRC_DIR@/make-bindist_win32.sh $(STRIP) $(VICE_VERSION) @ENABLE_ARCH@ nozip $(X64SC_INCLUDED) $(top_srcdir) $(host_cpu) $(SDL_VERSION)
$(SHELL) @ARCH_SRC_DIR@/make-bindist_win32.sh $(STRIP) $(VICE_VERSION) @ENABLE_ARCH@ nozip $(X64_INCLUDED) $(top_srcdir) $(top_builddir) $(host_cpu) $(SDL_VERSION) "$(SDLCONFIG)" $(CROSS) $(objdump) $(CC) $(HTML_DOCS)
bindistzip:
$(SHELL) @ARCH_SRC_DIR@/make-bindist_win32.sh $(STRIP) $(VICE_VERSION) @ENABLE_ARCH@ zip $(X64SC_INCLUDED) $(top_srcdir) $(host_cpu) $(SDL_VERSION)
$(SHELL) @ARCH_SRC_DIR@/make-bindist_win32.sh $(STRIP) $(VICE_VERSION) @ENABLE_ARCH@ zip $(X64_INCLUDED) $(top_srcdir) $(top_builddir) $(host_cpu) $(SDL_VERSION) "$(SDLCONFIG)" $(CROSS) $(objdump) $(CC) $(HTML_DOCS)
bindist7zip:
$(SHELL) @ARCH_SRC_DIR@/make-bindist_win32.sh $(STRIP) $(VICE_VERSION) @ENABLE_ARCH@ 7zip $(X64_INCLUDED) $(top_srcdir) $(top_builddir) $(host_cpu) $(SDL_VERSION) "$(SDLCONFIG)" $(CROSS) $(objdump) $(CC) $(HTML_DOCS)
endif
endif
endif
if SYLLABLE_COMPILE
else
bindist:
$(SHELL) @ARCH_SRC_DIR@/make-bindist_syllable.sh $(STRIP) $(VICE_VERSION) $(prefix) @ENABLE_ARCH@ nozip $(X64SC_INCLUDED) $(top_srcdir)
bindistzip:
$(SHELL) @ARCH_SRC_DIR@/make-bindist_syllable.sh $(STRIP) $(VICE_VERSION) $(prefix) @ENABLE_ARCH@ zip $(X64SC_INCLUDED) $(top_srcdir)
@echo this platform doesn\'t use \"make bindist\", use \"make install\" instead
endif
if HAVE_SHARED_FFMPEG
@ -288,11 +177,11 @@ EXTRA_CLEANS =
endif
endif
if MAKE_BINDIST
if MAKE_INSTALL
installvice: install-recursive $(EXTRA_INSTALLS)
else
installvice:
@echo this platform doesn\'t use \"make install\", use \"make bindist\" instead
else
installvice: install-recursive $(EXTRA_INSTALLS)
endif
# Manually define the dist targets so the correct tar usage will be used.
@ -300,17 +189,15 @@ dist-gzip:
$(DOS2UNIX) `find $(top_srcdir) -name "*.sh"`
$(DOS2UNIX) $(top_srcdir)/doc/vice.texi
$(MAKE) distdir
$(AMTAR) chf - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
$(AMTAR) chf - $(distdir) | gzip --best -c >$(distdir).tar.gz
$(am__remove_distdir)
dist dist-all:
$(DOS2UNIX) `find $(top_srcdir) -name "*.sh"`
$(DOS2UNIX) $(top_srcdir)/doc/vice.texi
$(MAKE) distdir
$(AMTAR) chf - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
$(AMTAR) chf - $(distdir) | gzip --best -c >$(distdir).tar.gz
$(am__remove_distdir)
$(top_srcdir)/configure.ac: $(top_srcdir)/configure.proto
$(am__cd) $(srcdir) && $(SHELL) autogen.sh
clean: $(EXTRA_CLEANS) clean-recursive

294
vice/Makefile.in
View File

@ -1,7 +1,7 @@
# Makefile.in generated by automake 1.15 from Makefile.am.
# Makefile.in generated by automake 1.16.2 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2014 Free Software Foundation, Inc.
# Copyright (C) 1994-2020 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@ -89,7 +89,10 @@ build_triplet = @build@
host_triplet = @host@
subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
am__aclocal_m4_deps = $(top_srcdir)/m4/ax_cxx_compile_stdcxx.m4 \
$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/pkg.m4 \
$(top_srcdir)/m4/vice_args.m4 \
$(top_srcdir)/m4/vice_compiler_checks.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
@ -99,7 +102,7 @@ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
configure.lineno config.status.lineno
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/src/config.h
CONFIG_CLEAN_FILES = vice-mint-sdl.spec
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
AM_V_P = $(am__v_P_@AM_V@)
am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
@ -135,7 +138,7 @@ am__recursive_targets = \
$(RECURSIVE_CLEAN_TARGETS) \
$(am__extra_recursive_targets)
AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
cscope distdir dist dist-all distcheck
cscope distdir distdir-am dist dist-all distcheck
am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
# Read a list of newline-separated strings from the standard input,
# and print each of them once, without duplicates. Input order is
@ -157,10 +160,9 @@ ETAGS = etags
CTAGS = ctags
CSCOPE = cscope
DIST_SUBDIRS = $(SUBDIRS)
am__DIST_COMMON = $(srcdir)/Makefile.in \
$(srcdir)/vice-mint-sdl.spec.in AUTHORS COPYING ChangeLog \
INSTALL NEWS README compile config.guess config.rpath \
config.sub depcomp install-sh missing mkinstalldirs ylwrap
am__DIST_COMMON = $(srcdir)/Makefile.in COPYING NEWS README compile \
config.guess config.rpath config.sub depcomp install-sh \
missing mkinstalldirs ylwrap
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
distdir = $(PACKAGE)-$(VERSION)
top_distdir = $(distdir)
@ -217,6 +219,7 @@ AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BASH = @BASH@
CC = @CC@
CCAS = @CCAS@
CCASDEPMODE = @CCASDEPMODE@
@ -261,6 +264,8 @@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
FW_DIR = @FW_DIR@
GFXOUTPUT_DRIVERS = @GFXOUTPUT_DRIVERS@
GFXOUTPUT_LIBS = @GFXOUTPUT_LIBS@
GLEW_CFLAGS = @GLEW_CFLAGS@
GLEW_LIBS = @GLEW_LIBS@
GLIB_CFLAGS = @GLIB_CFLAGS@
GLIB_LIBS = @GLIB_LIBS@
GREP = @GREP@
@ -268,15 +273,14 @@ GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
HAVE_CXX11 = @HAVE_CXX11@
HAVE_READLINE = @HAVE_READLINE@
HCRTF = @HCRTF@
HHC = @HHC@
ICONV = @ICONV@
ICOTOOL = @ICOTOOL@
INLINE_UNIT_GROWTH = @INLINE_UNIT_GROWTH@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
IPFC = @IPFC@
JOY_LIBS = @JOY_LIBS@
LAMEMP3SUB = @LAMEMP3SUB@
LDFLAGS = @LDFLAGS@
@ -292,12 +296,14 @@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEGUIDE = @MAKEGUIDE@
MAKEINFO = @MAKEINFO@
MAKERTF = @MAKERTF@
MAX_INLINE_INSN_SINGLE = @MAX_INLINE_INSN_SINGLE@
MKDIR_P = @MKDIR_P@
MKFONTDIR_BIN = @MKFONTDIR_BIN@
NATIVE_TOOLS_COMPILER = @NATIVE_TOOLS_COMPILER@
MONITOR_CFLAGS = @MONITOR_CFLAGS@
NETPLAY_LIBS = @NETPLAY_LIBS@
OBJC = @OBJC@
OBJCDEPMODE = @OBJCDEPMODE@
OBJCFLAGS = @OBJCFLAGS@
OBJCPP = @OBJCPP@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@ -313,8 +319,8 @@ PKG_CONFIG = @PKG_CONFIG@
PLATFORM_DOX_FLAGS = @PLATFORM_DOX_FLAGS@
PNG_CFLAGS = @PNG_CFLAGS@
PNG_LIBS = @PNG_LIBS@
QUICKTIME_INCLUDES = @QUICKTIME_INCLUDES@
QUICKTIME_LIBS = @QUICKTIME_LIBS@
PROGRAM_PREFIX = @PROGRAM_PREFIX@
PROGRAM_SUFFIX = @PROGRAM_SUFFIX@
RANLIB = @RANLIB@
READLINE = @READLINE@
READLINE_LIBS = @READLINE_LIBS@
@ -328,35 +334,49 @@ RESID_DTV_INCLUDES = @RESID_DTV_INCLUDES@
RESID_DTV_LIBS = @RESID_DTV_LIBS@
RESID_INCLUDES = @RESID_INCLUDES@
RESID_LIBS = @RESID_LIBS@
SDL2_CFLAGS = @SDL2_CFLAGS@
SDL2_IMAGE_CFLAGS = @SDL2_IMAGE_CFLAGS@
SDL2_IMAGE_LIBS = @SDL2_IMAGE_LIBS@
SDL2_LIBS = @SDL2_LIBS@
SDLCONFIG = @SDLCONFIG@
SDL_EXTRA_LIBS = @SDL_EXTRA_LIBS@
SDL_IMAGE_CFLAGS = @SDL_IMAGE_CFLAGS@
SDL_IMAGE_LIBS = @SDL_IMAGE_LIBS@
SDL_VERSION = @SDL_VERSION@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SOUND_AIX_OBJ = @SOUND_AIX_OBJ@
SOUND_DRIVERS = @SOUND_DRIVERS@
SOUND_HPUX_OBJ = @SOUND_HPUX_OBJ@
SOUND_LIBS = @SOUND_LIBS@
SOUND_MIDAS_OBJ = @SOUND_MIDAS_OBJ@
SOUND_SDL_OBJ = @SOUND_SDL_OBJ@
SOUND_SGI_OBJ = @SOUND_SGI_OBJ@
SOUND_USS_OBJ = @SOUND_USS_OBJ@
STRIP = @STRIP@
SVN = @SVN@
SVNVERSION = @SVNVERSION@
TAR = @TAR@
TEXI2DVI = @TEXI2DVI@
TEXI2IPF = @TEXI2IPF@
TFE_LIBS = @TFE_LIBS@
UI_LIBS = @UI_LIBS@
VERSION = @VERSION@
VERSION_COMBINED = @VERSION_COMBINED@
VERSION_RC = @VERSION_RC@
VICEDIR = @VICEDIR@
VICE_CFLAGS = @VICE_CFLAGS@
VICE_CPPFLAGS = @VICE_CPPFLAGS@
VICE_CXXFLAGS = @VICE_CXXFLAGS@
VICE_DATADIR = @VICE_DATADIR@
VICE_DOCDIR = @VICE_DOCDIR@
VICE_LDFLAGS = @VICE_LDFLAGS@
VICE_OBJCFLAGS = @VICE_OBJCFLAGS@
VICE_PDF_FILE_NAME = @VICE_PDF_FILE_NAME@
VICE_VERSION = @VICE_VERSION@
VICE_VERSION_BUILD = @VICE_VERSION_BUILD@
VICE_VERSION_MAJOR = @VICE_VERSION_MAJOR@
VICE_VERSION_MINOR = @VICE_VERSION_MINOR@
VTE_CXXFLAGS = @VTE_CXXFLAGS@
WINDRES = @WINDRES@
WINDRES_LIB = @WINDRES_LIB@
XA = @XA@
XDG_DESKTOP_MENU = @XDG_DESKTOP_MENU@
YACC = @YACC@
YASM = @YASM@
ZLIB_LIBS = @ZLIB_LIBS@
@ -366,12 +386,12 @@ abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_OBJC = @ac_ct_OBJC@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
am__tar = @am__tar@
am__untar = @am__untar@
artsc_config = @artsc_config@
bindir = @bindir@
build = @build@
build_alias = @build_alias@
@ -384,7 +404,6 @@ datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
ffmpeg_have_bash = @ffmpeg_have_bash@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@ -408,7 +427,6 @@ program_transform_name = @program_transform_name@
psdir = @psdir@
runstatedir = @runstatedir@
sbindir = @sbindir@
sdl2_config = @sdl2_config@
sdl_config = @sdl_config@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
@ -426,37 +444,28 @@ xpet_LDFLAGS = @xpet_LDFLAGS@
xplus4_LDFLAGS = @xplus4_LDFLAGS@
xscpu64_LDFLAGS = @xscpu64_LDFLAGS@
xvic_LDFLAGS = @xvic_LDFLAGS@
ACLOCAL_AMFLAGS = -Im4
@ENABLE_HTML_DOCS_FALSE@HTML_DOCS = no
# Install HTML docs?
@ENABLE_HTML_DOCS_TRUE@HTML_DOCS = yes
# Process this file with automake to produce Makefile.in
SUBDIRS = src build data man doc
SUBDIRS = src build data doc
# COMMON_EXTRA_DIST is what used to be the EXTRA_DIST, when adding dist
# files, please add them to the COMMON_EXTRA_DIST list.
COMMON_EXTRA_DIST = \
.descr \
AUTHORS \
autogen.sh \
config.rpath \
configure.proto \
ChangeLog \
ChangeLog.1 \
ChangeLog.2 \
ChangeLog.3 \
ChangeLog.4 \
configure.ac \
cmake-bootstrap.sh \
COPYING \
FEEDBACK \
INSTALL \
NEWS \
gcccpu.sh \
tixbuildinfo \
vice-mint-sdl.spec \
vice-mint-sdl.spec.in
NEWS
EXTRA_DIST = $(COMMON_EXTRA_DIST)
@SUPPORT_X64SC_FALSE@X64SC_INCLUDED = no
@SUPPORT_X64SC_TRUE@X64SC_INCLUDED = yes
@SUPPORT_XSCPU64_FALSE@XSCPU64_INCLUDED = no
@SUPPORT_XSCPU64_TRUE@XSCPU64_INCLUDED = yes
@SUPPORT_X64_FALSE@X64_INCLUDED = no
@SUPPORT_X64_TRUE@X64_INCLUDED = yes
@HAVE_SHARED_FFMPEG_FALSE@@HAVE_STATIC_FFMPEG_FALSE@EXTRA_INSTALLS =
@HAVE_SHARED_FFMPEG_FALSE@@HAVE_STATIC_FFMPEG_TRUE@EXTRA_INSTALLS =
@HAVE_SHARED_FFMPEG_TRUE@EXTRA_INSTALLS = ffmpeglibs-install
@ -472,23 +481,23 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
echo ' cd $(srcdir) && $(AUTOMAKE) --gnu'; \
$(am__cd) $(srcdir) && $(AUTOMAKE) --gnu \
echo ' cd $(srcdir) && $(AUTOMAKE) --foreign'; \
$(am__cd) $(srcdir) && $(AUTOMAKE) --foreign \
&& exit 0; \
exit 1;; \
esac; \
done; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --gnu Makefile
$(AUTOMAKE) --foreign Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
echo ' $(SHELL) ./config.status'; \
$(SHELL) ./config.status;; \
*) \
echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles)'; \
cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles);; \
esac;
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@ -499,8 +508,6 @@ $(top_srcdir)/configure: $(am__configure_deps)
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
$(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
$(am__aclocal_m4_deps):
vice-mint-sdl.spec: $(top_builddir)/config.status $(srcdir)/vice-mint-sdl.spec.in
cd $(top_builddir) && $(SHELL) ./config.status $@
# This directory's subdirectories are mostly independent; you can cd
# into them and run 'make' without going through this Makefile.
@ -608,7 +615,10 @@ distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-rm -f cscope.out cscope.in.out cscope.po.out cscope.files
distdir: $(DISTFILES)
distdir: $(BUILT_SOURCES)
$(MAKE) $(AM_MAKEFLAGS) distdir-am
distdir-am: $(DISTFILES)
$(am__remove_distdir)
test -d "$(distdir)" || mkdir "$(distdir)"
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
@ -685,6 +695,10 @@ dist-xz: distdir
tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
$(am__post_remove_distdir)
dist-zstd: distdir
tardir=$(distdir) && $(am__tar) | zstd -c $${ZSTD_CLEVEL-$${ZSTD_OPT--19}} >$(distdir).tar.zst
$(am__post_remove_distdir)
dist-tarZ: distdir
@echo WARNING: "Support for distribution archives compressed with" \
"legacy program 'compress' is deprecated." >&2
@ -696,7 +710,7 @@ dist-shar: distdir
@echo WARNING: "Support for shar distribution archives is" \
"deprecated." >&2
@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
shar $(distdir) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).shar.gz
$(am__post_remove_distdir)
dist-zip: distdir
@ -710,7 +724,7 @@ dist-zip: distdir
distcheck: dist
case '$(DIST_ARCHIVES)' in \
*.tar.gz*) \
GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).tar.gz | $(am__untar) ;;\
*.tar.bz2*) \
bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
*.tar.lz*) \
@ -720,9 +734,11 @@ distcheck: dist
*.tar.Z*) \
uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
*.shar.gz*) \
GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\
*.zip*) \
unzip $(distdir).zip ;;\
*.tar.zst*) \
zstd -dc $(distdir).tar.zst | $(am__untar) ;;\
esac
chmod -R a-w $(distdir)
chmod u+w $(distdir)
@ -896,7 +912,7 @@ uninstall-am:
am--refresh check check-am clean clean-cscope clean-generic \
cscope cscopelist-am ctags ctags-am dist dist-all dist-bzip2 \
dist-gzip dist-lzip dist-shar dist-tarZ dist-xz dist-zip \
distcheck distclean distclean-generic distclean-tags \
dist-zstd distcheck distclean distclean-generic distclean-tags \
distcleancheck distdir distuninstallcheck dvi dvi-am html \
html-am info info-am install install-am install-data \
install-data-am install-dvi install-dvi-am install-exec \
@ -909,26 +925,27 @@ uninstall-am:
.PRECIOUS: Makefile
@VICE_QUIET_TRUE@.SILENT:
.PHONY: vsid x64 x64sc x128 x64dtv xvic xpet xplus4 xcbm2 xcbm5x0 xscpu64 c1541 petcat cartconv
vsid:
(cd src; $(MAKE) vsid-all)
x64:
(cd src; $(MAKE) x64-all)
@SUPPORT_X64_TRUE@x64:
@SUPPORT_X64_TRUE@ (cd src; $(MAKE) x64-all)
@SUPPORT_X64SC_TRUE@x64sc:
@SUPPORT_X64SC_TRUE@ (cd src; $(MAKE) x64sc-all)
x64sc:
(cd src; $(MAKE) x64sc-all)
x128:
(cd src; $(MAKE) x128-all)
@SUPPORT_X64DTV_TRUE@x64dtv:
@SUPPORT_X64DTV_TRUE@ (cd src; $(MAKE) x64dtv-all)
x64dtv:
(cd src; $(MAKE) x64dtv-all)
@SUPPORT_XSCPU64_TRUE@xscpu64:
@SUPPORT_XSCPU64_TRUE@ (cd src; $(MAKE) xscpu64-all)
xscpu64:
(cd src; $(MAKE) xscpu64-all)
xvic:
(cd src; $(MAKE) xvic-all)
@ -965,144 +982,69 @@ ffmpeglibs-clean:
install: installvice
# If we have no ChangeLog (which should be generated from SVN), generate a
# dummy one.
@AMIGA_COMPILE_TRUE@@MAKE_BINDIST_TRUE@@SDL_COMPILE_TRUE@bindist:
@AMIGA_COMPILE_TRUE@@MAKE_BINDIST_TRUE@@SDL_COMPILE_TRUE@ $(SHELL) @ARCH_SRC_DIR@/make-bindist_amiga.sh $(STRIP) $(VICE_VERSION) $(host_cpu) $(host_os) @ENABLE_ARCH@ nozip $(X64SC_INCLUDED) $(top_srcdir) $(SDL_VERSION) $(EXEEXT)
ChangeLog:
touch ChangeLog
@AMIGA_COMPILE_TRUE@@MAKE_BINDIST_TRUE@@SDL_COMPILE_TRUE@bindistzip:
@AMIGA_COMPILE_TRUE@@MAKE_BINDIST_TRUE@@SDL_COMPILE_TRUE@ $(SHELL) @ARCH_SRC_DIR@/make-bindist_amiga.sh $(STRIP) $(VICE_VERSION) $(host_cpu) $(host_os) @ENABLE_ARCH@ zip $(X64SC_INCLUDED) $(top_srcdir) $(SDL_VERSION) $(EXEEXT)
@AMIGA_COMPILE_TRUE@@SDL_COMPILE_TRUE@bindist:
@AMIGA_COMPILE_TRUE@@SDL_COMPILE_TRUE@ $(SHELL) @ARCH_SRC_DIR@/make-bindist_amiga.sh $(STRIP) $(VICE_VERSION) $(host_cpu) $(host_os) @ENABLE_ARCH@ nozip $(X64SC_INCLUDED) $(top_srcdir) $(SDL_VERSION) $(EXEEXT)
@BEOS_COMPILE_TRUE@@MAKE_BINDIST_TRUE@@SDL_COMPILE_TRUE@bindist:
@BEOS_COMPILE_TRUE@@MAKE_BINDIST_TRUE@@SDL_COMPILE_TRUE@ $(SHELL) @ARCH_SRC_DIR@/make-bindist_beos.sh $(STRIP) $(VICE_VERSION) $(host_cpu) $(host_os) @ENABLE_ARCH@ nozip $(top_srcdir) $(SDL_VERSION)
@AMIGA_COMPILE_TRUE@@SDL_COMPILE_TRUE@bindistzip:
@AMIGA_COMPILE_TRUE@@SDL_COMPILE_TRUE@ $(SHELL) @ARCH_SRC_DIR@/make-bindist_amiga.sh $(STRIP) $(VICE_VERSION) $(host_cpu) $(host_os) @ENABLE_ARCH@ zip $(X64SC_INCLUDED) $(top_srcdir) $(SDL_VERSION) $(EXEEXT)
@BEOS_COMPILE_TRUE@@MAKE_BINDIST_TRUE@@SDL_COMPILE_TRUE@bindistzip:
@BEOS_COMPILE_TRUE@@MAKE_BINDIST_TRUE@@SDL_COMPILE_TRUE@ $(SHELL) @ARCH_SRC_DIR@/make-bindist_beos.sh $(STRIP) $(VICE_VERSION) $(host_cpu) $(host_os) @ENABLE_ARCH@ zip $(XSCPU64_INCLUDED) $(top_srcdir) $(SDL_VERSION)
@BEOS_COMPILE_TRUE@@SDL_COMPILE_TRUE@bindist:
@BEOS_COMPILE_TRUE@@SDL_COMPILE_TRUE@ $(SHELL) @ARCH_SRC_DIR@/make-bindist_beos.sh $(STRIP) $(VICE_VERSION) $(host_cpu) $(host_os) @ENABLE_ARCH@ nozip $(XSCPU64_INCLUDED) $(top_srcdir) $(SDL_VERSION)
@MAKE_BINDIST_TRUE@@NATIVE_GTK3_COMPILE_TRUE@@UNIX_MACOSX_COMPILE_TRUE@bindist:
@MAKE_BINDIST_TRUE@@NATIVE_GTK3_COMPILE_TRUE@@UNIX_MACOSX_COMPILE_TRUE@ /bin/bash @ARCH_SRC_DIR@/../gtk3/make-bindist_osx.sh $(top_srcdir) $(STRIP) $(VICE_VERSION) @ENABLE_ARCH@ nozip
@BEOS_COMPILE_TRUE@@SDL_COMPILE_TRUE@bindistzip:
@BEOS_COMPILE_TRUE@@SDL_COMPILE_TRUE@ $(SHELL) @ARCH_SRC_DIR@/make-bindist_beos.sh $(STRIP) $(VICE_VERSION) $(host_cpu) $(host_os) @ENABLE_ARCH@ zip $(XSCPU64_INCLUDED) $(top_srcdir) $(SDL_VERSION)
@MAKE_BINDIST_TRUE@@NATIVE_GTK3_COMPILE_TRUE@@UNIX_MACOSX_COMPILE_TRUE@bindistzip:
@MAKE_BINDIST_TRUE@@NATIVE_GTK3_COMPILE_TRUE@@UNIX_MACOSX_COMPILE_TRUE@ /bin/bash @ARCH_SRC_DIR@/../gtk3/make-bindist_osx.sh $(top_srcdir) $(STRIP) $(VICE_VERSION) @ENABLE_ARCH@ zip
@MAKE_BINDIST_TRUE@@NATIVE_GTK3_COMPILE_FALSE@@UNIX_MACOSX_COMPILE_TRUE@bindist:
@MAKE_BINDIST_TRUE@@NATIVE_GTK3_COMPILE_FALSE@@UNIX_MACOSX_COMPILE_TRUE@ FW_DIR=@FW_DIR@ /bin/bash @ARCH_SRC_DIR@/../sdl/make-bindist_osx.sh $(top_srcdir) $(STRIP) $(VICE_VERSION) @ENABLE_ARCH@ nozip $(SDL_VERSION)
@NATIVE_GTK3_COMPILE_TRUE@@UNIX_MACOSX_COMPILE_TRUE@bindist:
@NATIVE_GTK3_COMPILE_TRUE@@UNIX_MACOSX_COMPILE_TRUE@ /bin/bash @ARCH_SRC_DIR@/../gtk3/make-bindist_osx.sh $(top_srcdir) $(STRIP) $(VICE_VERSION) @ENABLE_ARCH@ nozip
@MAKE_BINDIST_TRUE@@NATIVE_GTK3_COMPILE_FALSE@@UNIX_MACOSX_COMPILE_TRUE@bindistzip:
@MAKE_BINDIST_TRUE@@NATIVE_GTK3_COMPILE_FALSE@@UNIX_MACOSX_COMPILE_TRUE@ FW_DIR=@FW_DIR@ /bin/bash @ARCH_SRC_DIR@/../sdl/make-bindist_osx.sh $(top_srcdir) $(STRIP) $(VICE_VERSION) @ENABLE_ARCH@ zip $(SDL_VERSION)
@NATIVE_GTK3_COMPILE_TRUE@@UNIX_MACOSX_COMPILE_TRUE@bindistzip:
@NATIVE_GTK3_COMPILE_TRUE@@UNIX_MACOSX_COMPILE_TRUE@ /bin/bash @ARCH_SRC_DIR@/../gtk3/make-bindist_osx.sh $(top_srcdir) $(STRIP) $(VICE_VERSION) @ENABLE_ARCH@ zip
@NATIVE_GTK3_COMPILE_FALSE@@UNIX_MACOSX_COMPILE_TRUE@bindist:
@NATIVE_GTK3_COMPILE_FALSE@@UNIX_MACOSX_COMPILE_TRUE@ FW_DIR=@FW_DIR@ /bin/bash @ARCH_SRC_DIR@/../sdl/make-bindist_osx.sh $(top_srcdir) $(STRIP) $(VICE_VERSION) @ENABLE_ARCH@ nozip $(SDL_VERSION)
@MAKE_BINDIST_TRUE@@NATIVE_GTK3_COMPILE_TRUE@@WIN32_COMPILE_TRUE@bindist:
@MAKE_BINDIST_TRUE@@NATIVE_GTK3_COMPILE_TRUE@@WIN32_COMPILE_TRUE@ $(SHELL) @ARCH_SRC_DIR@/make-bindist_win32.sh $(STRIP) $(VICE_VERSION) @ENABLE_ARCH@ nozip $(X64_INCLUDED) $(top_srcdir) $(host_cpu) $(abs_top_builddir) $(CROSS) $(objdump) $(CC) $(HTMLDOCS)
@NATIVE_GTK3_COMPILE_FALSE@@UNIX_MACOSX_COMPILE_TRUE@bindistzip:
@NATIVE_GTK3_COMPILE_FALSE@@UNIX_MACOSX_COMPILE_TRUE@ FW_DIR=@FW_DIR@ /bin/bash @ARCH_SRC_DIR@/../sdl/make-bindist_osx.sh $(top_srcdir) $(STRIP) $(VICE_VERSION) @ENABLE_ARCH@ zip $(SDL_VERSION)
@MAKE_BINDIST_TRUE@@NATIVE_GTK3_COMPILE_TRUE@@WIN32_COMPILE_TRUE@bindistzip:
@MAKE_BINDIST_TRUE@@NATIVE_GTK3_COMPILE_TRUE@@WIN32_COMPILE_TRUE@ $(SHELL) @ARCH_SRC_DIR@/make-bindist_win32.sh $(STRIP) $(VICE_VERSION) @ENABLE_ARCH@ zip $(X64_INCLUDED) $(top_srcdir) $(host_cpu) $(abs_top_builddir) $(CROSS) $(objdump) $(CC) $(HTML_DOCS)
@SDL_COMPILE_TRUE@@UNIX_SKYOS_COMPILE_TRUE@bindist:
@SDL_COMPILE_TRUE@@UNIX_SKYOS_COMPILE_TRUE@ $(SHELL) @ARCH_SRC_DIR@/make-bindist_skyos.sh $(STRIP) $(VICE_VERSION) $(prefix) @ENABLE_ARCH@ nozip $(X64SC_INCLUDED) $(top_srcdir)
@MAKE_BINDIST_TRUE@@NATIVE_GTK3_COMPILE_TRUE@@WIN32_COMPILE_TRUE@bindist7zip:
@MAKE_BINDIST_TRUE@@NATIVE_GTK3_COMPILE_TRUE@@WIN32_COMPILE_TRUE@ $(SHELL) @ARCH_SRC_DIR@/make-bindist_win32.sh $(STRIP) $(VICE_VERSION) @ENABLE_ARCH@ 7zip $(X64_INCLUDED) $(top_srcdir) $(host_cpu) $(abs_top_builddir) $(CROSS) $(objdump) $(CC) $(HTML_DOCS)
@SDL_COMPILE_TRUE@@UNIX_SKYOS_COMPILE_TRUE@bindistzip:
@SDL_COMPILE_TRUE@@UNIX_SKYOS_COMPILE_TRUE@ $(SHELL) @ARCH_SRC_DIR@/make-bindist_skyos.sh $(STRIP) $(VICE_VERSION) $(prefix) @ENABLE_ARCH@ zip $(X64SC_INCLUDED) $(top_srcdir)
@SDL_COMPILE_FALSE@@UNIX_SKYOS_COMPILE_TRUE@bindist:
@SDL_COMPILE_FALSE@@UNIX_SKYOS_COMPILE_TRUE@ $(SHELL) @ARCH_SRC_DIR@/skyos/make-bindist.sh $(STRIP) $(VICE_VERSION) $(prefix) @ENABLE_ARCH@ nozip $(X64SC_INCLUDED) $(top_srcdir)
@MAKE_BINDIST_TRUE@@NATIVE_GTK3_COMPILE_FALSE@@SDL_COMPILE_TRUE@@WIN32_COMPILE_TRUE@bindist:
@MAKE_BINDIST_TRUE@@NATIVE_GTK3_COMPILE_FALSE@@SDL_COMPILE_TRUE@@WIN32_COMPILE_TRUE@ $(SHELL) @ARCH_SRC_DIR@/make-bindist_win32.sh $(STRIP) $(VICE_VERSION) @ENABLE_ARCH@ nozip $(X64_INCLUDED) $(top_srcdir) $(top_builddir) $(host_cpu) $(SDL_VERSION) "$(SDLCONFIG)" $(CROSS) $(objdump) $(CC) $(HTML_DOCS)
@SDL_COMPILE_FALSE@@UNIX_SKYOS_COMPILE_TRUE@bindistzip:
@SDL_COMPILE_FALSE@@UNIX_SKYOS_COMPILE_TRUE@ $(SHELL) @ARCH_SRC_DIR@/skyos/make-bindist.sh $(STRIP) $(VICE_VERSION) $(prefix) @ENABLE_ARCH@ zip $(X64SC_INCLUDED) $(top_srcdir)
@MAKE_BINDIST_TRUE@@NATIVE_GTK3_COMPILE_FALSE@@SDL_COMPILE_TRUE@@WIN32_COMPILE_TRUE@bindistzip:
@MAKE_BINDIST_TRUE@@NATIVE_GTK3_COMPILE_FALSE@@SDL_COMPILE_TRUE@@WIN32_COMPILE_TRUE@ $(SHELL) @ARCH_SRC_DIR@/make-bindist_win32.sh $(STRIP) $(VICE_VERSION) @ENABLE_ARCH@ zip $(X64_INCLUDED) $(top_srcdir) $(top_builddir) $(host_cpu) $(SDL_VERSION) "$(SDLCONFIG)" $(CROSS) $(objdump) $(CC) $(HTML_DOCS)
@SDL_COMPILE_TRUE@@UNIX_QNX6_COMPILE_TRUE@bindist:
@SDL_COMPILE_TRUE@@UNIX_QNX6_COMPILE_TRUE@ $(SHELL) @ARCH_SRC_DIR@/make-bindist_qnx6.sh $(STRIP) $(VICE_VERSION) $(prefix) $(CROSS) @ENABLE_ARCH@ nozip $(X64SC_INCLUDED) $(top_srcdir) $(MAKE) $(host_cpu)
@MAKE_BINDIST_TRUE@@NATIVE_GTK3_COMPILE_FALSE@@SDL_COMPILE_TRUE@@WIN32_COMPILE_TRUE@bindist7zip:
@MAKE_BINDIST_TRUE@@NATIVE_GTK3_COMPILE_FALSE@@SDL_COMPILE_TRUE@@WIN32_COMPILE_TRUE@ $(SHELL) @ARCH_SRC_DIR@/make-bindist_win32.sh $(STRIP) $(VICE_VERSION) @ENABLE_ARCH@ 7zip $(X64_INCLUDED) $(top_srcdir) $(top_builddir) $(host_cpu) $(SDL_VERSION) "$(SDLCONFIG)" $(CROSS) $(objdump) $(CC) $(HTML_DOCS)
@SDL_COMPILE_TRUE@@UNIX_QNX6_COMPILE_TRUE@bindistzip:
@SDL_COMPILE_TRUE@@UNIX_QNX6_COMPILE_TRUE@ $(SHELL) @ARCH_SRC_DIR@/make-bindist_qnx6.sh $(STRIP) $(VICE_VERSION) $(prefix) $(CROSS) @ENABLE_ARCH@ zip $(X64SC_INCLUDED) $(top_srcdir) $(MAKE) $(host_cpu)
@SDL_COMPILE_FALSE@@UNIX_QNX6_COMPILE_TRUE@bindist:
@SDL_COMPILE_FALSE@@UNIX_QNX6_COMPILE_TRUE@ $(SHELL) @ARCH_SRC_DIR@/qnx6/make-bindist.sh $(STRIP) $(VICE_VERSION) $(prefix) $(CROSS) @ENABLE_ARCH@ nozip $(X64SC_INCLUDED) $(top_srcdir) $(MAKE) $(host_cpu)
@MAKE_BINDIST_FALSE@bindist:
@MAKE_BINDIST_FALSE@ @echo this platform doesn\'t use \"make bindist\", use \"make install\" instead
@SDL_COMPILE_FALSE@@UNIX_QNX6_COMPILE_TRUE@bindistzip:
@SDL_COMPILE_FALSE@@UNIX_QNX6_COMPILE_TRUE@ $(SHELL) @ARCH_SRC_DIR@/qnx6/make-bindist.sh $(STRIP) $(VICE_VERSION) $(prefix) $(CROSS) @ENABLE_ARCH@ zip $(X64SC_INCLUDED) $(top_srcdir) $(MAKE) $(host_cpu)
@UNIX_QNX4_COMPILE_TRUE@bindist:
@UNIX_QNX4_COMPILE_TRUE@ $(SHELL) @ARCH_SRC_DIR@/qnx4/make-bindist.sh $(VICE_VERSION) $(prefix) @ENABLE_ARCH@ nozip $(X64SC_INCLUDED) $(top_srcdir)
@UNIX_QNX4_COMPILE_TRUE@bindistzip:
@UNIX_QNX4_COMPILE_TRUE@ $(SHELL) @ARCH_SRC_DIR@/qnx4/make-bindist.sh $(VICE_VERSION) $(prefix) @ENABLE_ARCH@ zip $(X64SC_INCLUDED) $(top_srcdir)
@SDL_COMPILE_TRUE@@UNIX_SOLARIS_COMPILE_TRUE@bindist:
@SDL_COMPILE_TRUE@@UNIX_SOLARIS_COMPILE_TRUE@ $(SHELL) @ARCH_SRC_DIR@/make-bindist_scosol.sh $(STRIP) $(VICE_VERSION) $(prefix) $(CROSS) @ENABLE_ARCH@ nozip $(X64SC_INCLUDED) sol $(infodir) $(mandir) $(top_srcdir) $(MAKE) $(host_cpu) $(host_os)
@SDL_COMPILE_TRUE@@UNIX_SOLARIS_COMPILE_TRUE@bindistzip:
@SDL_COMPILE_TRUE@@UNIX_SOLARIS_COMPILE_TRUE@ $(SHELL) @ARCH_SRC_DIR@/make-bindist_scosol.sh $(STRIP) $(VICE_VERSION) $(prefix) $(CROSS) @ENABLE_ARCH@ zip $(X64SC_INCLUDED) sol $(infodir) $(mandir) $(top_srcdir) $(MAKE) $(host_cpu) $(host_os)
@UNIX_RHAPSODY_COMPILE_TRUE@bindist:
@UNIX_RHAPSODY_COMPILE_TRUE@ $(SHELL) @ARCH_SRC_DIR@/next_open_rhap/make-bindist.sh $(STRIP) $(VICE_VERSION) $(prefix) @ENABLE_ARCH@ nozip $(X64SC_INCLUDED) rhapsody $(top_srcdir) $(MAKE)
@UNIX_RHAPSODY_COMPILE_TRUE@bindistzip:
@UNIX_RHAPSODY_COMPILE_TRUE@ $(SHELL) @ARCH_SRC_DIR@/next_open_rhap/make-bindist.sh $(STRIP) $(VICE_VERSION) $(prefix) @ENABLE_ARCH@ zip $(X64SC_INCLUDED) rhapsody $(top_srcdir) $(MAKE)
@UNIX_OPENSTEP_COMPILE_TRUE@bindist:
@UNIX_OPENSTEP_COMPILE_TRUE@ $(SHELL) @ARCH_SRC_DIR@/next_open_rhap/make-bindist.sh $(STRIP) $(VICE_VERSION) $(prefix) @ENABLE_ARCH@ nozip $(X64SC_INCLUDED) openstep $(top_srcdir) $(MAKE)
@UNIX_OPENSTEP_COMPILE_TRUE@bindistzip:
@UNIX_OPENSTEP_COMPILE_TRUE@ $(SHELL) @ARCH_SRC_DIR@/next_open_rhap/make-bindist.sh $(STRIP) $(VICE_VERSION) $(prefix) @ENABLE_ARCH@ zip $(X64SC_INCLUDED) openstep $(top_srcdir) $(MAKE)
@UNIX_NEXTSTEP_COMPILE_TRUE@bindist:
@UNIX_NEXTSTEP_COMPILE_TRUE@ $(SHELL) @ARCH_SRC_DIR@/next_open_rhap/make-bindist.sh $(STRIP) $(VICE_VERSION) $(prefix) @ENABLE_ARCH@ nozip $(X64SC_INCLUDED) nextstep $(top_srcdir) $(MAKE)
@UNIX_NEXTSTEP_COMPILE_TRUE@bindistzip:
@UNIX_NEXTSTEP_COMPILE_TRUE@ $(SHELL) @ARCH_SRC_DIR@/next_open_rhap/make-bindist.sh $(STRIP) $(VICE_VERSION) $(prefix) @ENABLE_ARCH@ zip $(X64SC_INCLUDED) nextstep $(top_srcdir) $(MAKE)
@SDL_COMPILE_TRUE@@UNIX_OPENSERVER5_COMPILE_TRUE@bindist:
@SDL_COMPILE_TRUE@@UNIX_OPENSERVER5_COMPILE_TRUE@ $(SHELL) @ARCH_SRC_DIR@/make-bindist_scosol.sh $(STRIP) $(VICE_VERSION) $(prefix) $(CROSS) @ENABLE_ARCH@ nozip $(X64SC_INCLUDED) sco5 $(infodir) $(mandir) $(top_srcdir) $(MAKE)
@SDL_COMPILE_TRUE@@UNIX_OPENSERVER5_COMPILE_TRUE@bindistzip:
@SDL_COMPILE_TRUE@@UNIX_OPENSERVER5_COMPILE_TRUE@ $(SHELL) @ARCH_SRC_DIR@/make-bindist_scosol.sh $(STRIP) $(VICE_VERSION) $(prefix) $(CROSS) @ENABLE_ARCH@ zip $(X64SC_INCLUDED) sco5 $(infodir) $(mandir) $(top_srcdir) $(MAKE)
@SDL_COMPILE_TRUE@@UNIX_OPENSERVER6_COMPILE_TRUE@bindist:
@SDL_COMPILE_TRUE@@UNIX_OPENSERVER6_COMPILE_TRUE@ $(SHELL) @ARCH_SRC_DIR@/make-bindist_scosol.sh $(STRIP) $(VICE_VERSION) $(prefix) $(CROSS) @ENABLE_ARCH@ nozip $(X64SC_INCLUDED) sco6 $(infodir) $(mandir) $(top_srcdir) $(MAKE)
@SDL_COMPILE_TRUE@@UNIX_OPENSERVER6_COMPILE_TRUE@bindistzip:
@SDL_COMPILE_TRUE@@UNIX_OPENSERVER6_COMPILE_TRUE@ $(SHELL) @ARCH_SRC_DIR@/make-bindist_scosol.sh $(STRIP) $(VICE_VERSION) $(prefix) $(CROSS) @ENABLE_ARCH@ zip $(X64SC_INCLUDED) sco6 $(infodir) $(mandir) $(top_srcdir) $(MAKE)
@SDL_COMPILE_TRUE@@UNIX_UNIXWARE_COMPILE_TRUE@bindist:
@SDL_COMPILE_TRUE@@UNIX_UNIXWARE_COMPILE_TRUE@ $(SHELL) @ARCH_SRC_DIR@/make-bindist_scosol.sh $(STRIP) $(VICE_VERSION) $(prefix) $(CROSS) @ENABLE_ARCH@ nozip $(X64SC_INCLUDED) sco7 $(infodir) $(mandir) $(top_srcdir) $(MAKE)
@SDL_COMPILE_TRUE@@UNIX_UNIXWARE_COMPILE_TRUE@bindistzip:
@SDL_COMPILE_TRUE@@UNIX_UNIXWARE_COMPILE_TRUE@ $(SHELL) @ARCH_SRC_DIR@/make-bindist_scosol.sh $(STRIP) $(VICE_VERSION) $(prefix) $(CROSS) @ENABLE_ARCH@ zip $(X64SC_INCLUDED) sco7 $(infodir) $(mandir) $(top_srcdir) $(MAKE)
@NATIVE_GTK3_COMPILE_TRUE@@WIN32_COMPILE_TRUE@bindist:
@NATIVE_GTK3_COMPILE_TRUE@@WIN32_COMPILE_TRUE@ $(SHELL) @ARCH_SRC_DIR@/make-bindist_win32.sh $(STRIP) $(VICE_VERSION) @ENABLE_ARCH@ nozip $(X64SC_INCLUDED) $(top_srcdir) $(host_cpu) $(abs_top_builddir) $(CROSS) $(objdump) $(CC)
@NATIVE_GTK3_COMPILE_TRUE@@WIN32_COMPILE_TRUE@bindistzip:
@NATIVE_GTK3_COMPILE_TRUE@@WIN32_COMPILE_TRUE@ $(SHELL) @ARCH_SRC_DIR@/make-bindist_win32.sh $(STRIP) $(VICE_VERSION) @ENABLE_ARCH@ zip $(X64SC_INCLUDED) $(top_srcdir) $(host_cpu) $(abs_top_builddir) $(CROSS) $(objdump) $(CC)
@NATIVE_GTK3_COMPILE_FALSE@@SDL_COMPILE_TRUE@@WIN32_COMPILE_TRUE@bindist:
@NATIVE_GTK3_COMPILE_FALSE@@SDL_COMPILE_TRUE@@WIN32_COMPILE_TRUE@ $(SHELL) @ARCH_SRC_DIR@/make-bindist_win32.sh $(STRIP) $(VICE_VERSION) @ENABLE_ARCH@ nozip $(X64SC_INCLUDED) $(top_srcdir) $(host_cpu) $(SDL_VERSION)
@NATIVE_GTK3_COMPILE_FALSE@@SDL_COMPILE_TRUE@@WIN32_COMPILE_TRUE@bindistzip:
@NATIVE_GTK3_COMPILE_FALSE@@SDL_COMPILE_TRUE@@WIN32_COMPILE_TRUE@ $(SHELL) @ARCH_SRC_DIR@/make-bindist_win32.sh $(STRIP) $(VICE_VERSION) @ENABLE_ARCH@ zip $(X64SC_INCLUDED) $(top_srcdir) $(host_cpu) $(SDL_VERSION)
@SYLLABLE_COMPILE_TRUE@bindist:
@SYLLABLE_COMPILE_TRUE@ $(SHELL) @ARCH_SRC_DIR@/make-bindist_syllable.sh $(STRIP) $(VICE_VERSION) $(prefix) @ENABLE_ARCH@ nozip $(X64SC_INCLUDED) $(top_srcdir)
@SYLLABLE_COMPILE_TRUE@bindistzip:
@SYLLABLE_COMPILE_TRUE@ $(SHELL) @ARCH_SRC_DIR@/make-bindist_syllable.sh $(STRIP) $(VICE_VERSION) $(prefix) @ENABLE_ARCH@ zip $(X64SC_INCLUDED) $(top_srcdir)
@MAKE_BINDIST_TRUE@installvice:
@MAKE_BINDIST_TRUE@ @echo this platform doesn\'t use \"make install\", use \"make bindist\" instead
@MAKE_BINDIST_FALSE@installvice: install-recursive $(EXTRA_INSTALLS)
@MAKE_INSTALL_TRUE@installvice: install-recursive $(EXTRA_INSTALLS)
@MAKE_INSTALL_FALSE@installvice:
@MAKE_INSTALL_FALSE@ @echo this platform doesn\'t use \"make install\", use \"make bindist\" instead
# Manually define the dist targets so the correct tar usage will be used.
dist-gzip:
$(DOS2UNIX) `find $(top_srcdir) -name "*.sh"`
$(DOS2UNIX) $(top_srcdir)/doc/vice.texi
$(MAKE) distdir
$(AMTAR) chf - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
$(AMTAR) chf - $(distdir) | gzip --best -c >$(distdir).tar.gz
$(am__remove_distdir)
dist dist-all:
$(DOS2UNIX) `find $(top_srcdir) -name "*.sh"`
$(DOS2UNIX) $(top_srcdir)/doc/vice.texi
$(MAKE) distdir
$(AMTAR) chf - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
$(AMTAR) chf - $(distdir) | gzip --best -c >$(distdir).tar.gz
$(am__remove_distdir)
$(top_srcdir)/configure.ac: $(top_srcdir)/configure.proto
$(am__cd) $(srcdir) && $(SHELL) autogen.sh
clean: $(EXTRA_CLEANS) clean-recursive
# Tell versions [3.59,3.63) of GNU make to not export all variables.

788
vice/NEWS
View File

@ -2,26 +2,734 @@
=================
This file lists the most important user-visible changes for each official
release of VICE. See `ChangeLog' in the root dir of the source tree for a
more detailed list of all the changes in the code.
release of VICE. For the gory details, please use the subversion history:
$ svn log http://svn.code.sf.net/p/vice-emu/code > ChangeLog
* Upgrading
===========
If you run into trouble please try removing any VICE configuration files
left from previous installs.
left over from previous installs.
(vice.ini / .vicerc / vice2.cfg / vice-sdl.ini depending on platform)
Before reporting bugs, always try with a clean config (run emulator with
-default or use "restore default config" in the UI).
Before reporting bugs, always try with a clean config: Run the emulator
with the "-default" command line argument or use "restore default config"
in the UI).
* Changes in Vice 3.5
=====================
This release completes the transition to the new GTK3 based GUI and fixes a
bunch of long standing issues (see below).
We are looking for someone who can provide stable automatic nightly builds - for
this will work best on a Windows machine, or perhaps a Fedora server. We tried
our best to come up with a solution for Debian, but that didn't work out as
intended. If you think you can help in this area - please get in touch.
We welcome to the team:
empathicqubit - who wrote the new remote monitor binary interface
Roberto Muscedere aka OldWoman37 - who contributed the new Lt.Kernal, CMD-HD and
RAMlink emulations (C64 only)
** general
----------
- Remove explicit support for OS/2, AmigaOS. These platforms should be able to
use the SDL port.
- VICE used to store its ROMs, keymaps etc into $PREFIX/lib[64]/vice, which
isn't correct. Now VICE installs its data into $PREFIX/share/vice, which
makes a lot more sense. The documentation location has changed as well, now
the documentation is installed in $PREFIX/share/doc/vice.
On Windows, the binaries and DLLs have been moved into /bin, according to the
requirements of GTK/GDK.
- Emulator timing is now directly driven by the host system audio device.
If sound emulation is disabled, timing is synchronized with the host clock.
As part of this change, the choice of sound synchronization method has been
removed.
- Emulation now occurs in blocks of time directly related to the sound fragment
size. Previously, emulation of an entire frame happened as quickly as possible
and then the host system would sleep until it is time to emulate the next
entire frame. This means that user input is now visible to the emulated
software with lower latency than before.
- Audio latency is much lower on all platforms, and new lower latency defaults
have been set. Users are encouraged to try using smaller fragment sizes and
experiment with finding the lowest stable buffer size on their system.
- Support for changing the emulator timing to target generating a specific number
of video frames per second. Useful for smooth PAL scrolling on a 50Hz CRT, and
also fun for playing games at 60fps to match a typical LCD screen refresh.
- The default behaviour on CPU JAM was changed to "continue" to better match
the behaviour of the real machines. Additionally a "CPU JAM" message will
be displayed in the status bar.
- A "quit emulator" option was added to the CPU JAM dialog
- The CPU JAM dialog now shows the number of the device whose CPU has crashed.
- Proper support for dual drives has been added
- Relative file support on the filesystem device
- Autostarting works from any drive (select the drive in the attach disk dialog)
- Added support for 2nd and 3rd joystick button (potx/poty), currently only via
keyboard and via unix joystick driver.
- Added mapping for the THEC64 joystick
- New LT.Kernal emulation
- New CMD-HD emulation
- New CMD RAM-Link emulation
- New D9090/60 emulation
- New icons for the applications.
- We now use proper binary prefixes for memory sizes.
Welcome in the 21st century!
- Recalculate the palette parameters when the videochip type changes, now we can
actually see the subtle color differences :)
- Emulate a switch present on some compatible datasettes (not the Commodore
ones). Turning the switch on makes the sound recorded on the tape audible.
- Fixed/improved "native" screenshots. It will now work with all videochips and
always generate "best effort" results.
- The emulators will look for the config file at an alternative location first,
before looking at the system wide location.
- for windows that is the location of the .exe files
- for Linux that is ~/.vicerc
- Fixed lightgun/pen emulation
- use poty instead of potx for trigger for magnum lightphaser and inkwell
lightpen
- tweak lightphaser offset against a bunch of games
- Handling of settings and resources was improved a bit:
- always reset resources to default before loading a settings file
- new "-addconfig" option (or "load additional settings") loads additional
resources from a file without resetting to defaults before. this can be used
to keep custom setups separate from the regular settings.
- Fixed sysfile search path order.
The order now is $HOME/.local -> path-of-binary -> VICE_DATADIR
- Fixed a bug in .tap file handling that caused some .tap files to not work in
the preview widget(s)
- A bunch of files have been removed from the source tree because they didn't
really belong there and/or contained outdated info:
- hardware-sids.txt, the old info is now at
https://vice-emu.pokefinder.org/index.php/Hardware_SID_Status
- SDL-support.txt, the old info is now at
https://vice-emu.pokefinder.org/index.php/SDL_Status
- ffmpeg-support.txt, the old info is now at
https://vice-emu.pokefinder.org/index.php/FFMPEG_Status
- Another bunch of files were removed because their content was hopelessly
outdated and/or could be moved to other files:
- removed ancient CHANGELOG files. Read NEWS for the recent changes. Refer to
the SVN log for the gory details.
- moved contents from FEEDBACK to README
- removed INSTALL, AUTHORS, FEEDBACK
- removed the MAN pages. Read the html or pdf manual instead.
** build system
---------------
Many changes and simplifications were made in the build system, to make
it more reproducible and match the expected standard behaviour:
- Add --disable-optimization (default=no) to make the buildsystem use -O0 for
debugging.
- 'make dist' no longer needs '--enable-static-ffmpeg' to generate a working
tarball.
- Fixed support for the —disable-silent-rules/—enable-silent-rules configure
arguments.
- Added --enable-sandbox-mode switch. This switch will tell GTK3 to use
'native dialogs' so we can properly support Flatpak and similar containers.
- Added -—enable-cmake to automatically generate cmake CMakelists.txt files for
in-tree configured builds. Generating Xcode projects works, and this may
allow generation of MSVC project files in the future.
- Add --enable-desktop-files for creating and installing .desktop files on Unix.
- Added --enable/disable-html-docs
- Added --with/without-mpg123 (default=yes), makes MP3-decoding support optional
- Added --with/without-ogg-vorbis
- Added --with/without-flac (default=yes)
- Update --with[out]-lame, make no default
- Make jpeg and gif support default to no
- Make using libpng the default, fail unless explicitly disabled
- Make ALSA and Pulse default to enabled, make OSS default to disabled
- Make MIDI support disabled by default
- Make new 8580 filter default
- Removed --disable-hwscale, always check for OpenGL with GTK3, error out when
--disable-hwscale is used with SDL2
Properly report missing tools to generate docs:
- Fail on missing pdftex when PDF docs requested
- Checks for makeinfo and texi2dvi (from the texinfo package) and warns in the
configure output at the end if they are missing, but will still build VICE.
Check presence of other tools instead of silently not using them:
- Made dos2unix mandatory to avoid surprises
- Fail if building for Windows and `icotool` is missing. It can be obtained by
installing the `icoutils` package.
Some features have been deprecated and are now disabled by default:
- Added --enable-x64-image option to enable X64 image support, which is now
disabled by default.
- Added --with/without-fastsid switch to enable/disable the fastSID engine
(default is off).
** Monitor
----------
- Completely new binary remote protocol for debuggers. The older hack was
removed - see the documentation for details.
- -moncommands finally work as originally intended and supports all monitor
commands now. That means there are subtle differences in how certain things
work. one important thing is that by default it will use an initial break
point just after "reset".
- "-initbreak ready" can be used to place an initial wait for "ready", like
autostart does, or "-initbreak reset" to break just after reset.
For more details, read the documentation.
- ‘stop’ is no more ending up in recorded monitor command playback files
- Support `cd ~` to change cwd to $HOME
- Added 'mkdir' command
- Aadded 'rmdir' command
- Aadded "verify" and "bverify" commands to compare memory with a file
- Aadded optional address to the `screen` command
- `chis` shows the cycle count as well now
- Aadded option to configure the number of lines used for chis
- Aadded option to change the size of the scrollback buffer
- Added "dummy" command to enable or disable whether break- and watchpoints
trigger at dummy accesses or not.
- Check watchpoints in the order they were added, that makes the output in the
monitor less confusing when more than one watchpoint triggers at a time
- Show rasterline and cycle in both decimal and hex
- Add 'q' as a shorthand for 'quit'
- Improvements to the char/sprite display - use # over * for more contrast,
show the memory value(s) alongside binary view and fix bug showing multiple
sprites
- "list", "load" and "save" do now work with the filesystem device
- Drive numbers are now expected to be decimal
- Add monitor dump function to m6821 core
- Added info on head position/status to VIA io dump
- The display now (optionally) refreshes after each monitor command. this is not
cycle exact right now (only per scanline).
- Fixed accessing cartridge memory
- Improve expansion port mode status output
- Fix io command to shows IO space in address order
** vdrive
---------
- The filesystem device now uses shortened filenames by default to increase
compatibility.
- Disallow to silently overwrite existing files (optional, default is "no")
- Implemented "save @" to overwrite files (but do not simulate the well known
related bugs)
- Basic support for REL files in the File System Device. (Using P00 format, or
rather R00, is recommended)
- Fix some BAM track allocation issues in 8050/8250 disk images
- Avoid DISK FULL with 27 blocks free on .D80 / .D82.
- For D80/D82 images, when reading the directory, use the correct block to fetch
the disk's name from. This corrects a bad disk name in directory listings when
using a vdrive.
- Added proper creation of d1m, d2m and d4m images, the resulting image has 1
native partition spanning the entire disk.
- When formatting or validating an 8050 or 8250 image, the header sector wasn't
flagged as allocated. This resulted in VICE hanging when creating more than 80
files on the disk.
** True drive emulation
-----------------------
- More realistic modelling of the floppy drive wobble
- Changed lower limit for drive RPM to 260 and upper limit to 340 (ie +/- 40).
This is slightly more than possible with a real 1541.
** CPU fixes
------------
- Prevent IRQ/NMI from being served by the CPU when it has JAMed
- Perform all "dummy" accesses also in the non "sc" core
- Changed magic constant for LAX#imm to 0xEE as required(!) by wizball
** VDC fixes
------------
- Emulate VDC's internal buffer, issues with RFOVDC plasma part are fixed
- Several fixes for interlace, now vdcmodemania interlace parts all work and
soci VDC test #5 works
- Improved VDC-FLI handling, 3 byte attribute offset doesn't always apply,
fixes vdc-mcm demo and vdcmodemania fli part
- Fix issue with wrap around of VDC ram affecting vdcmodemania fli part
- Fixed VDC reg #28 bit #4, it sets the addressing mode, it does not actually
reflect the amount of ram installed.
- Correct aspect ratio for PAL or NTSC
- Screen is resized automatically on PAL/NTSC change
- Corrected size of saved screenshots or videos
- Correct handling of unused bits in some registers
- Corrections and enhancements to monitor "io d600" dump
** SID fixes
------------
- Fixed the filter saturation
- Noise writeback fixes
- Envelope regression fix
- Fix the coefficients for the resid external filter
- Rough implementation of the shift register and waveform zero bitfade
- Added 4 possible additional SID chips for a total of 8 (x64*/xscpu64/x128 only)
** C64 fixes
------------
- Enable/disable datasette/tapecart as needed on autostart
- Several new cartridge types added:
- The 'ZIPP-CODE 48' cartridge
- The polish 'blackbox v8' cartridge
- The polish 'Blackbox V3' cartridge
- The polish 'Blackbox V4' cartridge
- The polish 'Blackbox V9' cartridge
- The 'REX RAM-Floppy' cartridge
- The czech 'BIS-Plus' cartridges (2,4,8kb variants)
- The polish 'SD-BOX' cartridge
- The 'MultiMAX' cartridge
- The argentinian HERO bootleg cartridge
- The "GMod3" cartridge
- Action Replay fixes:
- When reading from IO1 area when AR5 is enabled, the value currently on the
bus will get written to the register, causing the famous bug/crash
- Handle the broken mode 0x22 and emit a warning on potentially problematic
reads
- Retroreplay fixes:
- Allow reading back the status of the freeze button
- Fix reads from IO1 when the clockport is not active.
- Handle the somewhat broken mode 0x22 like on real retro replay
- Nordic Power fixes:
- Fix writing to cartridge ram in mode 0x22
** C128 fixes
-------------
- FD2000/4000 work again, including burst mode
** VIC20 fixes
--------------
- Added handling for 32k cartridge files that contain blocks 1,2,3 and 5.
- Fixed megacart nvram addressing
- External audio filter fix
** PET fixes
------------
- Teach VICE where BASIC 1 keeps the current screen line address, so that
Autostart works.
- Made the UK business keyboard the default and moved it to the top of the list
of keyboards. This makes the default setup work with the keymaps and editor
ROM we have in VICE.
- For CRTC-less PETs, use screen setup values that work out to 60 Hz refresh.
- Tuned the display timing values for non-CRTC PETs
- Renamed PET ROMs to include their part number (in line with Zimmers). This
should make it more clear which editor ROMs exist.
- The 4032B model used a wrong Editor ROM
** SDL fixes
------------
- Implemented mouse pointer auto-hiding
- Remember last position in the main menu
- Several Keyboard mapping fixes:
- Fix (some) plus4 keymaps
- Some pet keymap fixes
- Updated/fixed symbolic mapping for italian keyboard
- Some tweaks to symbolic keymap for german layout (plus4)
- Added keymap from/for BMC64 (c64)
** GTK3 fixes
-------------
- Almost all causes of stuttering / audio glitches when interacting with the UI
have been resolved.
- Cairo is completely gone, all major platforms use their native rendering
backend
- Added hotkey "pause" to generate a screenshot from current canvas using a
generated filename in the current working directory
- Rearranged cartridge/io settings around a bit. not perfect yet, but probably
better than before
- Add optional hiding of VDC display
- Make double-clicking on the emulated screen switch fullscreen mode
- Alt+Enter will now also toggle fullscreen mode
- Added option to pause the emulation when settings dialog is open
- Remember not only the last directory but also the last file in file dialogs
- Show "Use Alt+M to disable mouse grab" in window title if mouse grab is
active
- Support 'StartMinimized'/-minimized
- Added 'restore window geometry' to UI and commandline to allow users to apply/
ignore the last position/size of the window(s) stored in vicerc/vice.ini.
- Allow for 8 'analog' controllers on Linux
- Added Alt+Shift+F12 VICII to switch border mode in x64sc
- Moved the netplay settings from the 'File' menu to the settings dialog
- Added 'Host' root node in the settings UI, move Autostart, Monitor, Netplay,
Snapshot/Event/Media recording directory and start-mode under that.
- Also move Host->Machine settings (CWD and JAM-action) under Host, remove the
Host->Machine node.
- Use workaround for GTKFileChooser's "Select" button not being active when
selecting/creating a directory.
- Several Keyboard mapping fixes:
- Added keymaps for THE64 keyboard
- Updated keymaps for pet graphical keyboard
- Fix shift+z/y in german positional mapping (c64)
- Some tweaks to symbolic keymap for german layout (plus4)
- Some tweaks to symbolic keymap for german layout (c64)
- Fix (some) plus4 keymaps
- Added positional keymap for Swedish keyboard
- Fix ctrl and cbm mapping (c128)
** macOS fixes
--------------
- VICE GTK performance on macOS is now excellent and we finally now recommend
the GTK build over the SDL build.
- macOS bindist now relies on macports rather than homebrew. With macports it’s
possible to build deps from source while targeting an older macOS version,
which allows us to continue to support macOS 10.9+.
- Re-enabled the bafflingly disabled working macOS joystick code
- Actual macOS game controller device names are now listed instead of 6x “Analog
joystick n”
** c1541 fixes
--------------
- Added some REL file support
- support for REL files to the c1541 COPY subcommand
- Add subcommand to show dir entry of a file, and all side sectors.
- Add support for SEQ and USR files for the -extract command
- Renamed `zcreate` command to `unzip`. 'unzip' (dissolve a zipcode archive)
sounds more logical than 'zcreate'. When we decide to also support creating
zipcode archives, a proper name for that could be 'zip' or 'zipcode'.
** petcat fixes
---------------
- Added missing basic v4 tokens for cbmII
* Changes in Vice 3.4
=====================
We are still looking for dedicated maintainers for the Windows port, if you
want to help improving these and/or want to provide binaries, please get in
touch.
We also needs support in fixing the various keyboard mappings, please test the
keyboard in your favourite OS and port and report any problems.
We welcome dqh in the team, who will take care of the macOS port.
** General
----------
- Remove support for Syllable OS, SCO, QNX4, QNX6, SGI, AIX, OpenStep/NextStep/
Rhapsody, Solaris/OpenIndiana and remaining traces of Minix, NeXT, SKYOS,
UNIXWARE, Sortix
- Remove remaining traces of support for WATCOM, MSVC, OpenWatcom
- Remove aRts support
- Remove YUV rendering
- Remove generation of .chm, .hlp and .info files. Please use the .pdf or .html
- skip building x64 unless --enable-x64 is passed to configure
- do not use the new/experimental 8580 filters unless --enable-new8580filter
is passed to configure
- update pattern generator for uninitialized ram. changed defaults so all
raminitpattern tests pass.
- remove block device disk image (rawdrive) "support". in linux it was never
needed (just use the device file) and on windows it was never implemented.
- added support for the IP232 protocol that was used by the long lost VICE1.19
hack, and which is supported by tcpser for emulating DTR/DCD (carrier detect)
- various userport rs232 fixes
- always save gifs as gif89
- added a couple shift flags to keyboard maps to support virtual cbm/ctrl and
mandatory pressed host modifiers. not all keymaps have been updated yet.
- ACIA IRQ fix
- create empty half tracks when mounting d64. fixes skew.d64
- new headless port that can be enabled by passing --enable-headlessui to
configure. this can be used to build an emulator without video output, which
may be useful for scripting.
** Autostart fixes
------------------
- Implemented autostart for tapecart images (.tcrt)
- Automatically change drive type when autostarting disk images that do not
work with the currently active drive.
- Make AutostartRunWithColon default
- fixed autostart when memory hacks are enabled (plus60k, plus256k, plus4)
- make auto-starting from tape also respect the 'basicload' option, loading
absolute by default
- when using a disk image to autostart .prg files, remove the .prg extension
from the temporary file name
- many detail fixes that make autostart work as expected in all emulators and
in all configurations (eg C128 in 80 columns or C64 mode)
** Snapshot fixes
-----------------
- More strict checking and more explizit error reporting
** 6510 fixes
-------------
- Accurate emulation of ANE#imm and LAX#imm "magic constant" dependency on RDY.
All occurrences of unstable use are being logged now. LAX#imm "magic constant"
changed to 0xEF, which makes the problem cases "spectipede" and "turrican 3"
work.
- fix: reset should set the I flag
** VIC-II fixes
---------------
- Accurate emulation of the "VSP bug". Warnings about possible VSP related
memory corruption are always logged, actual memory corruption is still
optional.
- Fixed changing more than one colour register via monitor
** VIC fixes
------------
- new noise LFSR as reverse engineered by Lance Ewing.
** SID fixes
------------
- use model dependent floating output ttl values like in residfp
** Monitor
----------
- Support full expressions in the monitor conditional breakpoints.
- When deleting checkpoints, reset the index to 1 when there are no more
checkpoints left
- Added 'RL' for rasterline and 'CY' for cycle in line to list of conditionals
that can be used for breakpoints.
- in mc/ms commands show asterisk for 1s and dots for 0s, not the other way
around
- adjust number of disassembled lines so the top line does not scroll out of
the window when labels are used.
- Added "log" and "logname" commands to control logging to a file
** vdrive
---------
- added rudimentary support for CMD-style reading of the RTC
- respect error info in disk images (only when reading right now). Should trick
some simple protections.
- report 65535 blocks free rather than 0 so that applications that query
available disk space before saving work as expected, e.g. some BBSs
** C-64 fixes
-------------
- added support for MAX Basic cartridge, new CRTID 61
- added clockport device for rrnet mk3
- fixed reading of 'open' clockport, fixed io dump for clockport devices
- implemented support for cartridge hardware revision in the crt format
- When attaching an Easyflash cartridge image, replace the EAPI driver with the
one for the flash chip VICE supports. This way EF images that contain a
different driver (for whatever reason) will still work.
- various keymaps added and/or fixed/updated.
** C-128 fixes
--------------
- added proper C128D model type.
- various MMU fixes
- fixed broken memory mapping in C64 mode
- Completely rewritten VDC vertical handling code. VDC101 demo with it's
vdc-split technique is now fully emulated. This rewrite attempts to emulate
more how the VDC works internally, and how the video signal/screen react, so
the border height etc is now more naturally handled.
- Various misc VDC fixes, e.g. show blank lines with certain register combinations
** GTK3 UI
----------
- Implemented "restore display" (Alt+r). Resets the active window to its
minimal/natural size. Handy when stretching the window and then not knowing
you can make the window smaller again with resizing that same window until
it doesn't get smaller.
- Change double-clicking images in smart/diskattach dialogs to 'open' instead
of autostarting
- added options to select rendering backend and filter
- fixed opening files with UTF8 encoded filenames
- Make the (VTE) monitor display on top of the emulated machine window when in
fullscreen
- copy only used icons into the distribution, which drastically reduced its size
- Added keyboard debugging to the statusbar
- Added * (all files) filter to the fliplist attach dialog. This will allow
people to use Pi1541 *.lst files at their own peril.
- Add proper statusbar messages when using the fliplist.
- Add howto about creating a GTK3-Windows cross-compiler on Debian with Fedora
packages (aka FrankenVICE)
- only show the host keyboard mappings in the list for which we have a valid
mapping, grey out symbolic/positional depending on what keymaps are actually
available
- Move joystick settings to the joystick widget on the statusbar.
- Windows: add icons to binaries
- allow better control of the filter settings by removing tick marks
of the sliders and adding spinboxes (6581+ReSID only)
- Fix the 'media recording' dialog to not show empty widgets when FFMPEG support
is missing, show hint on compiling in FFMPEG instead.
** SDL fixes
------------
- make hotkeys only check left alt, which makes right alt (alt-gr) work in
keyboard mappings.
** macOS fixes
--------------
- make open-gl work
- binary distributions, font support, GTK3 dock icon
- fix missing icon theme, fixed pdf manual generation, improved build
instructions
- fixed macOS make bindist when building out of tree
- Added instructions for building and debugging using Xcode
* Changes in VICE 3.3
=====================
This release stabilizes and introduces the GTK3 UI as the primary user interface
for all major ports. For "lesser" platforms we still have the SDL1/SDL2 based
This release stabilizes and introduces the GTK3 UI as the primary user interface
for all major ports. For "lesser" platforms we still have the SDL1/SDL2 based
interface. All other user interfaces have been removed. RIP
We are still looking for dedicated maintainers for the Windows- and macOS ports,
@ -32,12 +740,12 @@ in touch.
----------
- Old, unmaintained, ports removed:
* MacOS Cocoa: use SDL or Gtk3
* WinVice: use SDL or Gtk3
* MacOS Cocoa: use SDL or GTK3
* WinVice: use SDL or GTK3
* BeOS/Haiku: use SDL
* AmigaOS: use SDL
* Unix Xaw: use SDL or Gtk3
* Unix Gtk2: use SDL or Gtk3
* Unix Xaw: use SDL or GTK3
* Unix GTK2: use SDL or GTK3
* OS/2: use SDL
- Fix building against external ffmpeg >= 4.0
@ -48,21 +756,21 @@ in touch.
- Make VICE much faster by using -O3 vs -O2
- add a slot number before the literal name of a game-controller, which is less
- add a slot number before the literal name of a game-controller, which is less
confusing when more than one controller of the same type is used
- fix parsing of the commandline with -config first
- added dutch to list of keyboard mappings
** Unix fixes
-------------
- the sleep function was not handling timer overflows properly, which happens
every 4 seconds on a 32bit machine with nanosleep()
** macOS fixes
--------------
@ -114,6 +822,8 @@ in touch.
- fixed initial state of the I/O ports
- revert part of r32790, makes galaxians g64 load again
** Monitor
----------
@ -122,10 +832,10 @@ in touch.
- in memory dump limit the number of bytes per line to a power of two.
- instead of limiting disassembler output to a number of bytes, limit it to the
- instead of limiting disassembler output to a number of bytes, limit it to the
height of the current terminal
** c1541
--------
@ -175,7 +885,7 @@ in touch.
- added norwegian c128 chargen
** Gtk3 UI
** GTK3 UI
----------
- Remember last used settings "page" in the settings UI
@ -223,6 +933,8 @@ in touch.
- fix assignment of user keymaps
- fix Shift+P pausing the emulator, it now properly pauses with Alt+Shift+P
** SDL UI
---------
@ -233,21 +945,21 @@ in touch.
- added browsing inside disk and tape images.
- added pageup/pagedown/home/end key mappings, and support them in the menus,
- added pageup/pagedown/home/end key mappings, and support them in the menus,
file-selector and text viewer
- Terminal- or UI based monitor can be selected at runtime in all ports
- added a hack to get rid of spurious keyup/keydown events after switching
- added a hack to get rid of spurious keyup/keydown events after switching
from/to fullscreen
- generate suitable fonts for the ui at startup, use some custom gfx for the ui.
fixes the problem that the ui chars will screw up when the user selects a
- generate suitable fonts for the ui at startup, use some custom gfx for the ui.
fixes the problem that the ui chars will screw up when the user selects a
japanese chargen :)
- when changing color- or crt emulation settings, print a color matrix on screen
- when changing color- or crt emulation settings, print a color matrix on screen
and update the resources in realtime
- UI cosmetics:
- fix slider length, use custom chars for slider
- make screen all black before entering the UI
@ -263,7 +975,7 @@ in touch.
renderer is not OpenGL.
** VSID (Gtk3)
** VSID (GTK3)
--------------
- Remember last-used-directory for the open file dialog
@ -408,7 +1120,7 @@ in touch.
- Fixed saving of GMOD2 cartridge image.
** C128 changes
---------------
@ -1489,7 +2201,7 @@ SDL changes
- XRandR fullscreen implemented
- Command line option `-fullscreen' is supposed to do something
useful.
useful.
- Vsync code imported from win32 (based on openGL extension).
see also doc/openGLsync-howto.txt.
@ -1497,7 +2209,7 @@ SDL changes
- Vidmode (fullscreen support) is broken and therefore marked as
deprecated. It will be removed in the next release if no-one takes
responsibility to fix the broken code and is willing to maintain the
code.
code.
- PAL Emulation (new implementation, improved speed) should be usable
again (it was broken on certain display depths).
@ -1530,7 +2242,7 @@ SDL changes
The characters after the colon can be used to specify additional
settings for the COM port. The string must have the same form as the
mode command's command-line arguments:
[baud=b][parity=p][data=d][stop=s][to={on|off}][xon={on|off}]
[baud=b][parity=p][data=d][stop=s][to={on|off}][xon={on|off}]
[odsr={on|off}][octs={on|off}][dtr={on|off|hs}][rts={on|off|hs|tg}]
[idsr={on|off}]
@ -1542,7 +2254,7 @@ SDL changes
(Sorry, no fancy UI yet.)
- vsid GUI reworked:
- vsid GUI reworked:
* infoline appears only by pressing "I"
* raises process priority. Otherwise, when in background,
looses cpu power and music is not played at correct speed
@ -1587,7 +2299,7 @@ SDL changes
(see extended Resource Inspector)
- Completely rewritten joystick driver that supports user-definable buttons
for fire and all directions.
for fire and all directions.
- Copy & Paste support for emulator and monitor/log window
@ -1941,7 +2653,7 @@ SDL changes
** Mac OSX X11 changes
----------------------
- Added Gtk+ Port
- Added GTK+ Port
- Introduced single "smart" Application Bundle VICE.app
@ -2122,10 +2834,10 @@ SDL changes
- Xaw Statusbar fixes and improvements (new buttons for recording).
- An experimental patch for Gnome2/Gtk2 support is available (See
website). Vice-1.19 will be the last Gnome1/Gtk1 version officially
supported.
The Gnome2/Gtk2 version is known to work on state-of-the-art
- An experimental patch for Gnome2/GTK2 support is available (See
website). Vice-1.19 will be the last Gnome1/GTK1 version officially
supported.
The Gnome2/GTK2 version is known to work on state-of-the-art
Linux distributions (e.g. Fedora Core 4).
See also src/arch/unix/x11/gnome/TODO
@ -2435,7 +3147,7 @@ SDL changes
** General
----------
- Audio and video streams can be recorded now.
- Audio and video streams can be recorded now.
Unix users: Use configure parameter `--enable-ffmpeg'; make sure you
have the required libraries installed (package ffmpeg-0.4.8 ori
newer).

144
vice/README
View File

@ -1,5 +1,5 @@
VICE 3.3 Dec 2018
VICE 3.5 Dec 2020
_______________
@ -18,26 +18,19 @@
----------------------------------------------------------------------------
This release stabilizes and introduces the GTK3 UI as the primary user
interface for all major ports. For "lesser" platforms we still have the SDL
based interface. All other user interfaces have been removed. RIP
We are still looking for dedicated maintainers for the Windows- and macOS
ports, if you want to help improving these and/or want to provide binaries,
We are still looking for dedicated maintainers for the Windows port, if you
want to help improving these and/or want to provide binaries,
please get in touch.
----------------------------------------------------------------------------
This is version 3.3 of VICE, the multi-platform C64, C128, VIC20,
This is version 3.5 of VICE, the multi-platform C64, C128, VIC20,
PET, PLUS4 and CBM-II emulator. This version can be compiled for
MSDOS, Win32, OS/2, BeOS, QNX 4.x, QNX 6.x, AmigaOS, Dingoo,
Syllable, SkyOS and for most Unix systems provided with
the X Window System version 11, R5 or later.
Win32, macOS, Haiku and for most Unix systems provided with the X Window
System version 11, R5 or later.
The following programs are included:
- x64, a C64 emulator;
- x64sc, a C64 emulator focused on accuracy;
- xscpu64, a C64 emulator with a SuperCPU cart;
@ -64,41 +57,32 @@
- cartconv, a C64/C128 cartridge conversion program.
- x64, the old and less accurate C64 emulator, is no more built by default
and only included if explicitly enabled at configure time;
Moreover, the following documents are provided in both source and
binary distributions:
- README, this file;
- COPYING, the GNU General Public License under which VICE is
distributed -- *please read it before using the program*;
- INSTALL, installation instructions;
- NEWS, list of user-visible changes between this and older versions of VICE;
- FEEDBACK, something you should read before reporting bugs or sending mail
to any of the authors;
- COPYING, the GNU General Public License under which VICE is
distributed -- *please read it before using the program*;
The following documents are provided in the source distribution:
- in the doc directory:
- vice.texi, the complete documentation; documentation in various different
formats may be generated from it (vice.txt, vice.pdf, vice.chm, vice.hlp,
vice.guide, vice.inf, vice.info)
formats may be generated from it (vice.txt, vice.pdf)
- iec-bus.txt, overview of the VICE IEC bus emulation;
- CIA-README.txt, overview of the VICE CIA emulation;
- coding-guidelines.txt, description of VICE coding style
- Documentation-Howto.txt, information on how to edit the documentation
- Doxygen-Howto.txt, how to generate doxygen documentation
- Release-Howto.txt, some hints and reminders on how to create a release
tarball (for maintainers)
- ffmpeg-support.txt, this document details the results of test compiles
with regards to the included ffmpeg library.
- SDL-support.txt, this document details the results of test compiles with
regards to the SDL 1 and SDL 2 support.
- hardware-sids.txt, this document details the hardware SIDs and how they
are supported on the various platforms.
tarball (for maintainers) are supported on the various platforms.
- in the doc/readmes directory:
@ -108,13 +92,23 @@
- in the doc/building directory:
- Windows-MinGW-GTK3-Howto.txt, how to compile the Windows port using MingGW/MSYS2
- Linux-GTK3-Howto.txt, how to compile the GTK3 port on Linux
- GTK3-macOS.txt, how to compile the Mac OSX port with GTK3 UI
- SDL-Howto.txt, how to compile the SDL port on various platforms
- Android-Howto, how to compile the Android SDL port
- FreeBSD-GTK3-Howto.txt, hints on compiling the GTK3 port on FreeBSD
- GTK3-cross-build-setup.md, (incomplete) instructions on how to set up
a windows crosscompiler on linux
- GTK3-debian-frankenvice.md, instructions on how to set up a windows
crosscompiler on debian using precompiled fedora mingw packages
- GTK3-Fedora-cross-build-setup.md, (incomplete) instructions on how to
set up a windows crosscompiler on Fedora linux
- Linux-GTK3-Howto.txt, how to compile the GTK3 port on Linux
- macOS-Distribution-Howto.txt, how to build the macOS binary distribution
- macOS-Howto.txt, how to build on macOS (might be deprecated)
- macOS-Xcode-Howto.txt, how to build the macOS port(s) using Xcode
- NetBSD-Gtk3-Wowto.txt, hints on compiling for NetBSD with Gtk3
- NetBSD-howto.txt, hints on compiling for NetBSD
- SDL-Howto.txt, how to compile the SDL port on various platforms
- Windows-MinGW-GTK3-Howto.txt, how to compile the Windows port using
MingGW/MSYS2
For the latest news, have a look at the VICE home page:
@ -129,39 +123,97 @@
- The list of known BUGS,
http://vice-emu.sourceforge.net/wiki/index.php/Todo#Known_Issues
New versions are made available quite often, so please stay tuned.
New versions are made available usually once per year, so please stay tuned.
You may also check out the automatic nightly builds, which are kindly provided
by the pokefinder crew: https://vice.pokefinder.org/
Have fun!
Feedback
--------
It's always nice to receive feedback and/or bugreports about VICE, but please
read these few notes before sending mail to anybody in the team.
- Please don't send any HTML mail (we really hate that!). Please make sure
you turn off the "rich text" (HTML) feature.
- Please don't send any binaries without asking first.
- Please read the following documents carefully before reporting a bug or a
problem you cannot solve:
- the VICE documentation (you should have received it with the main
distribution--if not, tell us);
Online version - http://vice-emu.sourceforge.net/vice_toc.html
- the VICE wiki at http://vice-emu.pokefinder.org/
- Before reporting a bug, please try a recent nightly build and check if your
issue is already fixed. You can fine nightly builds for windows here:
<SF-uploads via Travis-CI?>
- When you report a bug, please try to be as accurate as possible and describe
how it can be reproduced to the very detail. You should also tell us what
machine you are running on, what operating system you are using as well as
the version of Vice.
- Please don't ask us how to transfer original C64 disk or tapes to your PC. To
transfer disks, you can use the Star Commander (http://sta.c64.org/sc.html).
- Please don't ask us where to find games for the emulator on the Internet.
- Please don't ask us when the next version will be out, because we really
don't know. We are trying to make at least one release per year, around
christmas.
- Please write in English.
In any case, we would be really glad to receive your comments about VICE.
The central place for bug reports is the bug tracker at sourceforge:
https://sourceforge.net/p/vice-emu/bugs/
At sourceforge you can also submit feature requests:
https://sourceforge.net/p/vice-emu/feature-requests/
The email address for feedback is: vice-emu-mail@lists.sourceforge.net
Thanks!
Copyright notice
----------------
VICE, the Versatile Commodore Emulator
Core Team Members:
2005-2018 Marco van den Heuvel
2007-2018 Fabrizio Gennari
2009-2018 Groepaz
2010-2018 Olaf Seibert
2011-2018 Marcus Sutton
2011-2018 Kajtar Zsolt
2016-2018 AreaScout
2016-2018 Bas Wassink
2017-2018 Michael C. Martin
1999-2020 Martin Pottendorfer
2005-2020 Marco van den Heuvel
2007-2020 Fabrizio Gennari
2009-2020 Groepaz
2009-2020 Errol Smith
2009-2020 Ingo Korb
2010-2020 Olaf Seibert
2011-2020 Marcus Sutton
2011-2020 Kajtar Zsolt
2016-2020 AreaScout
2016-2020 Bas Wassink
2017-2020 Michael C. Martin
2018-2020 Christopher Phillips
2019-2020 David Hogan
Inactive/Ex Team Members:
1999-2017 Martin Pottendorfer
2011-2016 Stefan Haubenthal
2015-2016 BSzili
1999-2016 Andreas Matthies
2007-2015 Daniel Kahlin
2009-2015 Errol Smith
2012-2014 Benjamin 'BeRo' Rosseaux
2011-2014 Ulrich Schulz
2011-2014 Thomas Giesel
2009-2014 Ingo Korb
2008-2014 Antti S. Lankila
2006-2014 Christian Vogelgsang
1998-2014 Dag Lem

199
vice/aclocal.m4 vendored
View File

@ -1,6 +1,6 @@
# generated automatically by aclocal 1.15 -*- Autoconf -*-
# generated automatically by aclocal 1.16.2 -*- Autoconf -*-
# Copyright (C) 1996-2014 Free Software Foundation, Inc.
# Copyright (C) 1996-2020 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@ -20,7 +20,7 @@ You have another version of autoconf. It may work, but is not guaranteed to.
If you have problems, you may need to regenerate the build system entirely.
To do so, use the procedure documented by the package, typically 'autoreconf'.])])
# Copyright (C) 2002-2014 Free Software Foundation, Inc.
# Copyright (C) 2002-2020 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@ -32,10 +32,10 @@ To do so, use the procedure documented by the package, typically 'autoreconf'.])
# generated from the m4 files accompanying Automake X.Y.
# (This private macro should not be called outside this file.)
AC_DEFUN([AM_AUTOMAKE_VERSION],
[am__api_version='1.15'
[am__api_version='1.16'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
m4_if([$1], [1.15], [],
m4_if([$1], [1.16.2], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@ -51,14 +51,14 @@ m4_define([_AM_AUTOCONF_VERSION], [])
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
[AM_AUTOMAKE_VERSION([1.15])dnl
[AM_AUTOMAKE_VERSION([1.16.2])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
# Figure out how to run the assembler. -*- Autoconf -*-
# Copyright (C) 2001-2014 Free Software Foundation, Inc.
# Copyright (C) 2001-2020 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@ -78,7 +78,7 @@ _AM_IF_OPTION([no-dependencies],, [_AM_DEPENDENCIES([CCAS])])dnl
# AM_AUX_DIR_EXPAND -*- Autoconf -*-
# Copyright (C) 2001-2014 Free Software Foundation, Inc.
# Copyright (C) 2001-2020 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@ -130,7 +130,7 @@ am_aux_dir=`cd "$ac_aux_dir" && pwd`
# AM_CONDITIONAL -*- Autoconf -*-
# Copyright (C) 1997-2014 Free Software Foundation, Inc.
# Copyright (C) 1997-2020 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@ -161,7 +161,7 @@ AC_CONFIG_COMMANDS_PRE(
Usually this means the macro was only invoked conditionally.]])
fi])])
# Copyright (C) 1999-2014 Free Software Foundation, Inc.
# Copyright (C) 1999-2020 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@ -352,13 +352,12 @@ _AM_SUBST_NOTMAKE([am__nodep])dnl
# Generate code to set up dependency tracking. -*- Autoconf -*-
# Copyright (C) 1999-2014 Free Software Foundation, Inc.
# Copyright (C) 1999-2020 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
# _AM_OUTPUT_DEPENDENCY_COMMANDS
# ------------------------------
AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
@ -366,49 +365,43 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
# Older Autoconf quotes --file arguments for eval, but not when files
# are listed without --file. Let's play safe and only enable the eval
# if we detect the quoting.
case $CONFIG_FILES in
*\'*) eval set x "$CONFIG_FILES" ;;
*) set x $CONFIG_FILES ;;
esac
# TODO: see whether this extra hack can be removed once we start
# requiring Autoconf 2.70 or later.
AS_CASE([$CONFIG_FILES],
[*\'*], [eval set x "$CONFIG_FILES"],
[*], [set x $CONFIG_FILES])
shift
for mf
# Used to flag and report bootstrapping failures.
am_rc=0
for am_mf
do
# Strip MF so we end up with the name of the file.
mf=`echo "$mf" | sed -e 's/:.*$//'`
# Check whether this is an Automake generated Makefile or not.
# We used to match only the files named 'Makefile.in', but
# some people rename them; so instead we look at the file content.
# Grep'ing the first line is not enough: some people post-process
# each Makefile.in and add a new line on top of each file to say so.
# Grep'ing the whole file is not good either: AIX grep has a line
am_mf=`AS_ECHO(["$am_mf"]) | sed -e 's/:.*$//'`
# Check whether this is an Automake generated Makefile which includes
# dependency-tracking related rules and includes.
# Grep'ing the whole file directly is not great: AIX grep has a line
# limit of 2048, but all sed's we know have understand at least 4000.
if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
dirpart=`AS_DIRNAME("$mf")`
else
continue
fi
# Extract the definition of DEPDIR, am__include, and am__quote
# from the Makefile without running 'make'.
DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
test -z "$DEPDIR" && continue
am__include=`sed -n 's/^am__include = //p' < "$mf"`
test -z "$am__include" && continue
am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
# Find all dependency output files, they are included files with
# $(DEPDIR) in their names. We invoke sed twice because it is the
# simplest approach to changing $(DEPDIR) to its actual value in the
# expansion.
for file in `sed -n "
s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
# Make sure the directory exists.
test -f "$dirpart/$file" && continue
fdir=`AS_DIRNAME(["$file"])`
AS_MKDIR_P([$dirpart/$fdir])
# echo "creating $dirpart/$file"
echo '# dummy' > "$dirpart/$file"
done
sed -n 's,^am--depfiles:.*,X,p' "$am_mf" | grep X >/dev/null 2>&1 \
|| continue
am_dirpart=`AS_DIRNAME(["$am_mf"])`
am_filepart=`AS_BASENAME(["$am_mf"])`
AM_RUN_LOG([cd "$am_dirpart" \
&& sed -e '/# am--include-marker/d' "$am_filepart" \
| $MAKE -f - am--depfiles]) || am_rc=$?
done
if test $am_rc -ne 0; then
AC_MSG_FAILURE([Something went wrong bootstrapping makefile fragments
for automatic dependency tracking. If GNU make was not used, consider
re-running the configure script with MAKE="gmake" (or whatever is
necessary). You can also try re-running configure with the
'--disable-dependency-tracking' option to at least be able to build
the package (albeit without support for automatic dependency tracking).])
fi
AS_UNSET([am_dirpart])
AS_UNSET([am_filepart])
AS_UNSET([am_mf])
AS_UNSET([am_rc])
rm -f conftest-deps.mk
}
])# _AM_OUTPUT_DEPENDENCY_COMMANDS
@ -417,18 +410,17 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
# -----------------------------
# This macro should only be invoked once -- use via AC_REQUIRE.
#
# This code is only required when automatic dependency tracking
# is enabled. FIXME. This creates each '.P' file that we will
# need in order to bootstrap the dependency handling code.
# This code is only required when automatic dependency tracking is enabled.
# This creates each '.Po' and '.Plo' makefile fragment that we'll need in
# order to bootstrap the dependency handling code.
AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
[AC_CONFIG_COMMANDS([depfiles],
[test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
[AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
])
[AMDEP_TRUE="$AMDEP_TRUE" MAKE="${MAKE-make}"])])
# Do all the work for Automake. -*- Autoconf -*-
# Copyright (C) 1996-2014 Free Software Foundation, Inc.
# Copyright (C) 1996-2020 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@ -515,8 +507,8 @@ AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl
AC_REQUIRE([AC_PROG_MKDIR_P])dnl
# For better backward compatibility. To be removed once Automake 1.9.x
# dies out for good. For more background, see:
# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
# <https://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
# <https://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
AC_SUBST([mkdir_p], ['$(MKDIR_P)'])
# We need awk for the "check" target (and possibly the TAP driver). The
# system "awk" is bad on some platforms.
@ -583,7 +575,7 @@ END
Aborting the configuration process, to ensure you take notice of the issue.
You can download and install GNU coreutils to get an 'rm' implementation
that behaves properly: <http://www.gnu.org/software/coreutils/>.
that behaves properly: <https://www.gnu.org/software/coreutils/>.
If you want to complete the configuration process using your problematic
'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
@ -625,7 +617,7 @@ for _am_header in $config_headers :; do
done
echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
# Copyright (C) 2001-2014 Free Software Foundation, Inc.
# Copyright (C) 2001-2020 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@ -646,7 +638,7 @@ if test x"${install_sh+set}" != xset; then
fi
AC_SUBST([install_sh])])
# Copyright (C) 2003-2014 Free Software Foundation, Inc.
# Copyright (C) 2003-2020 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@ -667,7 +659,7 @@ AC_SUBST([am__leading_dot])])
# Check to see how 'make' treats includes. -*- Autoconf -*-
# Copyright (C) 2001-2014 Free Software Foundation, Inc.
# Copyright (C) 2001-2020 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@ -675,49 +667,42 @@ AC_SUBST([am__leading_dot])])
# AM_MAKE_INCLUDE()
# -----------------
# Check to see how make treats includes.
# Check whether make has an 'include' directive that can support all
# the idioms we need for our automatic dependency tracking code.
AC_DEFUN([AM_MAKE_INCLUDE],
[am_make=${MAKE-make}
cat > confinc << 'END'
[AC_MSG_CHECKING([whether ${MAKE-make} supports the include directive])
cat > confinc.mk << 'END'
am__doit:
@echo this is the am__doit target
@echo this is the am__doit target >confinc.out
.PHONY: am__doit
END
# If we don't find an include directive, just comment out the code.
AC_MSG_CHECKING([for style of include used by $am_make])
am__include="#"
am__quote=
_am_result=none
# First try GNU make style include.
echo "include confinc" > confmf
# Ignore all kinds of additional output from 'make'.
case `$am_make -s -f confmf 2> /dev/null` in #(
*the\ am__doit\ target*)
am__include=include
am__quote=
_am_result=GNU
;;
esac
# Now try BSD make style include.
if test "$am__include" = "#"; then
echo '.include "confinc"' > confmf
case `$am_make -s -f confmf 2> /dev/null` in #(
*the\ am__doit\ target*)
am__include=.include
am__quote="\""
_am_result=BSD
;;
esac
fi
AC_SUBST([am__include])
AC_SUBST([am__quote])
AC_MSG_RESULT([$_am_result])
rm -f confinc confmf
])
# BSD make does it like this.
echo '.include "confinc.mk" # ignored' > confmf.BSD
# Other make implementations (GNU, Solaris 10, AIX) do it like this.
echo 'include confinc.mk # ignored' > confmf.GNU
_am_result=no
for s in GNU BSD; do
AM_RUN_LOG([${MAKE-make} -f confmf.$s && cat confinc.out])
AS_CASE([$?:`cat confinc.out 2>/dev/null`],
['0:this is the am__doit target'],
[AS_CASE([$s],
[BSD], [am__include='.include' am__quote='"'],
[am__include='include' am__quote=''])])
if test "$am__include" != "#"; then
_am_result="yes ($s style)"
break
fi
done
rm -f confinc.* confmf.*
AC_MSG_RESULT([${_am_result}])
AC_SUBST([am__include])])
AC_SUBST([am__quote])])
# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
# Copyright (C) 1997-2014 Free Software Foundation, Inc.
# Copyright (C) 1997-2020 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@ -756,7 +741,7 @@ fi
# Helper functions for option handling. -*- Autoconf -*-
# Copyright (C) 2001-2014 Free Software Foundation, Inc.
# Copyright (C) 2001-2020 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@ -785,7 +770,7 @@ AC_DEFUN([_AM_SET_OPTIONS],
AC_DEFUN([_AM_IF_OPTION],
[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
# Copyright (C) 1999-2014 Free Software Foundation, Inc.
# Copyright (C) 1999-2020 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@ -832,7 +817,7 @@ AC_LANG_POP([C])])
# For backward compatibility.
AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])
# Copyright (C) 2001-2014 Free Software Foundation, Inc.
# Copyright (C) 2001-2020 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@ -851,7 +836,7 @@ AC_DEFUN([AM_RUN_LOG],
# Check to make sure that the build environment is sane. -*- Autoconf -*-
# Copyright (C) 1996-2014 Free Software Foundation, Inc.
# Copyright (C) 1996-2020 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@ -932,7 +917,7 @@ AC_CONFIG_COMMANDS_PRE(
rm -f conftest.file
])
# Copyright (C) 2009-2014 Free Software Foundation, Inc.
# Copyright (C) 2009-2020 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@ -992,7 +977,7 @@ AC_SUBST([AM_BACKSLASH])dnl
_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
])
# Copyright (C) 2001-2014 Free Software Foundation, Inc.
# Copyright (C) 2001-2020 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@ -1020,7 +1005,7 @@ fi
INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
AC_SUBST([INSTALL_STRIP_PROGRAM])])
# Copyright (C) 2006-2014 Free Software Foundation, Inc.
# Copyright (C) 2006-2020 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@ -1039,7 +1024,7 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
# Check how to create a tarball. -*- Autoconf -*-
# Copyright (C) 2004-2014 Free Software Foundation, Inc.
# Copyright (C) 2004-2020 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@ -1170,4 +1155,8 @@ AC_SUBST([am__tar])
AC_SUBST([am__untar])
]) # _AM_PROG_TAR
m4_include([acinclude.m4])
m4_include([m4/ax_cxx_compile_stdcxx.m4])
m4_include([m4/lib-ld.m4])
m4_include([m4/pkg.m4])
m4_include([m4/vice_args.m4])
m4_include([m4/vice_compiler_checks.m4])

29
vice/autogen.sh
View File

@ -6,6 +6,7 @@
# Written by
# Spiro Trikaliotis <spiro.trikaliotis@gmx.de>
# Marco van den Heuvel <blackystardust68@yahoo.com>
# Bas Wassink <b.wassink@ziggo.nl>
#
# This file is part of VICE, the Versatile Commodore Emulator.
# See README for copyright notice.
@ -26,6 +27,12 @@
# 02111-1307 USA.
#
# VICE version, used generate configure.ac from configure.proto
VICE_VERSION_MAJOR=3
VICE_VERSION_MINOR=4
VICE_VERSION_REV=0
# minimum autoconf version required
ACONF_VERSION_REQ_MAJ=2
ACONF_VERSION_REQ_MIN=60
@ -50,12 +57,6 @@ generate_configure_in() {
configure_needs_ac=yes
fi
fi
if test x"$configure_needs_ac" = "xyes"; then
sed s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g <configure.proto >configure.ac
else
cp configure.proto configure.ac
fi
}
@ -173,30 +174,16 @@ do_automake() {
}
buildfiles() {
FILES_TO_REMEMBER="INSTALL"
# Save some files which should not be overwritten
if [ -f configure.ac ] || [ -f configure.in ]; then
for A in $FILES_TO_REMEMBER; do
[ -e "$A" ] && mv -f "$A" "$A.backup"
done
do_aclocal
do_autoconf
do_autoheader
do_automake
# Restore the files which should not be overwritten
for A in $FILES_TO_REMEMBER; do
[ -e "$A.backup" ] && mv -f "$A.backup" "$A"
done
fi
}
# Script entry point
autoconf_line=`autoconf --version`

7
vice/build/Makefile.am
View File

@ -1,9 +1,4 @@
SUBDIRS = \
android \
beos \
macosx \
nextstep \
openstep \
openwatcom \
qnx4 \
rhapsody
mingw

79
vice/build/Makefile.in
View File

@ -1,7 +1,7 @@
# Makefile.in generated by automake 1.15 from Makefile.am.
# Makefile.in generated by automake 1.16.2 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2014 Free Software Foundation, Inc.
# Copyright (C) 1994-2020 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@ -89,7 +89,10 @@ build_triplet = @build@
host_triplet = @host@
subdir = build
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
am__aclocal_m4_deps = $(top_srcdir)/m4/ax_cxx_compile_stdcxx.m4 \
$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/pkg.m4 \
$(top_srcdir)/m4/vice_args.m4 \
$(top_srcdir)/m4/vice_compiler_checks.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
@ -132,7 +135,7 @@ am__recursive_targets = \
$(RECURSIVE_CLEAN_TARGETS) \
$(am__extra_recursive_targets)
AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
distdir
distdir distdir-am
am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
# Read a list of newline-separated strings from the standard input,
# and print each of them once, without duplicates. Input order is
@ -194,6 +197,7 @@ AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BASH = @BASH@
CC = @CC@
CCAS = @CCAS@
CCASDEPMODE = @CCASDEPMODE@
@ -238,6 +242,8 @@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
FW_DIR = @FW_DIR@
GFXOUTPUT_DRIVERS = @GFXOUTPUT_DRIVERS@
GFXOUTPUT_LIBS = @GFXOUTPUT_LIBS@
GLEW_CFLAGS = @GLEW_CFLAGS@
GLEW_LIBS = @GLEW_LIBS@
GLIB_CFLAGS = @GLIB_CFLAGS@
GLIB_LIBS = @GLIB_LIBS@
GREP = @GREP@
@ -245,15 +251,14 @@ GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
HAVE_CXX11 = @HAVE_CXX11@
HAVE_READLINE = @HAVE_READLINE@
HCRTF = @HCRTF@
HHC = @HHC@
ICONV = @ICONV@
ICOTOOL = @ICOTOOL@
INLINE_UNIT_GROWTH = @INLINE_UNIT_GROWTH@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
IPFC = @IPFC@
JOY_LIBS = @JOY_LIBS@
LAMEMP3SUB = @LAMEMP3SUB@
LDFLAGS = @LDFLAGS@
@ -269,12 +274,14 @@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEGUIDE = @MAKEGUIDE@
MAKEINFO = @MAKEINFO@
MAKERTF = @MAKERTF@
MAX_INLINE_INSN_SINGLE = @MAX_INLINE_INSN_SINGLE@
MKDIR_P = @MKDIR_P@
MKFONTDIR_BIN = @MKFONTDIR_BIN@
NATIVE_TOOLS_COMPILER = @NATIVE_TOOLS_COMPILER@
MONITOR_CFLAGS = @MONITOR_CFLAGS@
NETPLAY_LIBS = @NETPLAY_LIBS@
OBJC = @OBJC@
OBJCDEPMODE = @OBJCDEPMODE@
OBJCFLAGS = @OBJCFLAGS@
OBJCPP = @OBJCPP@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@ -290,8 +297,8 @@ PKG_CONFIG = @PKG_CONFIG@
PLATFORM_DOX_FLAGS = @PLATFORM_DOX_FLAGS@
PNG_CFLAGS = @PNG_CFLAGS@
PNG_LIBS = @PNG_LIBS@
QUICKTIME_INCLUDES = @QUICKTIME_INCLUDES@
QUICKTIME_LIBS = @QUICKTIME_LIBS@
PROGRAM_PREFIX = @PROGRAM_PREFIX@
PROGRAM_SUFFIX = @PROGRAM_SUFFIX@
RANLIB = @RANLIB@
READLINE = @READLINE@
READLINE_LIBS = @READLINE_LIBS@
@ -305,35 +312,49 @@ RESID_DTV_INCLUDES = @RESID_DTV_INCLUDES@
RESID_DTV_LIBS = @RESID_DTV_LIBS@
RESID_INCLUDES = @RESID_INCLUDES@
RESID_LIBS = @RESID_LIBS@
SDL2_CFLAGS = @SDL2_CFLAGS@
SDL2_IMAGE_CFLAGS = @SDL2_IMAGE_CFLAGS@
SDL2_IMAGE_LIBS = @SDL2_IMAGE_LIBS@
SDL2_LIBS = @SDL2_LIBS@
SDLCONFIG = @SDLCONFIG@
SDL_EXTRA_LIBS = @SDL_EXTRA_LIBS@
SDL_IMAGE_CFLAGS = @SDL_IMAGE_CFLAGS@
SDL_IMAGE_LIBS = @SDL_IMAGE_LIBS@
SDL_VERSION = @SDL_VERSION@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SOUND_AIX_OBJ = @SOUND_AIX_OBJ@
SOUND_DRIVERS = @SOUND_DRIVERS@
SOUND_HPUX_OBJ = @SOUND_HPUX_OBJ@
SOUND_LIBS = @SOUND_LIBS@
SOUND_MIDAS_OBJ = @SOUND_MIDAS_OBJ@
SOUND_SDL_OBJ = @SOUND_SDL_OBJ@
SOUND_SGI_OBJ = @SOUND_SGI_OBJ@
SOUND_USS_OBJ = @SOUND_USS_OBJ@
STRIP = @STRIP@
SVN = @SVN@
SVNVERSION = @SVNVERSION@
TAR = @TAR@
TEXI2DVI = @TEXI2DVI@
TEXI2IPF = @TEXI2IPF@
TFE_LIBS = @TFE_LIBS@
UI_LIBS = @UI_LIBS@
VERSION = @VERSION@
VERSION_COMBINED = @VERSION_COMBINED@
VERSION_RC = @VERSION_RC@
VICEDIR = @VICEDIR@
VICE_CFLAGS = @VICE_CFLAGS@
VICE_CPPFLAGS = @VICE_CPPFLAGS@
VICE_CXXFLAGS = @VICE_CXXFLAGS@
VICE_DATADIR = @VICE_DATADIR@
VICE_DOCDIR = @VICE_DOCDIR@
VICE_LDFLAGS = @VICE_LDFLAGS@
VICE_OBJCFLAGS = @VICE_OBJCFLAGS@
VICE_PDF_FILE_NAME = @VICE_PDF_FILE_NAME@
VICE_VERSION = @VICE_VERSION@
VICE_VERSION_BUILD = @VICE_VERSION_BUILD@
VICE_VERSION_MAJOR = @VICE_VERSION_MAJOR@
VICE_VERSION_MINOR = @VICE_VERSION_MINOR@
VTE_CXXFLAGS = @VTE_CXXFLAGS@
WINDRES = @WINDRES@
WINDRES_LIB = @WINDRES_LIB@
XA = @XA@
XDG_DESKTOP_MENU = @XDG_DESKTOP_MENU@
YACC = @YACC@
YASM = @YASM@
ZLIB_LIBS = @ZLIB_LIBS@
@ -343,12 +364,12 @@ abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_OBJC = @ac_ct_OBJC@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
am__tar = @am__tar@
am__untar = @am__untar@
artsc_config = @artsc_config@
bindir = @bindir@
build = @build@
build_alias = @build_alias@
@ -361,7 +382,6 @@ datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
ffmpeg_have_bash = @ffmpeg_have_bash@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@ -385,7 +405,6 @@ program_transform_name = @program_transform_name@
psdir = @psdir@
runstatedir = @runstatedir@
sbindir = @sbindir@
sdl2_config = @sdl2_config@
sdl_config = @sdl_config@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
@ -406,12 +425,7 @@ xvic_LDFLAGS = @xvic_LDFLAGS@
SUBDIRS = \
android \
beos \
macosx \
nextstep \
openstep \
openwatcom \
qnx4 \
rhapsody
mingw
all: all-recursive
@ -425,16 +439,16 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
exit 1;; \
esac; \
done; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu build/Makefile'; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign build/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --gnu build/Makefile
$(AUTOMAKE) --foreign build/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
*) \
echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
esac;
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@ -545,7 +559,10 @@ cscopelist-am: $(am__tagged_files)
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
distdir: $(DISTFILES)
distdir: $(BUILT_SOURCES)
$(MAKE) $(AM_MAKEFLAGS) distdir-am
distdir-am: $(DISTFILES)
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
list='$(DISTFILES)'; \

70
vice/build/android/Makefile.in
View File

@ -1,7 +1,7 @@
# Makefile.in generated by automake 1.15 from Makefile.am.
# Makefile.in generated by automake 1.16.2 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2014 Free Software Foundation, Inc.
# Copyright (C) 1994-2020 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@ -89,7 +89,10 @@ build_triplet = @build@
host_triplet = @host@
subdir = build/android
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
am__aclocal_m4_deps = $(top_srcdir)/m4/ax_cxx_compile_stdcxx.m4 \
$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/pkg.m4 \
$(top_srcdir)/m4/vice_args.m4 \
$(top_srcdir)/m4/vice_compiler_checks.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
@ -134,6 +137,7 @@ AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BASH = @BASH@
CC = @CC@
CCAS = @CCAS@
CCASDEPMODE = @CCASDEPMODE@
@ -178,6 +182,8 @@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
FW_DIR = @FW_DIR@
GFXOUTPUT_DRIVERS = @GFXOUTPUT_DRIVERS@
GFXOUTPUT_LIBS = @GFXOUTPUT_LIBS@
GLEW_CFLAGS = @GLEW_CFLAGS@
GLEW_LIBS = @GLEW_LIBS@
GLIB_CFLAGS = @GLIB_CFLAGS@
GLIB_LIBS = @GLIB_LIBS@
GREP = @GREP@
@ -185,15 +191,14 @@ GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
HAVE_CXX11 = @HAVE_CXX11@
HAVE_READLINE = @HAVE_READLINE@
HCRTF = @HCRTF@
HHC = @HHC@
ICONV = @ICONV@
ICOTOOL = @ICOTOOL@
INLINE_UNIT_GROWTH = @INLINE_UNIT_GROWTH@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
IPFC = @IPFC@
JOY_LIBS = @JOY_LIBS@
LAMEMP3SUB = @LAMEMP3SUB@
LDFLAGS = @LDFLAGS@
@ -209,12 +214,14 @@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEGUIDE = @MAKEGUIDE@
MAKEINFO = @MAKEINFO@
MAKERTF = @MAKERTF@
MAX_INLINE_INSN_SINGLE = @MAX_INLINE_INSN_SINGLE@
MKDIR_P = @MKDIR_P@
MKFONTDIR_BIN = @MKFONTDIR_BIN@
NATIVE_TOOLS_COMPILER = @NATIVE_TOOLS_COMPILER@
MONITOR_CFLAGS = @MONITOR_CFLAGS@
NETPLAY_LIBS = @NETPLAY_LIBS@
OBJC = @OBJC@
OBJCDEPMODE = @OBJCDEPMODE@
OBJCFLAGS = @OBJCFLAGS@
OBJCPP = @OBJCPP@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@ -230,8 +237,8 @@ PKG_CONFIG = @PKG_CONFIG@
PLATFORM_DOX_FLAGS = @PLATFORM_DOX_FLAGS@
PNG_CFLAGS = @PNG_CFLAGS@
PNG_LIBS = @PNG_LIBS@
QUICKTIME_INCLUDES = @QUICKTIME_INCLUDES@
QUICKTIME_LIBS = @QUICKTIME_LIBS@
PROGRAM_PREFIX = @PROGRAM_PREFIX@
PROGRAM_SUFFIX = @PROGRAM_SUFFIX@
RANLIB = @RANLIB@
READLINE = @READLINE@
READLINE_LIBS = @READLINE_LIBS@
@ -245,35 +252,49 @@ RESID_DTV_INCLUDES = @RESID_DTV_INCLUDES@
RESID_DTV_LIBS = @RESID_DTV_LIBS@
RESID_INCLUDES = @RESID_INCLUDES@
RESID_LIBS = @RESID_LIBS@
SDL2_CFLAGS = @SDL2_CFLAGS@
SDL2_IMAGE_CFLAGS = @SDL2_IMAGE_CFLAGS@
SDL2_IMAGE_LIBS = @SDL2_IMAGE_LIBS@
SDL2_LIBS = @SDL2_LIBS@
SDLCONFIG = @SDLCONFIG@
SDL_EXTRA_LIBS = @SDL_EXTRA_LIBS@
SDL_IMAGE_CFLAGS = @SDL_IMAGE_CFLAGS@
SDL_IMAGE_LIBS = @SDL_IMAGE_LIBS@
SDL_VERSION = @SDL_VERSION@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SOUND_AIX_OBJ = @SOUND_AIX_OBJ@
SOUND_DRIVERS = @SOUND_DRIVERS@
SOUND_HPUX_OBJ = @SOUND_HPUX_OBJ@
SOUND_LIBS = @SOUND_LIBS@
SOUND_MIDAS_OBJ = @SOUND_MIDAS_OBJ@
SOUND_SDL_OBJ = @SOUND_SDL_OBJ@
SOUND_SGI_OBJ = @SOUND_SGI_OBJ@
SOUND_USS_OBJ = @SOUND_USS_OBJ@
STRIP = @STRIP@
SVN = @SVN@
SVNVERSION = @SVNVERSION@
TAR = @TAR@
TEXI2DVI = @TEXI2DVI@
TEXI2IPF = @TEXI2IPF@
TFE_LIBS = @TFE_LIBS@
UI_LIBS = @UI_LIBS@
VERSION = @VERSION@
VERSION_COMBINED = @VERSION_COMBINED@
VERSION_RC = @VERSION_RC@
VICEDIR = @VICEDIR@
VICE_CFLAGS = @VICE_CFLAGS@
VICE_CPPFLAGS = @VICE_CPPFLAGS@
VICE_CXXFLAGS = @VICE_CXXFLAGS@
VICE_DATADIR = @VICE_DATADIR@
VICE_DOCDIR = @VICE_DOCDIR@
VICE_LDFLAGS = @VICE_LDFLAGS@
VICE_OBJCFLAGS = @VICE_OBJCFLAGS@
VICE_PDF_FILE_NAME = @VICE_PDF_FILE_NAME@
VICE_VERSION = @VICE_VERSION@
VICE_VERSION_BUILD = @VICE_VERSION_BUILD@
VICE_VERSION_MAJOR = @VICE_VERSION_MAJOR@
VICE_VERSION_MINOR = @VICE_VERSION_MINOR@
VTE_CXXFLAGS = @VTE_CXXFLAGS@
WINDRES = @WINDRES@
WINDRES_LIB = @WINDRES_LIB@
XA = @XA@
XDG_DESKTOP_MENU = @XDG_DESKTOP_MENU@
YACC = @YACC@
YASM = @YASM@
ZLIB_LIBS = @ZLIB_LIBS@
@ -283,12 +304,12 @@ abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_OBJC = @ac_ct_OBJC@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
am__tar = @am__tar@
am__untar = @am__untar@
artsc_config = @artsc_config@
bindir = @bindir@
build = @build@
build_alias = @build_alias@
@ -301,7 +322,6 @@ datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
ffmpeg_have_bash = @ffmpeg_have_bash@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@ -325,7 +345,6 @@ program_transform_name = @program_transform_name@
psdir = @psdir@
runstatedir = @runstatedir@
sbindir = @sbindir@
sdl2_config = @sdl2_config@
sdl_config = @sdl_config@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
@ -359,16 +378,16 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
exit 1;; \
esac; \
done; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu build/android/Makefile'; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign build/android/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --gnu build/android/Makefile
$(AUTOMAKE) --foreign build/android/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
*) \
echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
esac;
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@ -386,7 +405,10 @@ ctags CTAGS:
cscope cscopelist:
distdir: $(DISTFILES)
distdir: $(BUILT_SOURCES)
$(MAKE) $(AM_MAKEFLAGS) distdir-am
distdir-am: $(DISTFILES)
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
list='$(DISTFILES)'; \

70
vice/build/beos/Makefile.in
View File

@ -1,7 +1,7 @@
# Makefile.in generated by automake 1.15 from Makefile.am.
# Makefile.in generated by automake 1.16.2 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2014 Free Software Foundation, Inc.
# Copyright (C) 1994-2020 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@ -89,7 +89,10 @@ build_triplet = @build@
host_triplet = @host@
subdir = build/beos
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
am__aclocal_m4_deps = $(top_srcdir)/m4/ax_cxx_compile_stdcxx.m4 \
$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/pkg.m4 \
$(top_srcdir)/m4/vice_args.m4 \
$(top_srcdir)/m4/vice_compiler_checks.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
@ -134,6 +137,7 @@ AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BASH = @BASH@
CC = @CC@
CCAS = @CCAS@
CCASDEPMODE = @CCASDEPMODE@
@ -178,6 +182,8 @@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
FW_DIR = @FW_DIR@
GFXOUTPUT_DRIVERS = @GFXOUTPUT_DRIVERS@
GFXOUTPUT_LIBS = @GFXOUTPUT_LIBS@
GLEW_CFLAGS = @GLEW_CFLAGS@
GLEW_LIBS = @GLEW_LIBS@
GLIB_CFLAGS = @GLIB_CFLAGS@
GLIB_LIBS = @GLIB_LIBS@
GREP = @GREP@
@ -185,15 +191,14 @@ GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
HAVE_CXX11 = @HAVE_CXX11@
HAVE_READLINE = @HAVE_READLINE@
HCRTF = @HCRTF@
HHC = @HHC@
ICONV = @ICONV@
ICOTOOL = @ICOTOOL@
INLINE_UNIT_GROWTH = @INLINE_UNIT_GROWTH@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
IPFC = @IPFC@
JOY_LIBS = @JOY_LIBS@
LAMEMP3SUB = @LAMEMP3SUB@
LDFLAGS = @LDFLAGS@
@ -209,12 +214,14 @@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEGUIDE = @MAKEGUIDE@
MAKEINFO = @MAKEINFO@
MAKERTF = @MAKERTF@
MAX_INLINE_INSN_SINGLE = @MAX_INLINE_INSN_SINGLE@
MKDIR_P = @MKDIR_P@
MKFONTDIR_BIN = @MKFONTDIR_BIN@
NATIVE_TOOLS_COMPILER = @NATIVE_TOOLS_COMPILER@
MONITOR_CFLAGS = @MONITOR_CFLAGS@
NETPLAY_LIBS = @NETPLAY_LIBS@
OBJC = @OBJC@
OBJCDEPMODE = @OBJCDEPMODE@
OBJCFLAGS = @OBJCFLAGS@
OBJCPP = @OBJCPP@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@ -230,8 +237,8 @@ PKG_CONFIG = @PKG_CONFIG@
PLATFORM_DOX_FLAGS = @PLATFORM_DOX_FLAGS@
PNG_CFLAGS = @PNG_CFLAGS@
PNG_LIBS = @PNG_LIBS@
QUICKTIME_INCLUDES = @QUICKTIME_INCLUDES@
QUICKTIME_LIBS = @QUICKTIME_LIBS@
PROGRAM_PREFIX = @PROGRAM_PREFIX@
PROGRAM_SUFFIX = @PROGRAM_SUFFIX@
RANLIB = @RANLIB@
READLINE = @READLINE@
READLINE_LIBS = @READLINE_LIBS@
@ -245,35 +252,49 @@ RESID_DTV_INCLUDES = @RESID_DTV_INCLUDES@
RESID_DTV_LIBS = @RESID_DTV_LIBS@
RESID_INCLUDES = @RESID_INCLUDES@
RESID_LIBS = @RESID_LIBS@
SDL2_CFLAGS = @SDL2_CFLAGS@
SDL2_IMAGE_CFLAGS = @SDL2_IMAGE_CFLAGS@
SDL2_IMAGE_LIBS = @SDL2_IMAGE_LIBS@
SDL2_LIBS = @SDL2_LIBS@
SDLCONFIG = @SDLCONFIG@
SDL_EXTRA_LIBS = @SDL_EXTRA_LIBS@
SDL_IMAGE_CFLAGS = @SDL_IMAGE_CFLAGS@
SDL_IMAGE_LIBS = @SDL_IMAGE_LIBS@
SDL_VERSION = @SDL_VERSION@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SOUND_AIX_OBJ = @SOUND_AIX_OBJ@
SOUND_DRIVERS = @SOUND_DRIVERS@
SOUND_HPUX_OBJ = @SOUND_HPUX_OBJ@
SOUND_LIBS = @SOUND_LIBS@
SOUND_MIDAS_OBJ = @SOUND_MIDAS_OBJ@
SOUND_SDL_OBJ = @SOUND_SDL_OBJ@
SOUND_SGI_OBJ = @SOUND_SGI_OBJ@
SOUND_USS_OBJ = @SOUND_USS_OBJ@
STRIP = @STRIP@
SVN = @SVN@
SVNVERSION = @SVNVERSION@
TAR = @TAR@
TEXI2DVI = @TEXI2DVI@
TEXI2IPF = @TEXI2IPF@
TFE_LIBS = @TFE_LIBS@
UI_LIBS = @UI_LIBS@
VERSION = @VERSION@
VERSION_COMBINED = @VERSION_COMBINED@
VERSION_RC = @VERSION_RC@
VICEDIR = @VICEDIR@
VICE_CFLAGS = @VICE_CFLAGS@
VICE_CPPFLAGS = @VICE_CPPFLAGS@
VICE_CXXFLAGS = @VICE_CXXFLAGS@
VICE_DATADIR = @VICE_DATADIR@
VICE_DOCDIR = @VICE_DOCDIR@
VICE_LDFLAGS = @VICE_LDFLAGS@
VICE_OBJCFLAGS = @VICE_OBJCFLAGS@
VICE_PDF_FILE_NAME = @VICE_PDF_FILE_NAME@
VICE_VERSION = @VICE_VERSION@
VICE_VERSION_BUILD = @VICE_VERSION_BUILD@
VICE_VERSION_MAJOR = @VICE_VERSION_MAJOR@
VICE_VERSION_MINOR = @VICE_VERSION_MINOR@
VTE_CXXFLAGS = @VTE_CXXFLAGS@
WINDRES = @WINDRES@
WINDRES_LIB = @WINDRES_LIB@
XA = @XA@
XDG_DESKTOP_MENU = @XDG_DESKTOP_MENU@
YACC = @YACC@
YASM = @YASM@
ZLIB_LIBS = @ZLIB_LIBS@
@ -283,12 +304,12 @@ abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_OBJC = @ac_ct_OBJC@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
am__tar = @am__tar@
am__untar = @am__untar@
artsc_config = @artsc_config@
bindir = @bindir@
build = @build@
build_alias = @build_alias@
@ -301,7 +322,6 @@ datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
ffmpeg_have_bash = @ffmpeg_have_bash@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@ -325,7 +345,6 @@ program_transform_name = @program_transform_name@
psdir = @psdir@
runstatedir = @runstatedir@
sbindir = @sbindir@
sdl2_config = @sdl2_config@
sdl_config = @sdl_config@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
@ -359,16 +378,16 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
exit 1;; \
esac; \
done; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu build/beos/Makefile'; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign build/beos/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --gnu build/beos/Makefile
$(AUTOMAKE) --foreign build/beos/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
*) \
echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
esac;
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@ -386,7 +405,10 @@ ctags CTAGS:
cscope cscopelist:
distdir: $(DISTFILES)
distdir: $(BUILT_SOURCES)
$(MAKE) $(AM_MAKEFLAGS) distdir-am
distdir-am: $(DISTFILES)
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
list='$(DISTFILES)'; \

10
vice/build/macosx/Makefile.am
View File

@ -1,10 +0,0 @@
EXTRA_DIST = \
build-allext.sh \
build-ffmpeglame.sh \
build-gtk.sh \
build-hidutils.sh \
build-inc.sh \
build-pcaplibnet.sh \
build-sdlmain.sh \
build-vice-dist.sh \
build-vice-release.sh

80
vice/build/macosx/build-allext.sh
View File

@ -1,80 +0,0 @@
#!/bin/bash
#
# build-allext.sh - build the allext on ppc+i386 macs for VICE
#
# Written by
# Christian Vogelgsang <chris@vogelgsang.org>
#
# This file is part of VICE, the Versatile Commodore Emulator.
# See README for copyright notice.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
# 02111-1307 USA.
#
# Usage: build-allext.sh <build-dir> [force build]
#
# get build tools
SCRIPT_DIR="`dirname \"$0\"`"
run () {
echo "--- $@ ---"
$SHELL "$@"
if [ $? != 0 ]; then
echo "*** FAILED: $@"
exit 1
fi
}
# hidutils
run "$SCRIPT_DIR/build-hidutils.sh" "$1" ppc 10.4 gcc40 $2
run "$SCRIPT_DIR/build-hidutils.sh" "$1" i386 10.4 gcc40 $2
run "$SCRIPT_DIR/build-hidutils.sh" "$1" ppc 10.5 gcc40 $2
run "$SCRIPT_DIR/build-hidutils.sh" "$1" i386 10.5 gcc40 $2
run "$SCRIPT_DIR/build-hidutils.sh" "$1" i386 10.6 gcc42 $2
run "$SCRIPT_DIR/build-hidutils.sh" "$1" x86_64 10.6 gcc42 $2
run "$SCRIPT_DIR/build-hidutils.sh" "$1" i386 10.6 clang $2
run "$SCRIPT_DIR/build-hidutils.sh" "$1" x86_64 10.6 clang $2
# pcaplibnet
run "$SCRIPT_DIR/build-pcaplibnet.sh" "$1" ppc 10.4 gcc40 $2
run "$SCRIPT_DIR/build-pcaplibnet.sh" "$1" i386 10.4 gcc40 $2
run "$SCRIPT_DIR/build-pcaplibnet.sh" "$1" ppc 10.5 gcc40 $2
run "$SCRIPT_DIR/build-pcaplibnet.sh" "$1" i386 10.5 gcc40 $2
run "$SCRIPT_DIR/build-pcaplibnet.sh" "$1" i386 10.6 gcc42 $2
run "$SCRIPT_DIR/build-pcaplibnet.sh" "$1" x86_64 10.6 gcc42 $2
run "$SCRIPT_DIR/build-pcaplibnet.sh" "$1" i386 10.6 clang $2
run "$SCRIPT_DIR/build-pcaplibnet.sh" "$1" x86_64 10.6 clang $2
# ffmpeg
run "$SCRIPT_DIR/build-ffmpeglame.sh" "$1" ppc 10.4 gcc40 $2
run "$SCRIPT_DIR/build-ffmpeglame.sh" "$1" i386 10.4 gcc40 $2
run "$SCRIPT_DIR/build-ffmpeglame.sh" "$1" ppc 10.5 gcc40 $2
run "$SCRIPT_DIR/build-ffmpeglame.sh" "$1" i386 10.5 gcc40 $2
run "$SCRIPT_DIR/build-ffmpeglame.sh" "$1" i386 10.6 gcc42 $2
run "$SCRIPT_DIR/build-ffmpeglame.sh" "$1" x86_64 10.6 gcc42 $2
run "$SCRIPT_DIR/build-ffmpeglame.sh" "$1" i386 10.6 clang $2
run "$SCRIPT_DIR/build-ffmpeglame.sh" "$1" x86_64 10.6 clang $2
# gtk
run "$SCRIPT_DIR/build-gtk.sh" "$1" ppc 10.4 gcc40 $2
run "$SCRIPT_DIR/build-gtk.sh" "$1" i386 10.4 gcc40 $2
# SDLmain
run "$SCRIPT_DIR/build-sdlmain.sh" "$1" ppc 10.4 gcc40 $2
run "$SCRIPT_DIR/build-sdlmain.sh" "$1" i386 10.4 gcc40 $2
echo "========== build-allext: ready =========="

57
vice/build/macosx/build-ffmpeglame.sh
View File

@ -1,57 +0,0 @@
#!/bin/bash
#
# build-ffmpeglame.sh - build the ffmpeg and mp3lame on macs for VICE
#
# Written by
# Christian Vogelgsang <chris@vogelgsang.org>
#
# This file is part of VICE, the Versatile Commodore Emulator.
# See README for copyright notice.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
# 02111-1307 USA.
#
# Usage: build-ffmpeglame.sh <build-dir> <arch:ppc|i386>
#
# get build tools
SCRIPT_DIR="`dirname \"$0\"`"
. "$SCRIPT_DIR/build-inc.sh"
# parse args
parse_args "$@"
# setup compiler environment
set_compiler_env
echo "===== ffmpeg+lame build $BUILD_TAG ====="
configure_make_install lame-3.97.tar.gz lame-3.97 lib/libmp3lame.dylib install \
"http://lame.sourceforge.net/index.php" \
"--disable-static"
PATCH="touch SDL.h SDL_thread.h ; \
cd ../ffmpeg-svn/ && cp configure c.tmp && sed -e 's/cc=\"cc\"//' < c.tmp > configure"
configure_make_install "" ffmpeg-svn lib/libavcodec.dylib "install-libs install-headers" \
"svn checkout svn://svn.mplayerhq.hu/ffmpeg/trunk ffmpeg-svn" \
"--disable-ffmpeg --disable-ffserver --disable-ffplay \
--disable-static --enable-shared --enable-libmp3lame \
--cc=\"$GCC\" \
\"--extra-cflags=$CPPFLAGS $COMPILE_TAG\" \"--extra-ldflags=$LDFLAGS $COMPILE_TAG\" \
--arch=$ARCH --disable-altivec --disable-mmx"
echo "===== ffmpeg+lame ready $BUILD_TAG ====="

109
vice/build/macosx/build-gtk.sh
View File

@ -1,109 +0,0 @@
#!/bin/bash
#
# build-gtk.sh - build the gtk+ toolkit on macs for the gtk+ version of VICE
#
# Written by
# Christian Vogelgsang <chris@vogelgsang.org>
#
# This file is part of VICE, the Versatile Commodore Emulator.
# See README for copyright notice.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
# 02111-1307 USA.
#
# call this function twice: one for each architecture
#
# get build tools
SCRIPT_DIR="`dirname \"$0\"`"
. "$SCRIPT_DIR/build-inc.sh"
# parse args
parse_args "$@"
# create target dirs
make_dirs bin lib include man share
# setup compiler environment
USE_X11=1
set_compiler_env
export COMPILE_IN_SRC=1
echo "===== gtk+ build $BUILD_TAG ====="
# ----- Tool Libs -----
# gettext
configure_make_install gettext-0.17.tar.gz gettext-0.17 lib/libintl.a install \
"http://www.gnu.org/software/gettext/" \
"--disable-java --disable-csharp --disable-libasprintf"
# pkg-config
configure_make_install pkg-config-0.23.tar.gz pkg-config-0.23 bin/pkg-config install \
"http://pkgconfig.freedesktop.org/wiki/"
# jpeg
configure_make_install jpegsrc.v6b.tar.gz jpeg-6b lib/libjpeg.a install-lib \
"http://www.ijg.org/files/"
# png
configure_make_install libpng-1.2.24.tar.bz2 libpng-1.2.24 lib/libpng12.a install \
"http://www.libpng.org/pub/png/libpng.html" \
"--disable-shared"
# tiff
configure_make_install tiff-3.8.2.tar.gz tiff-3.8.2 lib/libtiff.a install \
"http://www.libtiff.org/" \
"--disable-shared --disable-cxx"
# freetype
configure_make_install freetype-2.3.5.tar.bz2 freetype-2.3.5 lib/libfreetype.a install \
"http://www.freetype.org/"
# libxml2
configure_make_install libxml2-2.6.31.tar.gz libxml2-2.6.31 lib/libxml2.a install \
"http://xmlsoft.org/" \
"--without-python"
# fontconfig
configure_make_install fontconfig-2.5.0.tar.gz fontconfig-2.5.0 lib/libfontconfig.a install \
"http://www.fontconfig.org/wiki/"
# ----- Gtk+ Libs -----
# glib
configure_make_install glib-2.14.5.tar.bz2 glib-2.14.5 lib/libglib-2.0.dylib install \
"http://www.gtk.org/"
# cairo
configure_make_install cairo-1.4.14.tar.gz cairo-1.4.14 lib/libcairo.dylib install \
"http://cairographics.org/"
# pango
configure_make_install pango-1.18.4.tar.bz2 pango-1.18.4 lib/libpango-1.0.dylib install \
"http://www.gtk.org/" \
"--with-included-modules=yes --with-dynamic-modules=no"
# atk
configure_make_install atk-1.9.1.tar.bz2 atk-1.9.1 lib/libatk-1.0.dylib install \
"http://www.gtk.org/"
# gtk+
export ac_cv_path_CUPS_CONFIG=no # cups does not cross-compile
configure_make_install gtk+-2.12.7.tar.bz2 gtk+-2.12.7 lib/libgtk-x11-2.0.dylib install \
"http://www.gtk.org/" \
"--disable-modules --with-included-loaders=yes"
# gtkglext
configure_make_install gtkglext-1.2.0.tar.bz2 gtkglext-1.2.0 lib/libgtkglext-x11-1.0.dylib install \
"gtkglext-1.2.0.tar.bz2" \
"--with-gl-libdir=/System/Library/Frameworks/OpenGL.framework/Versions/Current/Libraries/"
echo "===== gtk+ ready $BUILD_TAG ====="

115
vice/build/macosx/build-hidutils.sh
View File

@ -1,115 +0,0 @@
#!/bin/bash
#
# build-hidutils.sh - build the hidutils on macs for joystick support in VICE
#
# Written by
# Christian Vogelgsang <chris@vogelgsang.org>
#
# This file is part of VICE, the Versatile Commodore Emulator.
# See README for copyright notice.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
# 02111-1307 USA.
#
# Usage: build-hidutils.sh <build-dir> <arch:ppc|i386>
#
# get build tools
SCRIPT_DIR="`dirname \"$0\"`"
. "$SCRIPT_DIR/build-inc.sh"
# parse args
parse_args "$@"
# create target dirs
make_dirs lib include
# setup compiler environment
set_compiler_env
echo "===== hidutils build $BUILD_TAG ====="
# check if lib is already available
HIDUTIL_LIB="libHIDUtilities.a"
HIDUTIL_HDR="HID_Utilities_External.h"
if [ -e "$INSTALL_DIR/lib/$HIDUTIL_LIB" -a -e "$INSTALL_DIR/include/$HIDUTIL_HDR" -a "x$FORCE_BUILD" = "x" ]; then
echo " hidutil library already for $ARCH installed. ($HIDUTIL_LIB, $HIDUTIL_HDR exists)"
exit 0
fi
# unzip source
DIR="HID Utilities Source"
if [ ! -d "$DIR" ]; then
# check for file
SRC="HID_Utilities_Source.zip"
if [ ! -e "$SRC" ]; then
echo "FATAL: '$SRC' missing!"
echo " please download from http://developer.apple.com/samplecode/HID_Utilities_Source/index.html"
exit 1
fi
# unzip source
unzip "$SRC"
if [ ! -d "$DIR" ]; then
echo "FATAL: '$DIR' does not exits! unzip failed???"
exit 1
fi
# patch source
sed -i bak -e 's,^extern long HIDCalibrateValue,//,g' -e 's,^extern long HIDScale,//,g' "$DIR/HID_Utilities_External.h"
sed -i bak -e 's,#define kVerboseErrors,//,' "$DIR/HID_Error_Handler.c"
fi
# compile files
A_FILE="$INSTALL_DIR/lib/$HIDUTIL_LIB"
HIDUTIL_SRC_FILES="HID_Config_Utilities HID_Error_Handler HID_Name_Lookup \
HID_Queue_Utilities HID_Transaction_Utilities HID_Utilities"
for src in $HIDUTIL_SRC_FILES ; do
C_FILE="$DIR/$src.c"
O_FILE="$DIR/$src.o"
if [ ! -e "$C_FILE" ]; then
echo "FATAL: missing source file: $C_FILE"
exit 1
fi
echo "compiling $src ($ARCH)"
$CC $CFLAGS $CPPFLAGS -O3 -W -c "$C_FILE" -o "$O_FILE"
if [ ! -e "$O_FILE" ]; then
echo "FATAL: compile failed in file: $C_FILE"
exit 1
fi
# build archive
ar cr "$A_FILE" "$O_FILE"
done
# check archive
if [ ! -e "$A_FILE" ]; then
echo "FATAL: archive missing: $A_FILE"
exit 1
fi
echo "preparing $A_FILE"
ranlib "$A_FILE"
# install header
if [ ! -e "$INSTALL_DIR/include/$HIDUTIL_HDR" ]; then
echo "installing header $HIDUTIL_HDR"
cp "$DIR/$HIDUTIL_HDR" "$INSTALL_DIR/include/"
fi
# clean up source
rm -rf "$DIR"
echo "===== hidutils ready $BUILD_TAG ====="

257
vice/build/macosx/build-inc.sh
View File

@ -1,257 +0,0 @@
#!/bin/bash
#
# build-inc.sh - include file for other build-* scripts
#
# Written by
# Christian Vogelgsang <chris@vogelgsang.org>
#
# This file is part of VICE, the Versatile Commodore Emulator.
# See README for copyright notice.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
# 02111-1307 USA.
#
parse_args () {
# get arguments
BASE_DIR="$1"
ARCH="$2"
SDK_VERSION="$3"
COMPILER="$4"
export FORCE_BUILD="$5"
if [ "x$ARCH" = "x" ]; then
echo "Usage: $0 <build-dir> <arch:ppc|i386|x86_64> [sdk:10.4|10.5|10.6] [gcc40|gcc42|clang] [force build!=0]"
exit 1
fi
if [ ! -d "$BASE_DIR" ]; then
echo "Missing base dir!"
exit 1
fi
# normalize base dir
BASE_DIR="`cd \"$BASE_DIR\" && pwd`"
# check arch
if [ "$ARCH" = "ppc" ]; then
INSTALL_DIR="$BASE_DIR/ppc"
elif [ "$ARCH" = "i386" ]; then
INSTALL_DIR="$BASE_DIR/i386"
elif [ "$ARCH" = "x86_64" ]; then
INSTALL_DIR="$BASE_DIR/x86_64"
else
echo "Unknown ARCH: $ARCH (ppc|i386|x86_64)"
exit 1
fi
# autoselect SDK
if [ "x$SDK_VERSION" = "x" ]; then
if [ "$ARCH" = "x86_64" ]; then
SDK_VERSION="10.6"
else
SDK_VERSION="10.4"
fi
fi
# check SDK
if [ "$SDK_VERSION" = "10.4" ]; then
SDK=/Developer/SDKs/MacOSX10.4u.sdk
elif [ "$SDK_VERSION" = "10.5" ]; then
SDK=/Developer/SDKs/MacOSX10.5.sdk
elif [ "$SDK_VERSION" = "10.6" ]; then
SDK=/Developer/SDKs/MacOSX10.6.sdk
else
echo "Unknown SDK_VERSION: $SDK_VERSION"
exit 1
fi
# autoselect compiler
if [ "x$COMPILER" = "x" ]; then
if [ "$SDK_VERSION" = "10.6" ]; then
COMPILER="gcc42"
else
COMPILER="gcc40"
fi
fi
# check compiler
if [ "$COMPILER" = "gcc40" ]; then
GCC="/usr/bin/gcc-4.0"
GXX="/usr/bin/g++-4.0"
elif [ "$COMPILER" = "gcc42" ]; then
GCC="/usr/bin/gcc-4.2"
GXX="/usr/bin/g++-4.2"
elif [ "$COMPILER" = "clang" ]; then
GCC="/Developer/usr/bin/clang"
GXX="/Developer/usr/bin/llvm-g++-4.2"
else
echo "Unknown COMPILER: $COMPILER"
exit 1
fi
# extend install dir
INSTALL_DIR="$INSTALL_DIR-$SDK_VERSION-$COMPILER"
# setup base dir
if [ ! -d "$INSTALL_DIR" ]; then
echo " creating install dir $INSTALL_DIR"
mkdir -p "$INSTALL_DIR"
mkdir -p "$INSTALL_DIR/bin"
mkdir -p "$INSTALL_DIR/include"
mkdir -p "$INSTALL_DIR/lib"
mkdir -p "$INSTALL_DIR/man"
fi
# number of cpus
if [ "x$MULTI_CPU" != "x" ]; then
NUM_CPUS=`hostinfo | grep 'processors are logically available' | awk '{print $1}'`
else
NUM_CPUS=1
fi
export NUM_CPUS
# build tag
export BUILD_TAG="[$ARCH-$SDK_VERSION-$COMPILER,force=$FORCE_BUILD,cpus=$NUM_CPUS]"
}
# configure/compile/install a autoconf'ed distribution
#
# SRC source archive
# DIR source directory
# CHECK_FILE if this file exists then assume build is already done
# INSTALL rule to install
# URL where to download archive if its missing
# CONFIG_OPT extra switches for configure
#
configure_make_install () {
SRC="$1"
DIR="$2"
CHECK_FILE="$3"
INSTALL="$4"
URL="$5"
CONFIG_OPT="$6"
echo "----- $DIR $BUILD_TAG -----"
# check if lib is available
if [ -e "$INSTALL_DIR/$CHECK_FILE" -a "x$FORCE_BUILD" = "x" ]; then
echo " Already installed. ($CHECK_FILE available)"
else
# check for source archive
if [ "x$SRC" = "x" ]; then
if [ ! -d "$DIR" ]; then
echo "FATAL: source dir '$DIR' is missing!"
echo " please setup first (from e.g. $URL)"
exit 1
fi
else
if [ ! -e "$SRC" ]; then
echo "FATAL: source archive '$SRC' missing in curent directory!"
echo " please download first (from e.g. $URL)"
exit 1
fi
fi
# check if source is already unpacked
if [ ! -d "$DIR" ]; then
echo " Unpacking source for $DIR"
echo "$SRC" | grep .bz2 > /dev/null
if [ $? != 0 ]; then
tar xfz "$SRC"
else
tar xfj "$SRC"
fi
fi
if [ ! -d "$DIR" ]; then
echo "FATAL: source not unpacked to $DIR"
exit 1
fi
# prepare BUILD
if [ "$COMPILE_IN_SOURCE" != "" ]; then
BUILD_DIR="$DIR"
else
BUILD_DIR="BUILD"
if [ -d "$BUILD_DIR" ]; then
if [ "x$FORCE_BUILD" != "x" ]; then
rm -rf "$BUILD_DIR"
else
echo "FATAL: build directory '$BUILD_DIR' already here!"
exit 1
fi
fi
mkdir BUILD
fi
# patch source?
if [ "$PATCH" != "" ]; then
(cd "$DIR" && eval "$PATCH")
fi
# build
echo " configure options: $CONFIG_OPT"
(cd "$BUILD_DIR" && eval "../$DIR/configure --prefix=\"$INSTALL_DIR\" $CONFIG_OPT $EXTRA_OPT")
(cd "$BUILD_DIR" && make -j$NUM_CPUS)
if [ "$?" != "0" ]; then
echo "FATAL: make failed!"
exit 1
fi
echo "make $INSTALL"
(cd "$BUILD_DIR" && make $INSTALL)
# check for lib
if [ ! -e "$INSTALL_DIR/$CHECK_FILE" ]; then
echo "FATAL: $CHECK_FILE not found!"
exit 1
fi
# clean up
if [ "$COMPILE_IN_SOURCE" = "" ]; then
rm -rf BUILD
fi
if [ "x$SRC" != "x" ]; then
rm -rf "$DIR"
fi
echo "----- ready with $2 $BUILD_TAG -----"
fi
}
# create directories in install dir
make_dirs () {
for DIR in "$@" ; do
if [ ! -d "$INSTALL_DIR/$DIR" ]; then
echo " creating directory $DIR"
mkdir -p "$INSTALL_DIR/$DIR"
fi
done
}
set_compiler_env () {
# set common flags
export CPPFLAGS="-I$INSTALL_DIR/include"
export LDFLAGS="-L$INSTALL_DIR/lib"
export PATH="$INSTALL_DIR/bin:$PATH"
# use X11 from SDK
if [ "$USE_X11" = "1" ]; then
EXTRA_OPT="--x-includes=$SDK/usr/X11R6/include --x-libraries=$SDK/usr/X11R6/lib"
fi
export COMPILE_TAG="-arch $ARCH -isysroot $SDK -mmacosx-version-min=$SDK_VERSION"
export CC="$GCC $COMPILE_TAG"
export CXX="$GXX $COMPILE_TAG"
export LD="$GCC $COMPILE_TAG"
}

54
vice/build/macosx/build-pcaplibnet.sh
View File

@ -1,54 +0,0 @@
#!/bin/bash
#
# build-pcaplibnet.sh - build the pcaplibnet on macs for VICE ethernet (TFE/RRNET) support
#
# Written by
# Christian Vogelgsang <chris@vogelgsang.org>
#
# This file is part of VICE, the Versatile Commodore Emulator.
# See README for copyright notice.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
# 02111-1307 USA.
#
# Usage: build-pcaplibnet.sh <build-dir> <arch:ppc|i386>
#
# get build tools
SCRIPT_DIR="`dirname \"$0\"`"
. "$SCRIPT_DIR/build-inc.sh"
# parse args
parse_args "$@"
# setup compiler environment
set_compiler_env
echo "===== pcaplibnet build $BUILD_TAG ====="
COMPILE_IN_SOURCE=1
configure_make_install libpcap-1.0.0.tar.gz libpcap-1.0.0 lib/libpcap.a install \
"http://www.tcpdump.org/"
PATCH="mv src/libnet_init.c src/libnet_init.c.org ; \
sed -e 's/getuid() && geteuid()/0/' < src/libnet_init.c.org > src/libnet_init.c ; \
mv src/libnet_build_gre.c src/libnet_build_gre.c.org ; \
sed -e 's/^inline//g' < src/libnet_build_gre.c.org > src/libnet_build_gre.c"
configure_make_install libnet-1.1.2.1.tar.gz libnet lib/libnet.a install \
"http://ftp.debian.org/debian/pool/main/libn/libnet0/libnet0_1.0.2a.orig.tar.gz"
echo "===== pcaplibnet $BUILD_TAG ====="
echo "(Read 'libpcap-1.0.0/README.macosx' to find out how to install pcap on Mac OS X correctly)"

94
vice/build/macosx/build-sdlmain.sh
View File

@ -1,94 +0,0 @@
#!/bin/bash
#
# build-sdlmain.sh - build the SDLMain library from the devel-lite source of the SDL framework
#
# Written by
# Christian Vogelgsang <chris@vogelgsang.org>
#
# This file is part of VICE, the Versatile Commodore Emulator.
# See README for copyright notice.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
# 02111-1307 USA.
#
# Usage: build-sdlmain.sh <build-dir> <arch:ppc|i386>
#
# call this function twice: for ppc and i386
#
# includes of SDL
SDL_INCLUDES="/Library/Frameworks/SDL.framework/Headers"
# get build tools
SCRIPT_DIR="`dirname \"$0\"`"
. "$SCRIPT_DIR/build-inc.sh"
# parse args
parse_args "$@"
# create target dirs
make_dirs lib include
# setup compiler environment
set_compiler_env
echo "===== SDLMain build $BUILD_TAG ====="
# check if lib is already available
SDLMAIN_LIB="libSDLmain.a"
SDLMAIN_HDR="SDLmain.h"
if [ -e "$INSTALL_DIR/lib/$SDLMAIN_LIB" -a -e "$INSTALL_DIR/include/$SDLMAIN_HDR" ]; then
echo " SDLMain library already for $ARCH installed. ($SDLMAIN_LIB, $SDLMAIN_HDR exists)"
exit 0
fi
# check for source files
M_FILE="SDLMain.m"
H_FILE="SDLMain.h"
if [ ! -e "$M_FILE" -o ! -e "$H_FILE" ]; then
echo "FATAL: Sources missing: $M_FILE $H_FILE"
exit 1
fi
# compile files
O_FILE="SDLMain.o"
echo "compiling $M_FILE ($ARCH)"
$CC $CFLAGS $CPPFLAGS -I$SDL_INCLUDES -O3 -W -c "$M_FILE" -o "$O_FILE"
if [ ! -e "$O_FILE" ]; then
echo "FATAL: compile failed in file: $C_FILE"
exit 1
fi
# build archive
A_FILE="$INSTALL_DIR/lib/$SDLMAIN_LIB"
ar cr "$A_FILE" "$O_FILE"
if [ ! -e "$A_FILE" ]; then
echo "FATAL: archive missing: $A_FILE"
exit 1
fi
echo "preparing $A_FILE"
ranlib "$A_FILE"
# install header
if [ ! -e "$INSTALL_DIR/include/$SDLMAIN_HDR" ]; then
echo "installing header $SDLMAIN_HDR"
cp "$H_FILE" "$INSTALL_DIR/include/$SDLMAIN_HDR"
fi
# clean up source
rm -f "$O_FILE"
echo "===== SDLMain ready $BUILD_TAG ====="

533
vice/build/macosx/build-vice-dist.sh
View File

@ -1,533 +0,0 @@
#!/bin/sh
#
# build-vice-dist.sh
#
# build a binary distribution of VICE for macs
# you can select the architecture (including universal binaries),
# the ui type (x11 or gtk) and the dist type (dir or dmg)
#
# Written by
# Christian Vogelgsang <chris@vogelgsang.org>
#
# This file is part of VICE, the Versatile Commodore Emulator.
# See README for copyright notice.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
# 02111-1307 USA.
#
# call this script from vice top-level directory!
#
echo "---------- Build Mac Binary Distribution ----------"
# check for vice version in configure.proto
if [ ! -e configure.proto ]; then
echo "please run this script from inside the VICE source directory!"
exit 1
fi
# fetch vice version
eval `grep 'VICE_VERSION_[A-Z]*=' configure.proto`
if test x"$VICE_VERSION_BUILD" = "x" -o x"$VICE_VERSION_BUILD" = "x0" ; then
VICE_VERSION=$VICE_VERSION_MAJOR"."$VICE_VERSION_MINOR
else
VICE_VERSION=$VICE_VERSION_MAJOR"."$VICE_VERSION_MINOR"."$VICE_VERSION_BUILD
fi
# ----- check args -----
if [ "x$1" = "x" ]; then
echo "Usage: $0 <arch> <sdk_version> <compiler> <ui-type> <dist-type> <extlib-dir> <build-dir> <debug>"
echo " arch Build architecture i386 ppc x86_64 ubi i386+ppc i386+x86_64"
echo " sdk-ver Select SDK version 10.4 10.5 10.6"
echo " compiler Select compiler suite gcc40 gcc42 clang"
echo " ui-type User Interface Type sdl x11 gtk cocoa"
echo " dist-type Type of Distribution dmg dir"
echo " extlib-dir External Libraries"
echo " build-dir Where VICE is built"
echo " debug Build debug version 0"
exit 1
fi
ARCH="$1"
MULTI_ARCH="`echo \"$ARCH\" | sed -e 's/+/ /g'`"
for A in $MULTI_ARCH ; do
if [ "$A" != "i386" -a "$A" != "ppc" -a "$A" != "x86_64" ]; then
echo "Wrong architecture given: $A"
exit 1
fi
done
SDK_VERSION="$2"
case "$SDK_VERSION" in
10.[4-9]) ;;
*)
echo "Wrong SDK version given: $SDK_VERSION"
exit 1
;;
esac
COMPILER="$3"
case "$COMPILER" in
gcc40) ;;
gcc42) ;;
clang*) ;;
*)
echo "Wrong compiler given: $COMPILER"
exit 1
;;
esac
UI_TYPE="$4"
if [ "$UI_TYPE" != "x11" -a "$UI_TYPE" != "gtk" -a "$UI_TYPE" != "cocoa" -a "$UI_TYPE" != "sdl" ]; then
echo "Wrong UI Type given: use 'x11' or 'gtk', or 'cocoa'!"
exit 1
fi
DIST_TYPE="$5"
if [ "$DIST_TYPE" != "dir" -a "$DIST_TYPE" != "dmg" ]; then
echo "Wrong Build Target: use 'dir' or 'dmg'!"
exit 1
fi
EXTLIB_DIR="`cd \"$6\" && pwd`"
if [ ! -d "$EXTLIB_DIR" ]; then
echo "ExtLib Directory '$EXTLIB_DIR' does not exist!"
exit 1
fi
BUILD_DIR="`cd \"$7\" && pwd`"
if [ "$BUILD_DIR" = "" ]; then
echo "No Build Directory given!"
exit 1
fi
DEBUG="$8"
if [ "x$DEBUG" = "x" ]; then
DEBUG=0
fi
echo "+ architecture: $ARCH [$MULTI_ARCH]"
echo "+ sdk version: $SDK_VERSION"
echo "+ compiler: $COMPILER"
echo "+ ui type: $UI_TYPE"
echo "+ dist type: $DIST_TYPE"
echo "+ ext lib dir: $EXTLIB_DIR"
echo "+ build dir: $BUILD_DIR"
echo "+ debug: $DEBUG"
# ----- determine number of CPUs -----
NUM_CPUS=`hostinfo | grep 'processors are logically available' | awk '{print $1}'`
echo "+ cpu cores: $NUM_CPUS"
echo
# ----- determine build options -----
echo "----- Determine Build Options -----"
# check if a library is available for the selected architectures
check_lib () {
local libName="$1"
echo -n "checking for library '$libName' ... "
# check for arch lib
for A in $MULTI_ARCH ; do
local A_PATH="$EXTLIB_DIR/$A-$SDK_VERSION-$COMPILER/lib/$libName"
if [ ! -f "$A_PATH" ]; then
echo " $A build missing ($A_PATH)"
false
return
fi
done
echo " available for $MULTI_ARCH"
true
}
# default configure flags
CONFIGURE_FLAGS="--disable-nls"
# check for gtk+ libs
if [ "$UI_TYPE" = "gtk" ]; then
check_lib "libgtk-x11-2.0.dylib"
if [ "$?" != "0" ]; then
echo "gtk requested, but no gtk+ libs found!"
exit 1
fi
CONFIGURE_FLAGS="--enable-gnomeui $CONFIGURE_FLAGS"
CONFIGURE_OPTS="Gtk+"
elif [ "$UI_TYPE" = "cocoa" ]; then
CONFIGURE_FLAGS="--with-cocoa $CONFIGURE_FLAGS"
CONFIGURE_OPTS="Cocoa"
elif [ "$UI_TYPE" = "sdl" ]; then
CONFIGURE_FLAGS="--enable-sdlui $CONFIGURE_FLAGS"
CONFIGURE_OPTS="SDL"
fi
# check for hidutil
check_lib "libHIDUtilities.a"
if [ "$?" = "0" ]; then
echo "+++ With Joystick Support +++"
CONFIGURE_OPTS="Joystick $CONFIGURE_OPTS"
fi
# check for libpcap and libnet
if [ "$UI_TYPE" != "sdl" ]; then
check_lib "libpcap.a"
if [ "$?" = "0" ]; then
check_lib "libnet.a"
if [ "$?" = "0" ]; then
CONFIGURE_FLAGS="--enable-ethernet $CONFIGURE_FLAGS"
CONFIGURE_OPTS="Ethernet $CONFIGURE_OPTS"
echo "+++ With Ethernet Support +++"
fi
fi
fi
# check for ffmpeg and lame
check_lib "libavcodec.dylib"
if [ "$?" = "0" ]; then
check_lib "libmp3lame.dylib"
if [ "$?" = "0" ]; then
CONFIGURE_FLAGS="--enable-ffmpeg $CONFIGURE_FLAGS"
CONFIGURE_OPTS="FFMPEG $CONFIGURE_OPTS"
echo "+++ With FFMPEG + Lame Support +++"
fi
fi
# clang workarounds for now
if [ "$COMPILER" = "clang" ]; then
CONFIGURE_FLAGS="$CONFIGURE_FLAGS"
fi
# ----- setup build dir -----
BUILD_DIR="$BUILD_DIR/$UI_TYPE-$SDK_VERSION-$COMPILER"
if [ ! -d "$BUILD_DIR" ]; then
mkdir -p "$BUILD_DIR"
fi
if [ ! -d "$BUILD_DIR" ]; then
echo "ERROR: Creating build directory '$BUILD_DIR' failed!"
exit 1
fi
# create build subdirs (including 'ub' dirs)
for A in $ARCH $MULTI_ARCH ; do
A_DIR="$BUILD_DIR/$A"
if [ ! -d "$A_DIR" ]; then
mkdir -p "$A_DIR";
fi
done
# ----- Copy Gtk Config Files -----
if [ "$UI_TYPE" = "gtk" ]; then
echo "----- Copy GTK Config Files -----"
ANY_ARCH=${MULTI_ARCH%% *}
# copy fontconfig
MYFONTCONFIG="$BUILD_DIR/$ARCH/etc/fonts"
if [ ! -d "$MYFONTCONFIG" ]; then
FONTCONFIG="$EXTLIB_DIR/$ANY_ARCH-$SDK_VERSION-$COMPILER/etc/fonts"
if [ ! -d "$FONTCONFIG" ]; then
echo "FontConfig dir not found in '$FONTCONFIG'"
exit 1
fi
mkdir -p "$MYFONTCONFIG"
(cd "$FONTCONFIG" && tar cf - *) | (cd "$MYFONTCONFIG" && tar xvf -)
fi
fi
# ----- Compile VICE -----
export PATH=/usr/X11R6/bin:$PATH
if [ $DEBUG = 1 ]; then
COMMON_CFLAGS="-O3 -g"
else
COMMON_CFLAGS="-O3"
fi
# HACK: extra flags for GL compile
if [ "$UI_TYPE" != "cocoa" ]; then
LDFLAGS_EXTRA="-dylib_file /System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib"
fi
build_vice () {
local BUILD_ARCH="$1"
local BUILD_SDK="$2"
local BUILD_SDK_VERSION="$3"
local BUILD_COMPILER="$4"
local BUILD_CC="$5"
local BUILD_CXX="$6"
local VICE_SRC="`pwd`"
local BUILD_ARCH2="$BUILD_ARCH"
if [ "$BUILD_ARCH" = "ppc" ]; then
BUILD_ARCH2="powerpc"
fi
local BUILD_TAG="$BUILD_ARCH-$BUILD_SDK_VERSION-$BUILD_COMPILER"
local HOST_TAG="`uname -p`-$BUILD_SDK_VERSION-$BUILD_COMPILER"
echo
echo "+----- Bulding VICE [$BUILD_TAG] -----"
echo "+ host: $HOST_TAG"
echo "+ sdk path: $BUILD_SDK"
echo "+ c compiler: $BUILD_CC ($BUILD_CC_VERSION)"
echo "+ c++ compiler: $BUILD_CXX ($BUILD_CXX_VERSION)"
# already here?
if [ -f "$BUILD_DIR/$BUILD_ARCH/src/x64" ]; then
echo " hmm... VICE already built for $BUILD_ARCH?! skipping..."
return
fi
if test x"$BUILD_SDK" != "x"; then
ISYSROOT="-isysroot $BUILD_SDK"
else
ISYSROOT=""
fi
# main VICE compile call
pushd "$VICE_SRC"
cd "$BUILD_DIR/$BUILD_ARCH"
set -x
env \
PATH="$EXTLIB_DIR/$HOST_TAG/bin:$PATH" \
CPPFLAGS="-I$EXTLIB_DIR/$BUILD_TAG/include" \
CFLAGS="$COMMON_CFLAGS" \
OBJCFLAGS="$COMMON_CFLAGS" \
LDFLAGS="-L$EXTLIB_DIR/$BUILD_TAG/lib $LDFLAGS_EXTRA" \
CC="$BUILD_CC -arch $BUILD_ARCH $ISYSROOT -mmacosx-version-min=$BUILD_SDK_VERSION" \
CXX="$BUILD_CXX -arch $BUILD_ARCH $ISYSROOT -mmacosx-version-min=$BUILD_SDK_VERSION" \
LD="$BUILD_CC -arch $BUILD_ARCH $ISYSROOT -mmacosx-version-min=$BUILD_SDK_VERSION" \
$VICE_SRC/configure --host=$BUILD_ARCH2-apple-darwin $CONFIGURE_FLAGS \
--x-includes=$BUILD_SDK/usr/X11R6/include --x-libraries=$BUILD_SDK/usr/X11R6/lib
set +x
make -j $NUM_CPUS 2>&1 | tee build.log
echo "--- Warnings ---"
fgrep warning: build.log
popd
# check if all went well
if [ ! -f "$BUILD_DIR/$BUILD_ARCH/src/x64" ]; then
echo "FATAL: no x64 in $BUILD_DIR/$BUILD_ARCH/src found!"
exit 1
fi
}
copy_dylib_rec () {
local FILE="$1"
local GOTLIB="$2"
# get external libs
echo 1>&2 " checking binary '$FILE' for dylibs"
local EXTLIB="`otool -L \"$FILE\" | grep dylib | grep -v /usr | grep -v /System | grep -v "$FILE" | cut -f1 -d ' '`"
for lib in $EXTLIB ; do
echo "$GOTLIB" | grep -q "$lib"
if [ $? = 1 ]; then
#echo 1>&2 " lib...$lib"
GOTLIB="$lib $GOTLIB"
GOTLIB="`copy_dylib_rec \"$lib\" \"$GOTLIB\"`"
fi
done
echo "$GOTLIB"
}
# copy the required dynamic libs
copy_dylib () {
local BUILD_ARCH="$1"
# get external libs
echo "-- copy dylibs for $BUILD_ARCH --"
EXTLIB="`copy_dylib_rec \"$BUILD_DIR/$BUILD_ARCH/src/x64\"`"
# make sure lib dir exists
local LIBDIR="$BUILD_DIR/$BUILD_ARCH/lib"
if [ ! -d "$LIBDIR" ]; then
mkdir -p "$LIBDIR"
fi
# copy lib if not already there
for lib in $EXTLIB ; do
LIBNAME="`basename \"$lib\"`"
if [ ! -e "$LIBDIR/$LIBNAME" ]; then
echo " copying required dylib '$LIBNAME'"
cp "$lib" "$LIBDIR/$LIBNAME"
else
echo " required dylib '$LIBNAME' already here"
fi
done
}
fix_ref () {
local exe="$1"
local newpath="$2"
local base="`basename \"$exe\"`"
local LIBS=`otool -L "$exe" | grep .dylib | grep -v /usr | grep -v /System | awk '{ print $1 }'`
echo -n " fixing lib ref in '$1'"
for lib in $LIBS ; do
baselib="`basename \"$lib\"`"
newlib="$newpath/$baselib"
install_name_tool -change "$lib" "$newlib" "$exe"
echo -n "."
done
cutbase="`basename \"$base\" .dylib`"
if [ "$cutbase" != "$base" ]; then
# adapt install name in lib
libname="@executable_path/$base"
install_name_tool -id "$libname" "$exe"
echo -n "I"
fi
echo
}
# determine compiler name
case "$COMPILER" in
gcc40)
CC_NAME=gcc-4.0
CXX_NAME=g++-4.0
;;
gcc42)
CC_NAME=gcc-4.2
CXX_NAME=g++-4.2
;;
clang_gcc)
CC_NAME=clang
CXX_NAME=llvm-g++
;;
clang)
CC_NAME=clang
CXX_NAME=clang++
;;
*)
CC_NAME="$COMPILER"
CXX_NAME="$COMPILER"
;;
esac
# get SDK name
case "$SDK_VERSION" in
10.4) SDK_NAME=MacOSX10.4u.sdk;;
*) SDK_NAME=MacOSX${SDK_VERSION}.sdk;;
esac
case "$SDK_VERSION" in
10.8) SDK_SEARCH="no";;
*) SDK_SEARCH="yes";;
esac
# search compiler and SDK
if test x"$SDK_SEARCH" != "xyes"; then
BUILD_CC="$CC_NAME"
BUILD_CXX="$CXX_NAME"
SDK_PATH=""
else
FOUND=0
if [ "$DEV_BASES" = "" ]; then
DEV_BASES="/Developer /Developer3"
fi
for BASE in $DEV_BASES ; do
if [ $FOUND -eq 0 ]; then
TRY_CC="$BASE/usr/bin/$CC_NAME"
TRY_CXX="$BASE/usr/bin/$CXX_NAME"
TRY_SDK="$BASE/SDKs/$SDK_NAME"
echo "TRY_CC=$TRY_CC, TRY_CXX=$TRY_CXX, TRY_SDK=$TRY_SDK"
if [ -x "$TRY_CC" -a -x "$TRY_CXX" -a -d "$TRY_SDK" ]; then
BUILD_CC="$TRY_CC"
BUILD_CXX="$TRY_CXX"
SDK_PATH="$TRY_SDK"
FOUND=1
fi
fi
done
if [ $FOUND -eq 0 ]; then
echo "ERROR: C compiler, C++ compiler, or SDK not found!"
exit 1
fi
fi
# get versions of compiler
BUILD_CC_VERSION=$($BUILD_CC --version | head -1)
BUILD_CXX_VERSION=$($BUILD_CXX --version | head -1)
# build vice
for A in $MULTI_ARCH ; do
build_vice "$A" "$SDK_PATH" "$SDK_VERSION" "$COMPILER" "$BUILD_CC" "$BUILD_CXX"
copy_dylib "$A"
done
APPS="c1541 cartconv petcat x128 x64 x64sc x64dtv xcbm2 xcbm5x0 xpet xplus4 xvic"
# ----- Fixin Lib Refs -----
echo "----- Fixing Library References -----"
if [ "$UI_TYPE" = "x11" -o "$UI_TYPE" = "gtk" ]; then
FIX_LIB_PATH="@executable_path/../lib"
else
FIX_LIB_PATH="@executable_path"
fi
# in all apps
for app in $APPS ; do
for A in $MULTI_ARCH ; do
fix_ref "$BUILD_DIR/$A/src/$app" "$FIX_LIB_PATH"
done
done
# and all libs
for lib in $EXTLIB ; do
LIBNAME="`basename \"$lib\"`"
for A in $MULTI_ARCH ; do
fix_ref "$BUILD_DIR/$A/lib/$LIBNAME" "$FIX_LIB_PATH"
done
done
# ----- Create Universal Binary -----
if [ "$ARCH" != "$MULTI_ARCH" ]; then
echo "----- Combining Binaries into Universal Binaries -----"
mkdir -p "$BUILD_DIR/$ARCH/src"
if [ -f "$BUILD_DIR/$ARCH/src/x64" ]; then
echo " hmm... Already combined?! skipping..."
else
for app in $APPS ; do
MULTI_APP=""
for A in $MULTI_ARCH ; do
MULTI_APP="$BUILD_DIR/$A/src/$app $MULTI_APP"
done
echo " combining '$app'"
lipo -create -output "$BUILD_DIR/$ARCH/src/$app" $MULTI_APP
done
if [ ! -f "$BUILD_DIR/$ARCH/src/x64" ]; then
echo "FATAL: no universal x64 found!"
exit 1
fi
fi
# combine dynamic libs
mkdir -p "$BUILD_DIR/$ARCH/lib"
for lib in $EXTLIB ; do
LIBNAME="`basename \"$lib\"`"
if [ ! -e "$BUILD_DIR/$ARCH/lib/$LIBNAME" ]; then
MULTI_LIB=""
for A in $MULTI_ARCH ; do
MULTI_LIB="$BUILD_DIR/$A/lib/$LIBNAME $MULTI_LIB"
done
echo " combining dylib '$LIBNAME'"
lipo -create -output "$BUILD_DIR/$ARCH/lib/$LIBNAME" $MULTI_LIB
else
echo " already combined dylib '$LIBNAME'"
fi
done
fi
# ----- Bundle Applications and Distribution -----
echo "----- Distribution Creation -----"
VICE_SRC="`pwd`"
ZIP="zip"
if [ "$DIST_TYPE" = "dir" ]; then
ZIP="nozip"
fi
if [ $DEBUG = 1 ]; then
STRIP="nostrip"
else
STRIP="strip"
fi
# make-bindist.sh <top_srcdir> <strip> <vice-version> <--enable-arch> <zip|nozip> <x64sc-included> <ui_type> [bin_format]
# $1 $2 $3 $4 $5 $6 $7 $8
(cd "$BUILD_DIR/$ARCH" && \
$SHELL $VICE_SRC/src/arch/unix/macosx/make-bindist.sh $VICE_SRC $STRIP $VICE_VERSION no $ZIP yes $UI_TYPE "$ARCH-$SDK_VERSION-$COMPILER")
echo "----- Ready: architecture: [$ARCH-$SDK_VERSION-$COMPILER,$UI_TYPE,$DIST_TYPE] -----"
echo "VICE was configured with: $CONFIGURE_OPTS"
exit 0

335
vice/build/macosx/build-vice-release.sh
View File

@ -1,335 +0,0 @@
#!/bin/bash
#
# build-vice-release.sh - build snapshot binaries for x11 gtk and cocoa from the SVN
#
# Written by
# Christian Vogelgsang <chris@vogelgsang.org>
#
# This file is part of VICE, the Versatile Commodore Emulator.
# See README for copyright notice.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
# 02111-1307 USA.
#
# Usage: build-allext.sh <build-dir> [force build]
#
echo "--- build VICE release from SVN repository ---"
# default parameter
SNAPSHOT=0
LINK_SRC=0
ONLY_BIN=0
DEL_TARGET=0
EXTLIB="extlib"
BUILD_DIR=""
DEBUG=0
DIR_DIST=0
DEFAULT_UI="cocoa"
DEFAULT_ARCH="i386+ppc"
DEFAULT_SDK_VERSION="10.4"
DEFAULT_COMPILER="gcc40"
ALL_JOBS="sdl x11 gtk cocoa cocoa-10.5 cocoa-i386+x86_64-10.6-gcc42 cocoa-i386+x86_64-10.6-clang_gcc cocoa-i386+x86_64-10.6-clang"
JOBS="cocoa-10.5 cocoa-i386+x86_64-10.6-gcc42 cocoa-i386+x86_64-10.6-clang"
OWN_TAG=""
usage() {
cat <<EOF
Usage:
$0 [options] <vice-svn-repository>
Build a VICE Release or Snapshot for a set of uis, archs, sdks, and compilers
Options: Default:
-s do snapshot build [release build]
-l link repository directory and use it directly [fresh svn export]
-b only binaries and no source package [with source package]
-f force delete target directory if it exists [abort if exists]
-e <path to extlib> set path of external library directory [extlib]
-o <target dir> set target directory [BUILD-snapshot/release]
-d build debug version [release]
-i create distribution in directory [create DMG]
-u <uis> set default ui: sdl x11 gtk cocoa [$DEFAULT_UI]
-a <arch> set default arch: i386 ppc x86_64 i386+ppc i386+x86_64 [$DEFAULT_ARCH]
-k <sdk_version> set default sdk: 10.4 10.5 10.6 10.7 [$DEFAULT_SDK_VERSION]
-c <compiler> set default compiler: gcc40 gcc42 clang [$DEFAULT_COMPILER]
-j <jobs> set build jobs
[$JOBS]
-J build all jobs
[$ALL_JOBS]
-t <tag> overwrite tag for this build
-D quick debug preset: -slbfdi -j cocoa-i386-10.4
EOF
exit 2
}
# parse arguments
while getopts "slbfe:o:diu:a:k:c:j:DJt:" i ; do
case "$i" in
s) SNAPSHOT=1;;
l) LINK_SRC=1;;
b) ONLY_BIN=1;;
f) DEL_TARGET=1;;
e) EXTLIB="$OPTARG";;
o) BUILD_DIR="$OPTARG";;
d) DEBUG=1;;
i) DIR_DIST=1;;
u) DEFAULT_UI="$OPTARG";;
a) DEFAULT_ARCH="$OPTARG";;
k) DEFAULT_SDK_VERSION="$OPTARG";;
c) DEFAULT_COMPILER="$OPTARG";;
j) JOBS="$OPTARG";;
J) JOBS="$ALL_JOBS";;
t) OWN_TAG="$OPTARG";;
D) DEBUG=1
SNAPSHOT=1
LINK_SRC=1
ONLY_BIN=1
DEL_TARGET=1
DIR_DIST=1
JOBS="cocoa-i386-10.4-gcc40"
;;
?) usage;;
esac
done
shift $(($OPTIND-1))
# mode settings
if [ $SNAPSHOT = 1 ]; then
echo -n "mode: snapshot"
else
echo -n "mode: RELASE"
fi
if [ $DEBUG = 1 ]; then
echo " (DEBUG)"
else
echo
fi
# check repository directory
SVN_REPO="$1"
if [ "x$SVN_REPO" = "x" ]; then
echo "ERROR: no repository given!"
usage
fi
if [ ! -d "$SVN_REPO" ]; then
echo "ERROR: SVN repository '$SVN_REPO' not found!"
exit 1
fi
if [ ! -s "$SVN_REPO/.svn" ]; then
echo "ERROR: No SVN repository '$SVN_REPO'!"
exit 1
fi
if [ ! -x "$SVN_REPO/autogen.sh" ]; then
echo "ERROR: SVN repository '$SVN_REPO' contains no VICE!"
exit 1
fi
SVN_REPO="`(cd \"$SVN_REPO\" && pwd -P)`"
echo "SVN repository: $SVN_REPO"
# get revision and branch of build
SVN_INFO=`(cd "$SVN_REPO" && svn info)`
REVISION=`echo "$SVN_INFO" | grep Revision | awk '{ print $2 }'`
SVN_URL=`echo "$SVN_INFO" | grep URL | awk '{ print $2 }'`
SVN_BRANCH=`echo "$SVN_URL" | sed -e 's,.*/vice-emu/,,' -e 's,/vice$,,' -e 's,branches/,,'`
SVN_BRANCH=`basename "$SVN_BRANCH" | sed -e 's,-,_,g' -e 's,\.,,g'`
echo "SVN revision: $REVISION"
echo "SVN branch: $SVN_BRANCH"
# check extlib directory
if [ ! -d "$EXTLIB" ]; then
echo "ERROR: external libs '$EXTLIB' not found!"
exit 1
fi
EXTLIB="`(cd \"$EXTLIB\" && pwd)`"
echo "external libs: $EXTLIB"
# check target dir
if [ "x$BUILD_DIR" = x ]; then
if [ $SNAPSHOT = 1 ]; then
BUILD_DIR=BUILD-snapshot
else
BUILD_DIR=BUILD-release
fi
fi
if [ -d "$BUILD_DIR" ]; then
if [ $DEL_TARGET = 0 ]; then
echo "ERROR: $BUILD_DIR already exists!"
exit 1
else
rm -rf "$BUILD_DIR"
fi
fi
BUILD_DIR="`pwd`/$BUILD_DIR"
echo "build dir: $BUILD_DIR"
# create build src dir
mkdir -p "$BUILD_DIR"
if [ ! -d "$BUILD_DIR" ]; then
echo "ERROR: can't creat dir!"
exit 1
fi
SRC_DIR="$BUILD_DIR/src"
if [ $LINK_SRC = 1 ]; then
# link existing source
echo "linking src: $SRC_DIR"
ln -sf "$SVN_REPO" "$SRC_DIR"
else
# export fresh source
echo "exporting src: $SRC_DIR"
svn export -q "$SVN_REPO" "$SRC_DIR"
if [ $? != 0 ]; then
echo "ERROR: export faild!"
exit 1
fi
fi
# patch BUILD version if doing snapshot
if [ $SNAPSHOT = 1 -o "$OWN_TAG" != "" ]; then
# tag
DATE=`date '+%Y%m%d'`
if [ "$OWN_TAG" != "" ]; then
TAG="-$OWN_TAG"
else
TAG="-r${REVISION}_${DATE}_$SVN_BRANCH"
fi
# patch VICE_VERSION_BUILD
echo "patching configure.proto: $TAG"
PATCH_VVB="$SRC_DIR/configure.proto"
perl -pi -e "s/(VICE_VERSION_BUILD=\d+).*\$/\$1$TAG/" $PATCH_VVB
if [ $? != 0 ]; then
echo "ERROR: patching..."
exit 1
fi
fi
# configure snapshot
echo "--- configuring source tree ---"
(cd "$SRC_DIR" && ./autogen.sh)
if [ $? != 0 ]; then
echo "ERROR: configuring VICE..."
exit 1
fi
# build dist jobs
if [ "x$JOBS" != "x" ]; then
for JOB in $JOBS ; do
# determine job parameters
UI=$DEFAULT_UI
ARCH=$DEFAULT_ARCH
SDK_VERSION=$DEFAULT_SDK_VERSION
COMPILER=$DEFAULT_COMPILER
# parse job description
JOB="`echo $JOB | sed -e 's/-/ /g'`"
for PARAM in $DEFAULT_UI $DEFAULT_ARCH $DEFAULT_SDK_VERSION $DEFAULT_COMPILER $JOB ; do
case "$PARAM" in
sdl) UI=sdl;;
x11) UI=x11;;
gtk) UI=gtk;;
cocoa) UI=cocoa;;
i386) ARCH=i386;;
ppc) ARCH=ppc;;
x86_64) ARCH=x86_64;;
*+*) ARCH="$PARAM";;
10.[4-9]) SDK_VERSION="$PARAM";;
gcc40) COMPILER=gcc40;;
gcc42) COMPILER=gcc42;;
clang*) COMPILER="$PARAM";;
?) echo "Unknown Job Parameter!"; exit 1;;
esac
done
# set output log
TAG="$UI-$ARCH-$SDK_VERSION-$COMPILER"
LOG="$BUILD_DIR/build-$TAG.log"
# set dist type
if [ $DIR_DIST = 1 ]; then
DIST_TYPE="dir"
else
DIST_TYPE="dmg"
fi
# do build
echo "--- building binaries [$UI-$ARCH-$SDK_VERSION-$COMPILER] ---"
(cd "$SRC_DIR" && $BASH build/macosx/build-vice-dist.sh \
"$ARCH" "$SDK_VERSION" "$COMPILER" "$UI" "$DIST_TYPE" "$EXTLIB" "$BUILD_DIR" "$DEBUG") \
2>&1 | tee "$LOG" | grep ^+
# check generated files
if [ $DIR_DIST = 1 ]; then
FILES="$(ls -d $BUILD_DIR/$UI-$SDK_VERSION-$COMPILER/$ARCH/vice-macosx-* 2>/dev/null)"
else
FILES="$(ls $BUILD_DIR/$UI-$SDK_VERSION-$COMPILER/$ARCH/vice-macosx-*.dmg 2>/dev/null)"
fi
echo "generated output: $FILES"
if [ "x$FILES" = "x" ]; then
echo "no file found!"
exit 1
fi
# show warnings
echo " -warnings begin-"
fgrep warning: "$LOG" | sort | uniq
echo " -warnings end-"
# size and move files
du -sh "$FILES"
mv "$FILES" "$BUILD_DIR"
done
fi
# packing source
if [ $ONLY_BIN = 0 ]; then
echo "--- source ---"
echo "packing source"
DEST_DIR="$BUILD_DIR/tarball"
mkdir "$DEST_DIR"
if [ ! -d "$DEST_DIR" ]; then
echo "ERROR: creating dir"
exit 1
fi
LOG="$BUILD_DIR/build-tarball.log"
(cd "$DEST_DIR" && $SRC_DIR/configure && make dist) >"$LOG" 2>&1
# move generated files to top level
FILES="$(ls $DEST_DIR/*.tar.gz 2>/dev/null)"
if [ "x$FILES" = "x" ]; then
echo "FAILED!"
tail -10 $LOG
exit 1
fi
echo "generated: $FILES"
du -sh "$FILES"
mv "$FILES" "$BUILD_DIR"
fi
echo "--- ready ---"
exit 0

3
vice/build/mingw/Makefile.am Normal file
View File

@ -0,0 +1,3 @@
SUBDIRS = frankenvice

318
vice/build/nextstep/Makefile.in → vice/build/mingw/Makefile.in
View File

@ -1,7 +1,7 @@
# Makefile.in generated by automake 1.15 from Makefile.am.
# Makefile.in generated by automake 1.16.2 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2014 Free Software Foundation, Inc.
# Copyright (C) 1994-2020 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@ -87,9 +87,12 @@ PRE_UNINSTALL = :
POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
subdir = build/nextstep
subdir = build/mingw
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
am__aclocal_m4_deps = $(top_srcdir)/m4/ax_cxx_compile_stdcxx.m4 \
$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/pkg.m4 \
$(top_srcdir)/m4/vice_args.m4 \
$(top_srcdir)/m4/vice_compiler_checks.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
@ -112,14 +115,74 @@ am__v_at_0 = @
am__v_at_1 =
SOURCES =
DIST_SOURCES =
RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
ctags-recursive dvi-recursive html-recursive info-recursive \
install-data-recursive install-dvi-recursive \
install-exec-recursive install-html-recursive \
install-info-recursive install-pdf-recursive \
install-ps-recursive install-recursive installcheck-recursive \
installdirs-recursive pdf-recursive ps-recursive \
tags-recursive uninstall-recursive
am__can_run_installinfo = \
case $$AM_UPDATE_INFO_DIR in \
n|no|NO) false;; \
*) (install-info --version) >/dev/null 2>&1;; \
esac
RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
distclean-recursive maintainer-clean-recursive
am__recursive_targets = \
$(RECURSIVE_TARGETS) \
$(RECURSIVE_CLEAN_TARGETS) \
$(am__extra_recursive_targets)
AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
distdir distdir-am
am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
# Read a list of newline-separated strings from the standard input,
# and print each of them once, without duplicates. Input order is
# *not* preserved.
am__uniquify_input = $(AWK) '\
BEGIN { nonempty = 0; } \
{ items[$$0] = 1; nonempty = 1; } \
END { if (nonempty) { for (i in items) print i; }; } \
'
# Make sure the list of sources is unique. This is necessary because,
# e.g., the same source file might be shared among _SOURCES variables
# for different programs/libraries.
am__define_uniq_tagged_files = \
list='$(am__tagged_files)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | $(am__uniquify_input)`
ETAGS = etags
CTAGS = ctags
DIST_SUBDIRS = $(SUBDIRS)
am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/mkinstalldirs
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
am__relativize = \
dir0=`pwd`; \
sed_first='s,^\([^/]*\)/.*$$,\1,'; \
sed_rest='s,^[^/]*/*,,'; \
sed_last='s,^.*/\([^/]*\)$$,\1,'; \
sed_butlast='s,/*[^/]*$$,,'; \
while test -n "$$dir1"; do \
first=`echo "$$dir1" | sed -e "$$sed_first"`; \
if test "$$first" != "."; then \
if test "$$first" = ".."; then \
dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
else \
first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
if test "$$first2" = "$$first"; then \
dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
else \
dir2="../$$dir2"; \
fi; \
dir0="$$dir0"/"$$first"; \
fi; \
fi; \
dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
done; \
reldir="$$dir2"
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
@ -134,6 +197,7 @@ AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BASH = @BASH@
CC = @CC@
CCAS = @CCAS@
CCASDEPMODE = @CCASDEPMODE@
@ -178,6 +242,8 @@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
FW_DIR = @FW_DIR@
GFXOUTPUT_DRIVERS = @GFXOUTPUT_DRIVERS@
GFXOUTPUT_LIBS = @GFXOUTPUT_LIBS@
GLEW_CFLAGS = @GLEW_CFLAGS@
GLEW_LIBS = @GLEW_LIBS@
GLIB_CFLAGS = @GLIB_CFLAGS@
GLIB_LIBS = @GLIB_LIBS@
GREP = @GREP@
@ -185,15 +251,14 @@ GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
HAVE_CXX11 = @HAVE_CXX11@
HAVE_READLINE = @HAVE_READLINE@
HCRTF = @HCRTF@
HHC = @HHC@
ICONV = @ICONV@
ICOTOOL = @ICOTOOL@
INLINE_UNIT_GROWTH = @INLINE_UNIT_GROWTH@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
IPFC = @IPFC@
JOY_LIBS = @JOY_LIBS@
LAMEMP3SUB = @LAMEMP3SUB@
LDFLAGS = @LDFLAGS@
@ -209,12 +274,14 @@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEGUIDE = @MAKEGUIDE@
MAKEINFO = @MAKEINFO@
MAKERTF = @MAKERTF@
MAX_INLINE_INSN_SINGLE = @MAX_INLINE_INSN_SINGLE@
MKDIR_P = @MKDIR_P@
MKFONTDIR_BIN = @MKFONTDIR_BIN@
NATIVE_TOOLS_COMPILER = @NATIVE_TOOLS_COMPILER@
MONITOR_CFLAGS = @MONITOR_CFLAGS@
NETPLAY_LIBS = @NETPLAY_LIBS@
OBJC = @OBJC@
OBJCDEPMODE = @OBJCDEPMODE@
OBJCFLAGS = @OBJCFLAGS@
OBJCPP = @OBJCPP@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@ -230,8 +297,8 @@ PKG_CONFIG = @PKG_CONFIG@
PLATFORM_DOX_FLAGS = @PLATFORM_DOX_FLAGS@
PNG_CFLAGS = @PNG_CFLAGS@
PNG_LIBS = @PNG_LIBS@
QUICKTIME_INCLUDES = @QUICKTIME_INCLUDES@
QUICKTIME_LIBS = @QUICKTIME_LIBS@
PROGRAM_PREFIX = @PROGRAM_PREFIX@
PROGRAM_SUFFIX = @PROGRAM_SUFFIX@
RANLIB = @RANLIB@
READLINE = @READLINE@
READLINE_LIBS = @READLINE_LIBS@
@ -245,35 +312,49 @@ RESID_DTV_INCLUDES = @RESID_DTV_INCLUDES@
RESID_DTV_LIBS = @RESID_DTV_LIBS@
RESID_INCLUDES = @RESID_INCLUDES@
RESID_LIBS = @RESID_LIBS@
SDL2_CFLAGS = @SDL2_CFLAGS@
SDL2_IMAGE_CFLAGS = @SDL2_IMAGE_CFLAGS@
SDL2_IMAGE_LIBS = @SDL2_IMAGE_LIBS@
SDL2_LIBS = @SDL2_LIBS@
SDLCONFIG = @SDLCONFIG@
SDL_EXTRA_LIBS = @SDL_EXTRA_LIBS@
SDL_IMAGE_CFLAGS = @SDL_IMAGE_CFLAGS@
SDL_IMAGE_LIBS = @SDL_IMAGE_LIBS@
SDL_VERSION = @SDL_VERSION@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SOUND_AIX_OBJ = @SOUND_AIX_OBJ@
SOUND_DRIVERS = @SOUND_DRIVERS@
SOUND_HPUX_OBJ = @SOUND_HPUX_OBJ@
SOUND_LIBS = @SOUND_LIBS@
SOUND_MIDAS_OBJ = @SOUND_MIDAS_OBJ@
SOUND_SDL_OBJ = @SOUND_SDL_OBJ@
SOUND_SGI_OBJ = @SOUND_SGI_OBJ@
SOUND_USS_OBJ = @SOUND_USS_OBJ@
STRIP = @STRIP@
SVN = @SVN@
SVNVERSION = @SVNVERSION@
TAR = @TAR@
TEXI2DVI = @TEXI2DVI@
TEXI2IPF = @TEXI2IPF@
TFE_LIBS = @TFE_LIBS@
UI_LIBS = @UI_LIBS@
VERSION = @VERSION@
VERSION_COMBINED = @VERSION_COMBINED@
VERSION_RC = @VERSION_RC@
VICEDIR = @VICEDIR@
VICE_CFLAGS = @VICE_CFLAGS@
VICE_CPPFLAGS = @VICE_CPPFLAGS@
VICE_CXXFLAGS = @VICE_CXXFLAGS@
VICE_DATADIR = @VICE_DATADIR@
VICE_DOCDIR = @VICE_DOCDIR@
VICE_LDFLAGS = @VICE_LDFLAGS@
VICE_OBJCFLAGS = @VICE_OBJCFLAGS@
VICE_PDF_FILE_NAME = @VICE_PDF_FILE_NAME@
VICE_VERSION = @VICE_VERSION@
VICE_VERSION_BUILD = @VICE_VERSION_BUILD@
VICE_VERSION_MAJOR = @VICE_VERSION_MAJOR@
VICE_VERSION_MINOR = @VICE_VERSION_MINOR@
VTE_CXXFLAGS = @VTE_CXXFLAGS@
WINDRES = @WINDRES@
WINDRES_LIB = @WINDRES_LIB@
XA = @XA@
XDG_DESKTOP_MENU = @XDG_DESKTOP_MENU@
YACC = @YACC@
YASM = @YASM@
ZLIB_LIBS = @ZLIB_LIBS@
@ -283,12 +364,12 @@ abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_OBJC = @ac_ct_OBJC@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
am__tar = @am__tar@
am__untar = @am__untar@
artsc_config = @artsc_config@
bindir = @bindir@
build = @build@
build_alias = @build_alias@
@ -301,7 +382,6 @@ datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
ffmpeg_have_bash = @ffmpeg_have_bash@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@ -325,7 +405,6 @@ program_transform_name = @program_transform_name@
psdir = @psdir@
runstatedir = @runstatedir@
sbindir = @sbindir@
sdl2_config = @sdl2_config@
sdl_config = @sdl_config@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
@ -343,8 +422,8 @@ xpet_LDFLAGS = @xpet_LDFLAGS@
xplus4_LDFLAGS = @xplus4_LDFLAGS@
xscpu64_LDFLAGS = @xscpu64_LDFLAGS@
xvic_LDFLAGS = @xvic_LDFLAGS@
EXTRA_DIST = build.sh
all: all-am
SUBDIRS = frankenvice
all: all-recursive
.SUFFIXES:
$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@ -356,16 +435,16 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
exit 1;; \
esac; \
done; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu build/nextstep/Makefile'; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign build/mingw/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --gnu build/nextstep/Makefile
$(AUTOMAKE) --foreign build/mingw/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
*) \
echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
esac;
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@ -376,14 +455,110 @@ $(top_srcdir)/configure: $(am__configure_deps)
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(am__aclocal_m4_deps):
tags TAGS:
ctags CTAGS:
# This directory's subdirectories are mostly independent; you can cd
# into them and run 'make' without going through this Makefile.
# To change the values of 'make' variables: instead of editing Makefiles,
# (1) if the variable is set in 'config.status', edit 'config.status'
# (which will cause the Makefiles to be regenerated when you run 'make');
# (2) otherwise, pass the desired values on the 'make' command line.
$(am__recursive_targets):
@fail=; \
if $(am__make_keepgoing); then \
failcom='fail=yes'; \
else \
failcom='exit 1'; \
fi; \
dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \
case "$@" in \
distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
*) list='$(SUBDIRS)' ;; \
esac; \
for subdir in $$list; do \
echo "Making $$target in $$subdir"; \
if test "$$subdir" = "."; then \
dot_seen=yes; \
local_target="$$target-am"; \
else \
local_target="$$target"; \
fi; \
($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
|| eval $$failcom; \
done; \
if test "$$dot_seen" = "no"; then \
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
fi; test -z "$$fail"
cscope cscopelist:
ID: $(am__tagged_files)
$(am__define_uniq_tagged_files); mkid -fID $$unique
tags: tags-recursive
TAGS: tags
tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
set x; \
here=`pwd`; \
if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
include_option=--etags-include; \
empty_fix=.; \
else \
include_option=--include; \
empty_fix=; \
fi; \
list='$(SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
test ! -f $$subdir/TAGS || \
set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
fi; \
done; \
$(am__define_uniq_tagged_files); \
shift; \
if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
if test $$# -gt 0; then \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
"$$@" $$unique; \
else \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
$$unique; \
fi; \
fi
ctags: ctags-recursive
distdir: $(DISTFILES)
CTAGS: ctags
ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
$(am__define_uniq_tagged_files); \
test -z "$(CTAGS_ARGS)$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$unique
GTAGS:
here=`$(am__cd) $(top_builddir) && pwd` \
&& $(am__cd) $(top_srcdir) \
&& gtags -i $(GTAGS_ARGS) "$$here"
cscopelist: cscopelist-recursive
cscopelist-am: $(am__tagged_files)
list='$(am__tagged_files)'; \
case "$(srcdir)" in \
[\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
*) sdir=$(subdir)/$(srcdir) ;; \
esac; \
for i in $$list; do \
if test -f "$$i"; then \
echo "$(subdir)/$$i"; \
else \
echo "$$sdir/$$i"; \
fi; \
done >> $(top_builddir)/cscope.files
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
distdir: $(BUILT_SOURCES)
$(MAKE) $(AM_MAKEFLAGS) distdir-am
distdir-am: $(DISTFILES)
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
list='$(DISTFILES)'; \
@ -413,19 +588,45 @@ distdir: $(DISTFILES)
|| exit 1; \
fi; \
done
@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
$(am__make_dryrun) \
|| test -d "$(distdir)/$$subdir" \
|| $(MKDIR_P) "$(distdir)/$$subdir" \
|| exit 1; \
dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
$(am__relativize); \
new_distdir=$$reldir; \
dir1=$$subdir; dir2="$(top_distdir)"; \
$(am__relativize); \
new_top_distdir=$$reldir; \
echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
($(am__cd) $$subdir && \
$(MAKE) $(AM_MAKEFLAGS) \
top_distdir="$$new_top_distdir" \
distdir="$$new_distdir" \
am__remove_distdir=: \
am__skip_length_check=: \
am__skip_mode_fix=: \
distdir) \
|| exit 1; \
fi; \
done
check-am: all-am
check: check-am
check: check-recursive
all-am: Makefile
installdirs:
install: install-am
install-exec: install-exec-am
install-data: install-data-am
uninstall: uninstall-am
installdirs: installdirs-recursive
installdirs-am:
install: install-recursive
install-exec: install-exec-recursive
install-data: install-data-recursive
uninstall: uninstall-recursive
install-am: all-am
@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
installcheck: installcheck-am
installcheck: installcheck-recursive
install-strip:
if test -z '$(STRIP)'; then \
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
@ -447,84 +648,85 @@ distclean-generic:
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@echo "it deletes files that may require special tools to rebuild."
clean: clean-am
clean: clean-recursive
clean-am: clean-generic mostlyclean-am
distclean: distclean-am
distclean: distclean-recursive
-rm -f Makefile
distclean-am: clean-am distclean-generic
distclean-am: clean-am distclean-generic distclean-tags
dvi: dvi-am
dvi: dvi-recursive
dvi-am:
html: html-am
html: html-recursive
html-am:
info: info-am
info: info-recursive
info-am:
install-data-am:
install-dvi: install-dvi-am
install-dvi: install-dvi-recursive
install-dvi-am:
install-exec-am:
install-html: install-html-am
install-html: install-html-recursive
install-html-am:
install-info: install-info-am
install-info: install-info-recursive
install-info-am:
install-man:
install-pdf: install-pdf-am
install-pdf: install-pdf-recursive
install-pdf-am:
install-ps: install-ps-am
install-ps: install-ps-recursive
install-ps-am:
installcheck-am:
maintainer-clean: maintainer-clean-am
maintainer-clean: maintainer-clean-recursive
-rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
mostlyclean: mostlyclean-am
mostlyclean: mostlyclean-recursive
mostlyclean-am: mostlyclean-generic
pdf: pdf-am
pdf: pdf-recursive
pdf-am:
ps: ps-am
ps: ps-recursive
ps-am:
uninstall-am:
.MAKE: install-am install-strip
.MAKE: $(am__recursive_targets) install-am install-strip
.PHONY: all all-am check check-am clean clean-generic cscopelist-am \
ctags-am distclean distclean-generic distdir dvi dvi-am html \
html-am info info-am install install-am install-data \
.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \
check-am clean clean-generic cscopelist-am ctags ctags-am \
distclean distclean-generic distclean-tags distdir dvi dvi-am \
html html-am info info-am install install-am install-data \
install-data-am install-dvi install-dvi-am install-exec \
install-exec-am install-html install-html-am install-info \
install-info-am install-man install-pdf install-pdf-am \
install-ps install-ps-am install-strip installcheck \
installcheck-am installdirs maintainer-clean \
installcheck-am installdirs installdirs-am maintainer-clean \
maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
pdf-am ps ps-am tags-am uninstall uninstall-am
pdf-am ps ps-am tags tags-am uninstall uninstall-am
.PRECIOUS: Makefile

4
vice/build/mingw/frankenvice/Makefile.am Normal file
View File

@ -0,0 +1,4 @@
# vim: set et ts=8 sts=8 sw=8:
EXTRA_DIST = vice-rpm-to-deb.sh \
frankenvice-install.sh \
rpm-packages.txt

Some files were not shown because too many files have changed in this diff Show More