Mahtan/wagic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'android_build_fix' into android-travis-ci

Browse Source
This commit is contained in:
xawotihs
2013-11-25 21:23:58 +01:00
parent 9889186eab 8aa0b8cea0
commit 7aaebdc661
3 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
projects/mtg/Android/.gitignore
+1
View File
@@ -1,2 +1,3 @@
/gen /gen
/bin
projects/mtg/Android/AndroidManifest.xml
+1 -1
View File
@@ -14,5 +14,5 @@
<activity android:configChanges="keyboard|keyboardHidden|orientation" android:name="com.google.ads.AdActivity" android:screenOrientation="sensorLandscape"/> <activity android:configChanges="keyboard|keyboardHidden|orientation" android:name="com.google.ads.AdActivity" android:screenOrientation="sensorLandscape"/>
</application> </application>
<uses-sdk android:minSdkVersion="9" android:targetSdkVersion="9"/> <uses-sdk android:minSdkVersion="10" android:targetSdkVersion="10"/>
</manifest> </manifest>
projects/mtg/Android/jni/Android.mk
-1
View File
@@ -41,7 +41,6 @@ LOCAL_SRC_FILES := $(SDL_PATH)/src/main/android/SDL_android_main.cpp \
$(MTG_PATH)/src/AllAbilities.cpp \ $(MTG_PATH)/src/AllAbilities.cpp \
$(MTG_PATH)/src/CardDescriptor.cpp \ $(MTG_PATH)/src/CardDescriptor.cpp \
$(MTG_PATH)/src/CardDisplay.cpp \ $(MTG_PATH)/src/CardDisplay.cpp \
$(MTG_PATH)/src/CardEffect.cpp \
$(MTG_PATH)/src/CardGui.cpp \ $(MTG_PATH)/src/CardGui.cpp \
$(MTG_PATH)/src/CardPrimitive.cpp \ $(MTG_PATH)/src/CardPrimitive.cpp \
$(MTG_PATH)/src/CardSelector.cpp \ $(MTG_PATH)/src/CardSelector.cpp \