mirror of
https://github.com/mauiaaron/apple2.git
synced 2024-06-01 13:41:28 +00:00
Debugger and other meta code is now part of core emulator build
This commit is contained in:
Aaron Culliney
parent
153f1434db
commit
1716dd35be
79
Makefile.am
79
Makefile.am
|
|
@ -46,24 +46,39 @@ AUDIO_SRC = \
|
|||
src/audio/soundcore.c src/audio/soundcore-openal.c src/audio/speaker.c \
|
||||
src/audio/playqueue.c src/audio/alhelpers.c src/audio/mockingboard.c \
|
||||
src/audio/AY8910.c
|
||||
|
||||
META_SRC = \
|
||||
src/meta/debug.l src/meta/debugger.c src/meta/opcodes.c src/test/sha1.c \
|
||||
src/meta/lintrace.c
|
||||
|
||||
|
||||
# NOTE : selectively enabled through configuration process ...
|
||||
EXTRA_apple2ix_SOURCES = $(ASM_SRC_x86) $(VIDEO_SRC) $(AUDIO_SRC) $(META_SRC)
|
||||
EXTRA_apple2ix_SOURCES = $(ASM_SRC_x86) $(VIDEO_SRC) $(AUDIO_SRC)
|
||||
|
||||
apple2ix_SOURCES = src/font.c src/rom.c src/misc.c src/display.c src/vm.c \
|
||||
src/timing.c src/zlib-helpers.c src/joystick.c src/keys.c src/prefs.c \
|
||||
src/interface.c src/disk.c src/cpu-supp.c src/json_parse.c src/memmngt.c \
|
||||
externals/jsmn/jsmn.c
|
||||
apple2ix_SOURCES = \
|
||||
externals/jsmn/jsmn.c \
|
||||
src/cpu-supp.c \
|
||||
src/disk.c \
|
||||
src/display.c \
|
||||
src/font.c \
|
||||
src/interface.c \
|
||||
src/joystick.c \
|
||||
src/json_parse.c \
|
||||
src/keys.c \
|
||||
src/memmngt.c \
|
||||
src/meta/debug.l \
|
||||
src/meta/debugger.c \
|
||||
src/meta/opcodes.c \
|
||||
src/meta/lintrace.c \
|
||||
src/misc.c \
|
||||
src/prefs.c \
|
||||
src/rom.c \
|
||||
src/test/sha1.c \
|
||||
src/timing.c \
|
||||
src/vm.c \
|
||||
src/zlib-helpers.c
|
||||
|
||||
apple2ix_CFLAGS = @AM_CFLAGS@ @X_CFLAGS@
|
||||
apple2ix_CCASFLAGS = $(apple2ix_CFLAGS)
|
||||
apple2ix_LDFLAGS = -Wl,-z,noexecstack
|
||||
apple2ix_LDADD = @ASM_O@ @VIDEO_O@ @AUDIO_O@ @META_O@ @X_LIBS@
|
||||
apple2ix_DEPENDENCIES = @ASM_O@ @VIDEO_O@ @AUDIO_O@ @META_O@
|
||||
apple2ix_LDADD = @ASM_O@ @VIDEO_O@ @AUDIO_O@ @X_LIBS@
|
||||
apple2ix_DEPENDENCIES = @ASM_O@ @VIDEO_O@ @AUDIO_O@
|
||||
|
||||
genfont_SOURCES = src/genfont.c
|
||||
|
||||
|
|
@ -95,9 +110,9 @@ testcpu_SOURCES = src/test/testcpu.c $(A2_TEST_SOURCES)
|
|||
testcpu_CFLAGS = $(A2_TEST_CFLAGS) -DTEST_CPU=1
|
||||
testcpu_CCASFLAGS = $(testcpu_CFLAGS)
|
||||
testcpu_LDFLAGS = $(apple2ix_LDFLAGS)
|
||||
testcpu_LDADD = @testcpu_ASM_O@ @testcpu_VIDEO_O@ @testcpu_AUDIO_O@ @testcpu_META_O@ @X_LIBS@
|
||||
testcpu_DEPENDENCIES = @testcpu_ASM_O@ @testcpu_VIDEO_O@ @testcpu_AUDIO_O@ @testcpu_META_O@
|
||||
EXTRA_testcpu_SOURCES = $(ASM_SRC_x86) $(VIDEO_SRC) $(AUDIO_SRC) $(META_SRC)
|
||||
testcpu_LDADD = @testcpu_ASM_O@ @testcpu_VIDEO_O@ @testcpu_AUDIO_O@ @X_LIBS@
|
||||
testcpu_DEPENDENCIES = @testcpu_ASM_O@ @testcpu_VIDEO_O@ @testcpu_AUDIO_O@
|
||||
EXTRA_testcpu_SOURCES = $(ASM_SRC_x86) $(VIDEO_SRC) $(AUDIO_SRC)
|
||||
|
||||
#######################################
|
||||
|
||||
|
|
@ -105,9 +120,9 @@ testdisk_SOURCES = src/test/testdisk.c $(A2_TEST_SOURCES)
|
|||
testdisk_CFLAGS = $(A2_TEST_CFLAGS) -DTEST_DISK=1 -DDISK_TRACING=1
|
||||
testdisk_CCASFLAGS = $(testdisk_CFLAGS)
|
||||
testdisk_LDFLAGS = $(apple2ix_LDFLAGS)
|
||||
testdisk_LDADD = @testdisk_ASM_O@ @testdisk_VIDEO_O@ @testdisk_AUDIO_O@ @testdisk_META_O@ @X_LIBS@
|
||||
testdisk_DEPENDENCIES = @testdisk_ASM_O@ @testdisk_VIDEO_O@ @testdisk_AUDIO_O@ @testdisk_META_O@
|
||||
EXTRA_testdisk_SOURCES = $(ASM_SRC_x86) $(VIDEO_SRC) $(AUDIO_SRC) $(META_SRC)
|
||||
testdisk_LDADD = @testdisk_ASM_O@ @testdisk_VIDEO_O@ @testdisk_AUDIO_O@ @X_LIBS@
|
||||
testdisk_DEPENDENCIES = @testdisk_ASM_O@ @testdisk_VIDEO_O@ @testdisk_AUDIO_O@
|
||||
EXTRA_testdisk_SOURCES = $(ASM_SRC_x86) $(VIDEO_SRC) $(AUDIO_SRC)
|
||||
|
||||
#######################################
|
||||
|
||||
|
|
@ -115,9 +130,9 @@ testdisplay_SOURCES = src/test/testdisplay.c $(A2_TEST_SOURCES)
|
|||
testdisplay_CFLAGS = $(A2_TEST_CFLAGS) -DTEST_DISPLAY=1
|
||||
testdisplay_CCASFLAGS = $(testdisplay_CFLAGS)
|
||||
testdisplay_LDFLAGS = $(apple2ix_LDFLAGS)
|
||||
testdisplay_LDADD = @testdisplay_ASM_O@ @testdisplay_VIDEO_O@ @testdisplay_AUDIO_O@ @testdisplay_META_O@ @X_LIBS@
|
||||
testdisplay_DEPENDENCIES = @testdisplay_ASM_O@ @testdisplay_VIDEO_O@ @testdisplay_AUDIO_O@ @testdisplay_META_O@
|
||||
EXTRA_testdisplay_SOURCES = $(ASM_SRC_x86) $(VIDEO_SRC) $(AUDIO_SRC) $(META_SRC)
|
||||
testdisplay_LDADD = @testdisplay_ASM_O@ @testdisplay_VIDEO_O@ @testdisplay_AUDIO_O@ @X_LIBS@
|
||||
testdisplay_DEPENDENCIES = @testdisplay_ASM_O@ @testdisplay_VIDEO_O@ @testdisplay_AUDIO_O@
|
||||
EXTRA_testdisplay_SOURCES = $(ASM_SRC_x86) $(VIDEO_SRC) $(AUDIO_SRC)
|
||||
|
||||
#######################################
|
||||
|
||||
|
|
@ -125,9 +140,9 @@ testprefs_SOURCES = src/test/testprefs.c $(A2_TEST_SOURCES)
|
|||
testprefs_CFLAGS = $(A2_TEST_CFLAGS) -DTEST_PREFS=1
|
||||
testprefs_CCASFLAGS = $(testprefs_CFLAGS)
|
||||
testprefs_LDFLAGS = $(apple2ix_LDFLAGS)
|
||||
testprefs_LDADD = @testprefs_ASM_O@ @testprefs_VIDEO_O@ @testprefs_AUDIO_O@ @testprefs_META_O@ @X_LIBS@
|
||||
testprefs_DEPENDENCIES = @testprefs_ASM_O@ @testprefs_VIDEO_O@ @testprefs_AUDIO_O@ @testprefs_META_O@
|
||||
EXTRA_testprefs_SOURCES = $(ASM_SRC_x86) $(VIDEO_SRC) $(AUDIO_SRC) $(META_SRC)
|
||||
testprefs_LDADD = @testprefs_ASM_O@ @testprefs_VIDEO_O@ @testprefs_AUDIO_O@ @X_LIBS@
|
||||
testprefs_DEPENDENCIES = @testprefs_ASM_O@ @testprefs_VIDEO_O@ @testprefs_AUDIO_O@
|
||||
EXTRA_testprefs_SOURCES = $(ASM_SRC_x86) $(VIDEO_SRC) $(AUDIO_SRC)
|
||||
|
||||
#######################################
|
||||
|
||||
|
|
@ -135,9 +150,9 @@ testtrace_SOURCES = src/test/testtrace.c $(A2_TEST_SOURCES)
|
|||
testtrace_CFLAGS = $(A2_TEST_CFLAGS) -DTEST_TRACE=1 -DCPU_TRACING=1 -DDISK_TRACING=1 -DVM_TRACING=1 -DSPEAKER_TRACING=1 -DMB_TRACING=1
|
||||
testtrace_CCASFLAGS = $(testtrace_CFLAGS)
|
||||
testtrace_LDFLAGS = $(apple2ix_LDFLAGS)
|
||||
testtrace_LDADD = @testtrace_ASM_O@ @testtrace_VIDEO_O@ @testtrace_AUDIO_O@ @testtrace_META_O@ @X_LIBS@
|
||||
testtrace_DEPENDENCIES = @testtrace_ASM_O@ @testtrace_VIDEO_O@ @testtrace_AUDIO_O@ @testtrace_META_O@
|
||||
EXTRA_testtrace_SOURCES = $(ASM_SRC_x86) $(VIDEO_SRC) $(AUDIO_SRC) $(META_SRC)
|
||||
testtrace_LDADD = @testtrace_ASM_O@ @testtrace_VIDEO_O@ @testtrace_AUDIO_O@ @X_LIBS@
|
||||
testtrace_DEPENDENCIES = @testtrace_ASM_O@ @testtrace_VIDEO_O@ @testtrace_AUDIO_O@
|
||||
EXTRA_testtrace_SOURCES = $(ASM_SRC_x86) $(VIDEO_SRC) $(AUDIO_SRC)
|
||||
|
||||
#######################################
|
||||
|
||||
|
|
@ -145,9 +160,9 @@ testui_SOURCES = src/test/testui.c $(A2_TEST_SOURCES)
|
|||
testui_CFLAGS = $(A2_TEST_CFLAGS) -DTEST_UI=1
|
||||
testui_CCASFLAGS = $(testui_CFLAGS)
|
||||
testui_LDFLAGS = $(apple2ix_LDFLAGS)
|
||||
testui_LDADD = @testui_ASM_O@ @testui_VIDEO_O@ @testui_AUDIO_O@ @testui_META_O@ @X_LIBS@
|
||||
testui_DEPENDENCIES = @testui_ASM_O@ @testui_VIDEO_O@ @testui_AUDIO_O@ @testui_META_O@
|
||||
EXTRA_testui_SOURCES = $(ASM_SRC_x86) $(VIDEO_SRC) $(AUDIO_SRC) $(META_SRC)
|
||||
testui_LDADD = @testui_ASM_O@ @testui_VIDEO_O@ @testui_AUDIO_O@ @X_LIBS@
|
||||
testui_DEPENDENCIES = @testui_ASM_O@ @testui_VIDEO_O@ @testui_AUDIO_O@
|
||||
EXTRA_testui_SOURCES = $(ASM_SRC_x86) $(VIDEO_SRC) $(AUDIO_SRC)
|
||||
|
||||
#######################################
|
||||
|
||||
|
|
@ -155,9 +170,9 @@ testvm_SOURCES = src/test/testvm.c $(A2_TEST_SOURCES)
|
|||
testvm_CFLAGS = $(A2_TEST_CFLAGS) -DTEST_VM=1
|
||||
testvm_CCASFLAGS = $(testvm_CFLAGS)
|
||||
testvm_LDFLAGS = $(apple2ix_LDFLAGS)
|
||||
testvm_LDADD = @testvm_ASM_O@ @testvm_VIDEO_O@ @testvm_AUDIO_O@ @testvm_META_O@ @X_LIBS@
|
||||
testvm_DEPENDENCIES = @testvm_ASM_O@ @testvm_VIDEO_O@ @testvm_AUDIO_O@ @testvm_META_O@
|
||||
EXTRA_testvm_SOURCES = $(ASM_SRC_x86) $(VIDEO_SRC) $(AUDIO_SRC) $(META_SRC)
|
||||
testvm_LDADD = @testvm_ASM_O@ @testvm_VIDEO_O@ @testvm_AUDIO_O@ @X_LIBS@
|
||||
testvm_DEPENDENCIES = @testvm_ASM_O@ @testvm_VIDEO_O@ @testvm_AUDIO_O@
|
||||
EXTRA_testvm_SOURCES = $(ASM_SRC_x86) $(VIDEO_SRC) $(AUDIO_SRC)
|
||||
|
||||
###############################################################################
|
||||
# Misc & Installation
|
||||
|
|
|
|||
26
configure.ac
26
configure.ac
|
|
@ -327,37 +327,15 @@ AC_SUBST(testui_AUDIO_O)
|
|||
AC_SUBST(testvm_AUDIO_O)
|
||||
|
||||
|
||||
dnl ---------------------------------------------------------------------------
|
||||
dnl Debugger & classic interface ...
|
||||
AC_ARG_ENABLE([debugger], AS_HELP_STRING([--disable-debugger], [Disable 6502 debugging console]), [], [
|
||||
META_O="src/meta/debug.o src/meta/debugger.o src/meta/opcodes.o src/test/sha1.o"
|
||||
dnl HACK there's gotta be a better way ... without this verbosity, CFLAGS are not correct (lacking -DTESTING=1 , etc) if we don't specify specific obj files for test binaries
|
||||
testcpu_META_O="src/meta/testcpu-debug.o src/meta/testcpu-debugger.o src/meta/testcpu-opcodes.o src/test/testcpu-sha1.o"
|
||||
testdisk_META_O="src/meta/testdisk-debug.o src/meta/testdisk-debugger.o src/meta/testdisk-opcodes.o src/test/testdisk-sha1.o"
|
||||
testdisplay_META_O="src/meta/testdisplay-debug.o src/meta/testdisplay-debugger.o src/meta/testdisplay-opcodes.o src/test/testdisplay-sha1.o"
|
||||
testprefs_META_O="src/meta/testprefs-debug.o src/meta/testprefs-debugger.o src/meta/testprefs-opcodes.o src/test/testprefs-sha1.o"
|
||||
testtrace_META_O="src/meta/testtrace-debug.o src/meta/testtrace-debugger.o src/meta/testtrace-opcodes.o src/test/testtrace-sha1.o"
|
||||
testui_META_O="src/meta/testui-debug.o src/meta/testui-debugger.o src/meta/testui-opcodes.o src/test/testui-sha1.o"
|
||||
testvm_META_O="src/meta/testvm-debug.o src/meta/testvm-debugger.o src/meta/testvm-opcodes.o src/test/testvm-sha1.o"
|
||||
])
|
||||
AC_SUBST(META_O)
|
||||
AC_SUBST(testcpu_META_O)
|
||||
AC_SUBST(testdisk_META_O)
|
||||
AC_SUBST(testdisplay_META_O)
|
||||
AC_SUBST(testprefs_META_O)
|
||||
AC_SUBST(testtrace_META_O)
|
||||
AC_SUBST(testui_META_O)
|
||||
AC_SUBST(testvm_META_O)
|
||||
|
||||
AC_DEFINE(INTERFACE_CLASSIC, 1, [Use the classic menu interface])
|
||||
|
||||
dnl ---------------------------------------------------------------------------
|
||||
dnl Misc ...
|
||||
|
||||
AC_DEFINE(APPLE2IX, 1, [Denotes a section of code as Apple//ix sourced, used with external sources])
|
||||
AC_DEFINE(INTERFACE_CLASSIC, 1, [Use the classic menu interface])
|
||||
AC_DEFINE(KEYPAD_JOYSTICK, 1, [Joystick emulated on keyboard ... should not be true on mobile devices])
|
||||
AC_DEFINE(CONFORMANT_TRACKS, 1, [Conformant to Applewin, and apparently also to the original //e disk timing, but hella-slow on low-end mobile devices])
|
||||
|
||||
|
||||
dnl ---------------------------------------------------------------------------
|
||||
|
||||
AC_CONFIG_FILES([Makefile])
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user