From 2075ff082ad5f3045f81ff23d380833cba4a1cc2 Mon Sep 17 00:00:00 2001
From: Christian Speckner <christian.speckner@mayflower.de>
Date: Sun, 30 Oct 2016 21:00:08 +0100
Subject: [PATCH] Prepare build system for new core.

---
 .vscode/settings.json                 |  3 ++-
 configure                             | 26 +++++++++++++++++++++++---
 src/emucore/tia/core_6502ts/module.mk |  9 +++++++++
 3 files changed, 34 insertions(+), 4 deletions(-)
 create mode 100644 src/emucore/tia/core_6502ts/module.mk

diff --git a/.vscode/settings.json b/.vscode/settings.json
index 6cd07c62c..0a5f45bae 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -4,7 +4,8 @@
             "-std=c++11",
             "-I/home/cnspeckn/git/stella/src/common",
             "-I/home/cnspeckn/git/stella/src/emucore",
-            "-I/home/cnspeckn/git/stella/src/emucore/tia/default_core"
+            "-I/home/cnspeckn/git/stella/src/emucore/tia/default_core",
+            "-I/home/cnspeckn/git/stella/src/emucore/tia/6502ts_core"
         ],
         "editor.tabSize": 2,
         "files.trimTrailingWhitespace": false,
diff --git a/configure b/configure
index 53bc1317e..ddf99d4c3 100755
--- a/configure
+++ b/configure
@@ -20,12 +20,13 @@ _zlib=auto
 # default option behaviour yes/no
 _build_windowed=yes
 _build_sound=yes
-_build_debugger=yes
+_build_debugger=false
 _build_joystick=yes
 _build_cheats=yes
 _build_thumb=yes
 _build_static=no
 _build_profile=no
+_build_6502ts_tia=yes
 
 # more defaults
 _ranlib=ranlib
@@ -193,8 +194,10 @@ Installation directories:
 Optional Features:
   --enable-sound         enable/disable sound support [enabled]
   --disable-sound
-  --enable-debugger      enable/disable all debugger options [enabled]
+  --enable-debugger      enable/disable all debugger options [disabled]
   --disable-debugger
+  --enable-6502ts-tia    enable/disable support for 6502.ts TIA core [enabled]
+  --disable-6502ts-tia
   --enable-joystick      enable/disable joystick support [enabled]
   --disable-joystick
   --enable-cheats        enable/disable cheatcode support [enabled]
@@ -235,6 +238,8 @@ for ac_option in $@; do
       --disable-sound)          _build_sound=no      ;;
       --enable-debugger)        _build_debugger=yes  ;;
       --disable-debugger)       _build_debugger=no   ;;
+			--enable-6502ts-tia)   	  _build_6502ts_tia=yes;;
+			--disable-6502ts-tia)     _build_6502ts_tia=no ;;
       --enable-joystick)        _build_joystick=yes  ;;
       --disable-joystick)       _build_joystick=no   ;;
       --enable-cheats)          _build_cheats=yes    ;;
@@ -615,7 +620,15 @@ else
 	echo
 fi
 
-if test "$_build_joystick" = yes ; then
+if test "$_build_6502ts_tia" = "yes" ; then
+	echo_n "   Support for 6502.ts TIA core enabled"
+	echo
+else
+	echo_n "   Support for 6502.ts TIA core disabled"
+	echo
+fi
+
+if test "$_build_6502ts_tia" = yes ; then
 	echo_n "   Joystick support enabled"
 	echo
 else
@@ -677,6 +690,7 @@ COMMON="$SRC/common"
 TV="$SRC/common/tv_filters"
 GUI="$SRC/gui"
 DBG="$SRC/debugger"
+TIA_6502TS="$SRC/emucore/tia/core_6502ts"
 DBGGUI="$SRC/debugger/gui"
 YACC="$SRC/yacc"
 CHEAT="$SRC/cheat"
@@ -741,6 +755,12 @@ if test "$_build_debugger" = yes ; then
 	INCLUDES="$INCLUDES -I$DBG -I$DBGGUI -I$YACC"
 fi
 
+if test "$_build_6502ts_tia" = yes ; then
+  DEFINES="$DEFINES -DSUPPORT_6502TS_TIA"
+	MODULES="$MODULES $TIA_6502TS"
+	INCLUDES="$INCLUDES -I$TIA_6502TS"
+fi
+
 if test "$_build_joystick" = yes ; then
 	DEFINES="$DEFINES -DJOYSTICK_SUPPORT"
 fi
diff --git a/src/emucore/tia/core_6502ts/module.mk b/src/emucore/tia/core_6502ts/module.mk
new file mode 100644
index 000000000..ef3bdc12c
--- /dev/null
+++ b/src/emucore/tia/core_6502ts/module.mk
@@ -0,0 +1,9 @@
+MODULE := src/emucore/tia/core_6502ts
+
+MODULE_OBJS :=
+
+MODULE_DIRS += \
+	src/emucore/tia/core_6502ts
+
+# Include common rules 
+include $(srcdir)/common.rules