Browse Source

Android Studio build fixes 1of2 -- Make files

Fix unknown symbol `Bundle` error.
Changed APP_STL to `c++_static` as `stlport_static` is depreciated and broken in latest NDK anyway.
Current compiler has RTTI disabled by default so C++ compiler flags updated to explicitly enable RTTI.
dottools 7 years ago
parent
commit
c5bf6a8b24

+ 2 - 0
engine/compilers/android-studio/app/src/main/java/com/garagegames/torque2d/MyNativeActivity.java

@@ -2,6 +2,8 @@ package com.garagegames.torque2d;
 
 import android.app.NativeActivity;
 import android.view.View;
+import android.os.Bundle;
+
 
 public class MyNativeActivity extends NativeActivity {
   static {

+ 2 - 2
engine/compilers/android-studio/app/src/main/jni/Android.mk

@@ -610,10 +610,10 @@ LOCAL_SRC_FILES :=  ../../../../../../lib/ljpeg/jcapimin.c \
  
 ifeq ($(APP_OPTIM),debug)
 	LOCAL_CFLAGS := -DENABLE_CONSOLE_MSGS -D__ANDROID__ -DTORQUE_DEBUG -DTORQUE_OS_ANDROID -DGL_GLEXT_PROTOTYPES -O0 -fsigned-char
-	LOCAL_CPPFLAGS := -std=gnu++11 $(LOCAL_CFLAGS)
+	LOCAL_CPPFLAGS := -std=gnu++11 -frtti $(LOCAL_CFLAGS)
 else
 	LOCAL_CFLAGS := -DENABLE_CONSOLE_MSGS -D__ANDROID__ -DTORQUE_OS_ANDROID -DGL_GLEXT_PROTOTYPES -O3 -fsigned-char
-	LOCAL_CPPFLAGS := -std=gnu++11 $(LOCAL_CFLAGS)
+	LOCAL_CPPFLAGS := -std=gnu++11 -frtti $(LOCAL_CFLAGS)
 endif
 LOCAL_LDLIBS    := -llog -landroid -lEGL -lGLESv1_CM -lz -lOpenSLES -L../../../../../../lib/openal/Android/$(TARGET_ARCH_ABI)
 LOCAL_STATIC_LIBRARIES := freetype-prebuilt

+ 1 - 1
engine/compilers/android-studio/app/src/main/jni/Application.mk

@@ -1,4 +1,4 @@
 APP_PLATFORM := android-16
-APP_STL := stlport_static
+APP_STL := c++_static
 APP_OPTIM := release
 APP_ABI   := armeabi-v7a x86 x86_64