android fix

.gitignore

@@ -3,3 +3,8 @@ examples/HelloFreeType/proj.win32/.vs/
 *.VC.db
 examples/HelloFreeType/proj.cmake/build_emsc_release/
 examples/HelloFreeType/proj.cmake/data.js
+examples/HelloFreeType/proj.android/obj/
+examples/HelloFreeType/proj.android/libs/
+examples/HelloFreeType/proj.android/bin/
+examples/HelloFreeType/proj.android/gen/org/oxygine/HelloFreeType/R.java
+examples/HelloFreeType/proj.android/gen/

examples/HelloFreeType/proj.android/AndroidManifest.xml

@@ -25,7 +25,7 @@
     </application>
 
     <!-- Android 2.3.3 -->
-    <uses-sdk android:minSdkVersion="10" android:targetSdkVersion="12" />
+    <uses-sdk android:minSdkVersion="10" android:targetSdkVersion="16" />
 
     <!-- OpenGL ES 2.0 -->
     <uses-feature android:glEsVersion="0x00020000" /> 

examples/HelloFreeType/proj.android/default.properties

@@ -8,4 +8,4 @@
 # project structure.
 
 # Project target.
-target=android-12
+target=android-16

examples/HelloFreeType/proj.android/jni/src/Android.mk

@@ -6,10 +6,10 @@ 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/entry_point.cpp ../../../src/example.cpp 
+LOCAL_SRC_FILES += ../../../src/main.cpp ../../../src/example.cpp 
 
 
-LOCAL_STATIC_LIBRARIES := oxygine-framework_static
+LOCAL_STATIC_LIBRARIES := oxygine-framework_static oxygine-freetype_static freetype2_static
 LOCAL_SHARED_LIBRARIES := SDL2
 
 include $(BUILD_SHARED_LIBRARY)
@@ -17,3 +17,4 @@ include $(BUILD_SHARED_LIBRARY)
 
 #import from NDK_MODULE_PATH defined in build.cmd
 $(call import-module, oxygine-framework)
+$(call import-module, oxygine-freetype)

examples/HelloFreeType/proj.android/project.properties

@@ -11,5 +11,5 @@
 #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
 
 # Project target.
-target=android-12
+target=android-16
 android.library.reference.1=../../../..//oxygine-framework/oxygine/SDL/android/lib