Merge branch 'master' into wp8

2013-12-08 14:17:42 +01:00
parent f550784973 89fb76a8e7
commit 3af4546ef7
59 changed files with 2368 additions and 1486 deletions
--- a/projects/mtg/Android/jni/Android.mk
+++ b/projects/mtg/Android/jni/Android.mk
@@ -136,6 +136,9 @@ LOCAL_SRC_FILES := $(SDL_PATH)/src/main/android/SDL_android_main.cpp \
        $(MTG_PATH)/src/WFont.cpp \
        $(MTG_PATH)/src/WGui.cpp \
        $(MTG_PATH)/src/WResourceManager.cpp \
+        $(MTG_PATH)/src/DeckView.cpp \
+        $(MTG_PATH)/src/CarouselDeckView.cpp \
+        $(MTG_PATH)/src/GridDeckView.cpp \
        $(JGE_PATH)/src/SDLmain.cpp \
        $(JGE_PATH)/src/corewrapper.cpp \
        $(JGE_PATH)/src/Encoding.cpp \