From b9b58bd0a51a61b4ed39bc2b512c6fbdd4a563ca Mon Sep 17 00:00:00 2001
From: Eric House <eehouse@trand>
Date: Fri, 29 Jun 2012 06:52:49 -0700
Subject: [PATCH] enable tray tap undo

---
 xwords4/android/XWords4/jni/Android.mk | 2 +-
 xwords4/linux/Makefile                 | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/xwords4/android/XWords4/jni/Android.mk b/xwords4/android/XWords4/jni/Android.mk
index d4a1d5af1..bd7805855 100644
--- a/xwords4/android/XWords4/jni/Android.mk
+++ b/xwords4/android/XWords4/jni/Android.mk
@@ -23,7 +23,7 @@ local_DEFINES += \
 	-DPOINTER_SUPPORT \
 	-DSCROLL_DRAG_THRESHHOLD=1 \
 	-DDROP_BITMAPS \
-	-DDISABLE_EMPTYTRAY_UNDO \
+	-DXWFEATURE_TRAYUNDO_ONE \
 	-DDISABLE_TILE_SEL \
 	-DXWFEATURE_BOARDWORDS \
 	-DXWFEATURE_WALKDICT \
diff --git a/xwords4/linux/Makefile b/xwords4/linux/Makefile
index b33292566..7d0291762 100644
--- a/xwords4/linux/Makefile
+++ b/xwords4/linux/Makefile
@@ -96,6 +96,9 @@ DEFINES += -DXWFEATURE_WALKDICT_FILTER
 DEFINES += -DXWFEATURE_DICTSANITY
 DEFINES += -DHASH_STREAM 
 #DEFINES += -DXWFEATURE_SCOREONEPASS
+### Enable zero or one of these two ###
+#DEFINES += -DXWFEATURE_TRAYUNDO_ALL
+DEFINES += -DXWFEATURE_TRAYUNDO_ONE
 
 # MAX_ROWS controls STREAM_VERS_BIGBOARD and with it move hashing
 DEFINES += -DMAX_ROWS=32