diff --git a/cocos2dx/Android.mk b/cocos2dx/Android.mk index bc1fba7416..e21114d443 100644 --- a/cocos2dx/Android.mk +++ b/cocos2dx/Android.mk @@ -32,6 +32,7 @@ cocoa/CCDictionary.cpp \ cocoa/CCNS.cpp \ cocoa/CCObject.cpp \ cocoa/CCSet.cpp \ +cocoa/CCString.cpp \ cocoa/CCZone.cpp \ cocos2d.cpp \ CCDirector.cpp \ diff --git a/cocos2dx/proj.win32/cocos2d-win32.vcxproj b/cocos2dx/proj.win32/cocos2d-win32.vcxproj index 2b92766124..962b5c8941 100644 --- a/cocos2dx/proj.win32/cocos2d-win32.vcxproj +++ b/cocos2dx/proj.win32/cocos2d-win32.vcxproj @@ -137,6 +137,7 @@ xcopy /Y /Q "$(SolutionDir)cocos2dx\platform\third_party\win32\libraries\*.*" "$ + diff --git a/cocos2dx/proj.win32/cocos2d-win32.vcxproj.filters b/cocos2dx/proj.win32/cocos2d-win32.vcxproj.filters index 365e74bc32..623287aae5 100644 --- a/cocos2dx/proj.win32/cocos2d-win32.vcxproj.filters +++ b/cocos2dx/proj.win32/cocos2d-win32.vcxproj.filters @@ -402,6 +402,9 @@ layers_scenes_transitions_nodes + + cocoa + diff --git a/tests/test.android/build_native.sh b/tests/test.android/build_native.sh index 1bdf8f9c6b..4debccd916 100755 --- a/tests/test.android/build_native.sh +++ b/tests/test.android/build_native.sh @@ -1,7 +1,7 @@ #!/bin/bash # set params -NDK_ROOT_LOCAL=/cygdrive/d/programe/android/ndk/android-ndk-r7b -COCOS2DX_ROOT_LOCAL=/cygdrive/e/cocos2d-x +NDK_ROOT_LOCAL=/cygdrive/e/android/android-ndk-r7b +COCOS2DX_ROOT_LOCAL=/cygdrive/f/Project/dumganhar/cocos2d-x # try to get global variable if [ $NDK_ROOT"aaa" != "aaa" ]; then