瀏覽代碼

latest oxygine

dm 7 年之前
父節點
當前提交
549eec4841

+ 3 - 0
.gitignore

@@ -29,3 +29,6 @@ my_awesome_game/project/Debug_v141/
 my_awesome_game/project/proj.win32/MyAwesomeGame.VC.VC.opendb
 my_awesome_game/project/proj.android/.externalNativeBuild/
 /.idea
+my_awesome_game/project/proj.android/.idea/
+my_awesome_game/project/proj.android/proj.android.iml
+my_awesome_game/project/proj.android/local.properties

+ 0 - 2
my_awesome_game/project/proj.android/AndroidManifest.xml

@@ -24,8 +24,6 @@
         </activity>
     </application>
 
-    <uses-sdk android:minSdkVersion="10" android:targetSdkVersion="16" />
-
     <uses-permission android:name="android.permission.INTERNET" /> <!--used for http requests-->    
     <uses-permission android:name="android.permission.WAKE_LOCK" /><!--used for http requests (downloading files)-->
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/><!--used for Proxy detection, could be disabled-->  

+ 16 - 5
my_awesome_game/project/proj.android/build.gradle

@@ -1,12 +1,19 @@
 buildscript {
     repositories {
-        mavenLocal()
-        mavenCentral()
-        jcenter()
         google()
+        mavenLocal()        
+        mavenCentral()
+        jcenter()        
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.1'
+        classpath 'com.android.tools.build:gradle:3.2.0'
+    }
+}
+
+allprojects {
+    repositories {
+        google()
+        jcenter()
     }
 }
 
@@ -21,7 +28,7 @@ dependencies {
 
 android {
         
-    compileSdkVersion 23
+    compileSdkVersion 26
 
 
     sourceSets {
@@ -35,6 +42,10 @@ android {
     }
 
     defaultConfig {
+
+        minSdkVersion 19
+        targetSdkVersion 26
+        
         ndk {
             abiFilters 'armeabi-v7a'//, 'arm64-v8a'
         }

+ 2 - 2
my_awesome_game/project/proj.android/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Wed Nov 01 12:35:02 YEKT 2017
+#Thu Sep 27 02:08:43 YEKT 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip

+ 1 - 1
my_awesome_game/project/proj.android/jni/Application.mk

@@ -1,4 +1,4 @@
-APP_STL := gnustl_static
+APP_STL := c++_static
 APP_CPPFLAGS += -fexceptions
 APP_CPPFLAGS += -frtti
 APP_CPPFLAGS += -std=c++11

+ 1 - 1
oxygine-flow

@@ -1 +1 @@
-Subproject commit 0646cfb5185bbc2fef62caafea06ad6c434bf724
+Subproject commit dbf71b57891722f03dde76507daa71e8b15df319

+ 1 - 1
oxygine-framework

@@ -1 +1 @@
-Subproject commit 6e27dd3365ee05f22edc1267187333899563c998
+Subproject commit b39981460ed11ce6b393c5b405901f14e1a276e2

+ 1 - 1
oxygine-freetype

@@ -1 +1 @@
-Subproject commit 46adf77132b90e0627c69597f90c097420a9f739
+Subproject commit e758cdfaba597828a785c67eb99571928d1d33fc

+ 1 - 1
oxygine-sound

@@ -1 +1 @@
-Subproject commit 60ada87ff52f1b92bdce4b2da11b091a0ea18b28
+Subproject commit d375f86069f32d3b993a6186decb5d14fe4d0c2e