fix link error when using ndk r10

minggo · Jul 23, 2014 · 0b75263 · 0b75263
1 parent fe7c872
commit 0b75263
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/tests/lua-empty-test/project/proj.android/jni/Application.mk b/tests/lua-empty-test/project/proj.android/jni/Application.mk
@@ -1,5 +1,6 @@
-APP_STL := c++_static
+APP_STL := c++_shared
 NDK_TOOLCHAIN_VERSION=clang
+LIBCXX_USE_GABIXX:=true
 
 APP_CPPFLAGS := -frtti -DCC_ENABLE_CHIPMUNK_INTEGRATION=1 -std=c++11 -fsigned-char
 APP_LDFLAGS := -latomic

diff --git a/tests/lua-empty-test/project/proj.android/src/org/cocos2dx/lua_empty_test/AppActivity.java b/tests/lua-empty-test/project/proj.android/src/org/cocos2dx/lua_empty_test/AppActivity.java
@@ -3,4 +3,8 @@
 import org.cocos2dx.lib.Cocos2dxActivity;
 
 public class AppActivity extends Cocos2dxActivity {
+    static {
+        System.loadLibrary("compiler_rt_shared");
+        System.loadLibrary("c++_shared");
+    }
 }