android support

.gitignore

@@ -6,3 +6,6 @@ export/2/
 export/temp/
 *.pyc
 examples/HelloViewerAE/data/viewer.log
+examples/HelloViewerAE/proj.android/.gradle/
+examples/HelloViewerAE/proj.android/build/
+examples/HelloViewerAE/proj.android/.externalNativeBuild/

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

@@ -1,15 +1,48 @@
 LOCAL_PATH := $(call my-dir)
+
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := aesdk_static
+LOCAL_CFLAGS += -std=c99
+SRC := $(LOCAL_PATH)/../../../../../ae-movie/src
+LOCAL_SRC_FILES += $(subst $(LOCAL_PATH)/,, $(wildcard $(SRC)/*.c))
+LOCAL_C_INCLUDES := $(SRC)/../include/
+LOCAL_CFLAGS +=-DAE_MOVIE_STREAM_NO_CACHE
+LOCAL_CFLAGS +=-DAE_TIME_DEFINE=1
+LOCAL_CFLAGS +=-DAE_TIME_MILLISECOND=1
+LOCAL_CFLAGS +=-DAE_MOVIE_SAFE=1
+
+include $(BUILD_STATIC_LIBRARY) 
+
+
+
+
 include $(CLEAR_VARS)
 
 LOCAL_MODULE := main
 
+LOCAL_CFLAGS +=-DAEVIEWER=1
+
 #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/example.cpp ../../../src/main.cpp 
+LOCAL_SRC_FILES += ../../../src/example.cpp ../../../src/main.cpp ../../../src/test.cpp ../../../src/AEMovieWork.cpp 
+
+LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../../../../ae-movie/include/
+
+
+LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../../../../src
+AE_SRC := ../../../../../src/ae
+LOCAL_SRC_FILES += $(AE_SRC)/AEMovie.cpp $(AE_SRC)/AERenderer.cpp $(AE_SRC)/AEMovieResource.cpp 
+
+
+LOCAL_CFLAGS +=-DAE_MOVIE_STREAM_NO_CACHE
+LOCAL_CFLAGS +=-DAE_TIME_DEFINE=1
+LOCAL_CFLAGS +=-DAE_TIME_MILLISECOND=1
+LOCAL_CFLAGS +=-DAE_MOVIE_SAFE=1
 
 
-LOCAL_STATIC_LIBRARIES := oxygine-framework_static
+LOCAL_STATIC_LIBRARIES := oxygine-framework_static aesdk_static
 LOCAL_SHARED_LIBRARIES := SDL2
 
 include $(BUILD_SHARED_LIBRARY)

examples/HelloViewerAE/src/main.cpp

@@ -147,10 +147,6 @@ void run()
     ObjectBase::dumpCreatedObjects();
 
     ObjectBase::__stopTracingLeaks();
-    //end
-
-
-	std::quick_exit(1);
 }
 
 #ifdef __S3E__