dmuratshin 9 years ago
parent
commit
e05e411525

+ 2 - 0
.gitignore

@@ -14,3 +14,5 @@ my_awesome_game/project/proj.emscripten/build_release/
 my_awesome_game/project/proj.emscripten/data.js
 my_awesome_game/project/proj.cmake/build_emsc/
 my_awesome_game/project/proj.cmake/build_emsc_release/
+my_awesome_game/project/proj.android/.gradle/
+my_awesome_game/project/proj.android/build/

+ 40 - 0
my_awesome_game/project/proj.android/build.gradle

@@ -0,0 +1,40 @@
+buildscript {
+    repositories {
+        mavenCentral()
+    }
+    dependencies {
+        classpath 'com.android.tools.build:gradle:1.0.+'
+    }
+}
+
+apply plugin: 'com.android.application'
+
+
+
+dependencies {
+    compile(project(':oxygine-extension'))
+    compile(project(':oxygine-lib')) { exclude module: 'oxygine-extension' }
+}
+
+android {
+    enforceUniquePackageName=false
+        
+    compileSdkVersion 23
+    buildToolsVersion '23.0.2'
+
+
+    sourceSets {
+        main {
+            jniLibs.srcDirs = ['libs']
+            manifest.srcFile 'AndroidManifest.xml'
+            java.srcDirs = ['src']
+            res.srcDirs = ['res']
+            assets.srcDirs = ['../data']
+        }
+    }
+
+    aaptOptions {
+        noCompress 'zip', 'ogg'
+        ignoreAssetsPattern "!*.dll:*.icf"
+    }
+}

+ 5 - 0
my_awesome_game/project/proj.android/settings.gradle

@@ -0,0 +1,5 @@
+include 'oxygine-lib'
+project(':oxygine-lib').projectDir = new File('../../..//oxygine-framework/oxygine/SDL/android/lib')
+
+include 'oxygine-extension'
+project(':oxygine-extension').projectDir = new File('../../..//oxygine-framework/oxygine/SDL/android/extension')

+ 1 - 1
oxygine-flow

@@ -1 +1 @@
-Subproject commit b71ccd07990f7d1953ec22e0ba24106b4c831beb
+Subproject commit 69a22c28b9b8abe12083c8ad2e5082fc26ca5491

+ 1 - 1
oxygine-framework

@@ -1 +1 @@
-Subproject commit 46ca7a2be948139b2d9896097834a51c9661b8ed
+Subproject commit 04e52616e83bd9cf89bd03a9a87c398ba6d974b4

+ 1 - 1
oxygine-sound

@@ -1 +1 @@
-Subproject commit 074734936e33a38b84e1e6cda2836d1fddaccc3c
+Subproject commit 7683ef2ebb346220b388ac87ce15e55e2b7e6178