diff --git a/HelloWorld/ios/HelloWorld.xcodeproj/project.pbxproj.REMOVED.git-id b/HelloWorld/ios/HelloWorld.xcodeproj/project.pbxproj.REMOVED.git-id index b6ac9acf57..4a90a31594 100644 --- a/HelloWorld/ios/HelloWorld.xcodeproj/project.pbxproj.REMOVED.git-id +++ b/HelloWorld/ios/HelloWorld.xcodeproj/project.pbxproj.REMOVED.git-id @@ -1 +1 @@ -b8a601e0b3a7e29e380e6a4f7edbe86275ed3751 \ No newline at end of file +3203476358e5248025ac28cfa152e8238600f497 \ No newline at end of file diff --git a/cocos2dx/Android.mk b/cocos2dx/Android.mk index 483b7a0472..16cd927f7d 100644 --- a/cocos2dx/Android.mk +++ b/cocos2dx/Android.mk @@ -100,9 +100,7 @@ touch_dispatcher/CCTouchHandler.cpp ifeq ($(ENABLE_LUA), true) LOCAL_SRC_FILES += lua_support/CCLuaSrcipt.cpp \ - lua_support/LuaCocos2d.cpp \ - NdControls/NdCxList.cpp \ - NdControls/NdCxListItem.cpp + lua_support/LuaCocos2d.cpp LOCAL_CFLAGS := -DENABLE_LUA -DUSE_FILE32API else