Browse Source

latest android

dm 7 years ago
parent
commit
8adf26bf96

+ 3 - 0
.gitignore

@@ -18,3 +18,6 @@ examples/HelloFreeType/proj.android/.gradle/
 examples/HelloFreeType/data/*.dll
 examples/HelloFreeType/proj.cmake/build/
 **/.externalNativeBuild
+examples/HelloFreeType/proj.android/local.properties
+examples/HelloFreeType/proj.android/proj.android.iml
+examples/HelloFreeType/proj.android/.idea/

+ 0 - 1
examples/HelloFreeType/proj.android/AndroidManifest.xml

@@ -25,7 +25,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)-->

+ 17 - 5
examples/HelloFreeType/proj.android/build.gradle

@@ -1,15 +1,23 @@
 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()
     }
 }
 
+
 apply plugin: 'com.android.application'
 
 
@@ -21,7 +29,7 @@ dependencies {
 
 android {
         
-    compileSdkVersion 23
+    compileSdkVersion 26
 
 
     sourceSets {
@@ -35,6 +43,10 @@ android {
     }
 
     defaultConfig {
+
+        minSdkVersion 19
+        targetSdkVersion 26
+        
         ndk {
             abiFilters 'armeabi-v7a'//, 'arm64-v8a'
         }

+ 2 - 2
examples/HelloFreeType/proj.android/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Wed Nov 01 12:35:02 YEKT 2017
+#Thu Sep 27 01:04:08 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
examples/HelloFreeType/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
examples/HelloFreeType/proj.android/jni/src/Android.mk

@@ -6,7 +6,7 @@ LOCAL_MODULE := main
 #SDK_ROOT points to folder with SDL and oxygine-framework
 LOCAL_SRC_FILES := ../../../../../..//SDL/src/main/android/SDL_android_main.c
 
-LOCAL_SRC_FILES += ../../../src/main.cpp ../../../src/example.cpp 
+LOCAL_SRC_FILES += ../../../src/main.cpp ../../../src/example.cpp  ../../../src/test.cpp 
 
 
 LOCAL_STATIC_LIBRARIES := oxygine-framework_static oxygine-freetype_static freetype2_static