Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'iss2305-replace-pthread' of https://github.com/minggo/cocos2d-x into minggo-iss2305-replace-pthread

This commit is contained in:
James Chen 2013-06-21 21:29:25 +08:00
parent 3cf482bebd 0a768da240
commit 88a0dbec5e
14 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
samples/Cpp/AssetsManagerTest/proj.android/jni/Application.mk
View File

@ -1,3 +1,4 @@
APP_STL := gnustl_static
APP_CPPFLAGS := -frtti -DCOCOS2D_JAVASCRIPT=1 -std=c++11
APP_CPPFLAGS += -DCOCOS2D_DEBUG=1 -DCC_ENABLE_CHIPMUNK_INTEGRATION=1
APP_CPPFLAGS += -DCOCOS2D_DEBUG=1 -DCC_ENABLE_CHIPMUNK_INTEGRATION=1
NDK_TOOLCHAIN_VERSION=4.7

3
samples/Cpp/HelloCpp/proj.android/jni/Application.mk
View File

@ -1,2 +1,3 @@
APP_STL := gnustl_static
APP_CPPFLAGS := -frtti -DCOCOS2D_DEBUG=1 -std=c++11
APP_CPPFLAGS := -frtti -DCOCOS2D_DEBUG=1 -std=c++11
NDK_TOOLCHAIN_VERSION=4.7

3
samples/Cpp/SimpleGame/proj.android/jni/Application.mk
View File

@ -1,2 +1,3 @@
APP_STL := gnustl_static
APP_CPPFLAGS := -frtti -DCOCOS2D_DEBUG=1 -std=c++11
APP_CPPFLAGS := -frtti -DCOCOS2D_DEBUG=1 -std=c++11
NDK_TOOLCHAIN_VERSION=4.7

1
samples/Cpp/TestCpp/proj.android/jni/Application.mk
View File

@ -1,2 +1,3 @@
APP_STL := gnustl_static
APP_CPPFLAGS := -frtti -DCC_ENABLE_CHIPMUNK_INTEGRATION=1 -DCOCOS2D_DEBUG=1 -std=c++11
NDK_TOOLCHAIN_VERSION=4.7

3
samples/Javascript/CocosDragonJS/proj.android/jni/Application.mk
View File

@ -1,3 +1,4 @@
APP_STL := gnustl_static
APP_CPPFLAGS := -frtti -DCOCOS2D_JAVASCRIPT=1 -std=c++11
APP_CPPFLAGS += -DCOCOS2D_DEBUG=1 -DCC_ENABLE_CHIPMUNK_INTEGRATION=1
APP_CPPFLAGS += -DCOCOS2D_DEBUG=1 -DCC_ENABLE_CHIPMUNK_INTEGRATION=
NDK_TOOLCHAIN_VERSION=4.7

1
samples/Javascript/CrystalCraze/proj.android/jni/Application.mk
View File

@ -1,3 +1,4 @@
APP_STL := gnustl_static
APP_CPPFLAGS := -frtti -DCOCOS2D_JAVASCRIPT=1 -std=c++11
APP_CPPFLAGS += -DCOCOS2D_DEBUG=1 -DCC_ENABLE_CHIPMUNK_INTEGRATION=1
NDK_TOOLCHAIN_VERSION=4.7

1
samples/Javascript/MoonWarriors/proj.android/jni/Application.mk
View File

@ -1,3 +1,4 @@
APP_STL := gnustl_static
APP_CPPFLAGS := -frtti -DCOCOS2D_JAVASCRIPT= -std=c++11
APP_CPPFLAGS += -DCOCOS2D_DEBUG=1 -DCC_ENABLE_CHIPMUNK_INTEGRATION=1
NDK_TOOLCHAIN_VERSION=4.7

1
samples/Javascript/TestJavascript/proj.android/jni/Application.mk
View File

@ -1,3 +1,4 @@
APP_STL := gnustl_static
APP_CPPFLAGS := -frtti -DCOCOS2D_JAVASCRIPT=1 -std=c++11
APP_CPPFLAGS += -DCOCOS2D_DEBUG=1 -DCC_ENABLE_CHIPMUNK_INTEGRATION=1
NDK_TOOLCHAIN_VERSION=4.7

1
samples/Javascript/WatermelonWithMe/proj.android/jni/Application.mk
View File

@ -1,3 +1,4 @@
APP_STL := gnustl_static
APP_CPPFLAGS := -frtti -DCOCOS2D_JAVASCRIPT=1 -std=c++11
APP_CPPFLAGS += -DCOCOS2D_DEBUG=1 -DCC_ENABLE_CHIPMUNK_INTEGRATION=1
NDK_TOOLCHAIN_VERSION=4.7

1
samples/Lua/HelloLua/proj.android/jni/Application.mk
View File

@ -1,3 +1,4 @@
APP_STL := gnustl_static
APP_CPPFLAGS := -frtti -DCOCOS2D_DEBUG=1 -std=c++11
APP_CPPFLAGS += -fexceptions
NDK_TOOLCHAIN_VERSION=4.7

1
samples/Lua/TestLua/proj.android/jni/Application.mk
View File

@ -1,3 +1,4 @@
APP_STL := gnustl_static
APP_CPPFLAGS := -frtti -DCOCOS2D_DEBUG=1 -std=c++11
APP_CPPFLAGS += -fexceptions
NDK_TOOLCHAIN_VERSION=4.7

1
template/multi-platform-cpp/proj.android/jni/Application.mk
View File

@ -1,2 +1,3 @@
APP_STL := gnustl_static
APP_CPPFLAGS := -frtti -DCC_ENABLE_CHIPMUNK_INTEGRATION=1 -DCOCOS2D_DEBUG=1
NDK_TOOLCHAIN_VERSION=4.7

1
template/multi-platform-js/proj.android/jni/Application.mk
View File

@ -1,3 +1,4 @@
APP_STL := gnustl_static
APP_CPPFLAGS := -frtti -DCOCOS2D_JAVASCRIPT=1
APP_CPPFLAGS += -DCOCOS2D_DEBUG=1 -DCC_ENABLE_CHIPMUNK_INTEGRATION=1
NDK_TOOLCHAIN_VERSION=4.7

1
template/multi-platform-lua/proj.android/jni/Application.mk
View File

@ -1,3 +1,4 @@
APP_STL := gnustl_static
APP_CPPFLAGS := -frtti -DCOCOS2D_DEBUG=1 -DCC_ENABLE_CHIPMUNK_INTEGRATION=1
APP_CPPFLAGS += -fexceptions
NDK_TOOLCHAIN_VERSION=4.7