From fac44c4b48361b8f63f21e8fcb8f3dfa57d41106 Mon Sep 17 00:00:00 2001 From: Rolzad73 Date: Mon, 25 Nov 2013 11:53:34 -0500 Subject: [PATCH] - updated AndroidManifest.xml to match desired API values. - removed CardEffect.cpp reference from Android.mk build file. - added sdk.buildtools=18.1.1 line to default.properties and project.properties - updated .gitignore --- projects/mtg/Android/.gitignore | 1 + projects/mtg/Android/AndroidManifest.xml | 2 +- projects/mtg/Android/default.properties | 4 ++++ projects/mtg/Android/jni/Android.mk | 1 - projects/mtg/Android/project.properties | 4 ++++ 5 files changed, 10 insertions(+), 2 deletions(-) diff --git a/projects/mtg/Android/.gitignore b/projects/mtg/Android/.gitignore index b2b2f4c62..5a9b113aa 100644 --- a/projects/mtg/Android/.gitignore +++ b/projects/mtg/Android/.gitignore @@ -1,2 +1,3 @@ /gen +/bin diff --git a/projects/mtg/Android/AndroidManifest.xml b/projects/mtg/Android/AndroidManifest.xml index 0ed014758..8fd0e2815 100644 --- a/projects/mtg/Android/AndroidManifest.xml +++ b/projects/mtg/Android/AndroidManifest.xml @@ -14,5 +14,5 @@ - + diff --git a/projects/mtg/Android/default.properties b/projects/mtg/Android/default.properties index 8010039f3..3f05ff78e 100644 --- a/projects/mtg/Android/default.properties +++ b/projects/mtg/Android/default.properties @@ -9,3 +9,7 @@ # Project target. target=android-10 + +# Project build tools version +sdk.buildtools=18.1.1 + diff --git a/projects/mtg/Android/jni/Android.mk b/projects/mtg/Android/jni/Android.mk index da01c8a6d..faa1067b3 100644 --- a/projects/mtg/Android/jni/Android.mk +++ b/projects/mtg/Android/jni/Android.mk @@ -41,7 +41,6 @@ LOCAL_SRC_FILES := $(SDL_PATH)/src/main/android/SDL_android_main.cpp \ $(MTG_PATH)/src/AllAbilities.cpp \ $(MTG_PATH)/src/CardDescriptor.cpp \ $(MTG_PATH)/src/CardDisplay.cpp \ - $(MTG_PATH)/src/CardEffect.cpp \ $(MTG_PATH)/src/CardGui.cpp \ $(MTG_PATH)/src/CardPrimitive.cpp \ $(MTG_PATH)/src/CardSelector.cpp \ diff --git a/projects/mtg/Android/project.properties b/projects/mtg/Android/project.properties index b7c2081d5..15f4d07e4 100644 --- a/projects/mtg/Android/project.properties +++ b/projects/mtg/Android/project.properties @@ -12,3 +12,7 @@ # Project target. target=android-10 + +# Build tools version +sdk.buildtools=18.1.1 +