Added initial emulator configuration window, cleanup of settings code.

[apple2] / Makefile

diff --git a/Makefile b/Makefile
index ac00d109507ef137c96716e7ed4301bb67752af2..819bcc9be91c56f9d642aa0aac1bc394ac0d10da 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -101,6 +101,7 @@ LIBS = $(SDL_LIBS) -lstdc++ -lz -lm $(GLLIB) -pg
 INCS = -I. -I./src
 
 OBJS = \
+       obj/config.o          \
        obj/diskselector.o    \
        obj/font10pt.o        \
        obj/font12pt.o        \
@@ -122,7 +123,6 @@ OBJS = \
        obj/log.o             \
        obj/mmu.o             \
        obj/mockingboard.o    \
-       obj/sdlemu_config.o   \
        obj/settings.o        \
        obj/sound.o           \
        obj/timing.o          \