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

Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into merge_arm64_lib_to_fat_lib

This commit is contained in:
boyu0 2014-07-15 11:08:35 +08:00
parent 0c4f4efc0b 74df6eb95b
commit 6ed9b49ffb
8 changed files with 7 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cocos/2d/CCFontAtlasCache.cpp
View File

@ -22,11 +22,11 @@
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
****************************************************************************/
#include <sstream>
#include "2d/CCFontAtlasCache.h"
#include <iostream>
#include <sstream>
#include "2d/CCFontFNT.h"
#include "2d/CCFontFreeType.h"
#include "CCFontCharMap.h"

1
cocos/2d/CCFontAtlasCache.h
View File

@ -26,7 +26,6 @@
#ifndef _CCFontAtlasCache_h_
#define _CCFontAtlasCache_h_
#include <iostream>
#include <unordered_map>
#include "2d/CCFontAtlas.h"

4
cocos/Android.mk
View File

@ -223,9 +223,9 @@ LOCAL_WHOLE_STATIC_LIBRARIES += cocos2dxandroid_static
# define the macro to compile through support/zip_support/ioapi.c
LOCAL_CFLAGS := -DUSE_FILE32API
LOCAL_CPPFLAGS := -Wno-deprecated-declarations
LOCAL_CPPFLAGS := -Wno-deprecated-declarations -Wno-extern-c-compat
LOCAL_EXPORT_CFLAGS := -DUSE_FILE32API
LOCAL_EXPORT_CPPFLAGS := -Wno-deprecated-declarations
LOCAL_EXPORT_CPPFLAGS := -Wno-deprecated-declarations -Wno-extern-c-compat
include $(BUILD_STATIC_LIBRARY)

4
cocos/scripting/lua-bindings/auto/api/TransitionPageTurn.lua
View File

@ -33,8 +33,4 @@
-- @param #mat4_table mat4
-- @param #unsigned int int
--------------------------------
-- @function [parent=#TransitionPageTurn] TransitionPageTurn
-- @param self
return nil

4
cocos/scripting/lua-bindings/auto/api/TransitionProgress.lua
View File

@ -11,8 +11,4 @@
-- @param #cc.Scene scene
-- @return TransitionProgress#TransitionProgress ret (return value: cc.TransitionProgress)
--------------------------------
-- @function [parent=#TransitionProgress] TransitionProgress
-- @param self
return nil

70
cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.cpp
View File

@ -39201,40 +39201,6 @@ int lua_cocos2dx_TransitionPageTurn_create(lua_State* tolua_S)
#endif
return 0;
}
int lua_cocos2dx_TransitionPageTurn_constructor(lua_State* tolua_S)
{
int argc = 0;
cocos2d::TransitionPageTurn* cobj = nullptr;
bool ok = true;
#if COCOS2D_DEBUG >= 1
tolua_Error tolua_err;
#endif
argc = lua_gettop(tolua_S)-1;
if (argc == 0)
{
if(!ok)
return 0;
cobj = new cocos2d::TransitionPageTurn();
cobj->autorelease();
int ID = (int)cobj->_ID ;
int* luaID = &cobj->_luaID ;
toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"cc.TransitionPageTurn");
return 1;
}
CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "TransitionPageTurn",argc, 0);
return 0;
#if COCOS2D_DEBUG >= 1
tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_TransitionPageTurn_constructor'.",&tolua_err);
#endif
return 0;
}
static int lua_cocos2dx_TransitionPageTurn_finalize(lua_State* tolua_S)
{
printf("luabindings: finalizing LUA object (TransitionPageTurn)");
@ -39247,7 +39213,6 @@ int lua_register_cocos2dx_TransitionPageTurn(lua_State* tolua_S)
tolua_cclass(tolua_S,"TransitionPageTurn","cc.TransitionPageTurn","cc.TransitionScene",nullptr);
tolua_beginmodule(tolua_S,"TransitionPageTurn");
tolua_function(tolua_S,"new",lua_cocos2dx_TransitionPageTurn_constructor);
tolua_function(tolua_S,"actionWithSize",lua_cocos2dx_TransitionPageTurn_actionWithSize);
tolua_function(tolua_S,"initWithDuration",lua_cocos2dx_TransitionPageTurn_initWithDuration);
tolua_function(tolua_S,"create", lua_cocos2dx_TransitionPageTurn_create);
@ -39293,40 +39258,6 @@ int lua_cocos2dx_TransitionProgress_create(lua_State* tolua_S)
#endif
return 0;
}
int lua_cocos2dx_TransitionProgress_constructor(lua_State* tolua_S)
{
int argc = 0;
cocos2d::TransitionProgress* cobj = nullptr;
bool ok = true;
#if COCOS2D_DEBUG >= 1
tolua_Error tolua_err;
#endif
argc = lua_gettop(tolua_S)-1;
if (argc == 0)
{
if(!ok)
return 0;
cobj = new cocos2d::TransitionProgress();
cobj->autorelease();
int ID = (int)cobj->_ID ;
int* luaID = &cobj->_luaID ;
toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"cc.TransitionProgress");
return 1;
}
CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "TransitionProgress",argc, 0);
return 0;
#if COCOS2D_DEBUG >= 1
tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_TransitionProgress_constructor'.",&tolua_err);
#endif
return 0;
}
static int lua_cocos2dx_TransitionProgress_finalize(lua_State* tolua_S)
{
printf("luabindings: finalizing LUA object (TransitionProgress)");
@ -39339,7 +39270,6 @@ int lua_register_cocos2dx_TransitionProgress(lua_State* tolua_S)
tolua_cclass(tolua_S,"TransitionProgress","cc.TransitionProgress","cc.TransitionScene",nullptr);
tolua_beginmodule(tolua_S,"TransitionProgress");
tolua_function(tolua_S,"new",lua_cocos2dx_TransitionProgress_constructor);
tolua_function(tolua_S,"create", lua_cocos2dx_TransitionProgress_create);
tolua_endmodule(tolua_S);
std::string typeName = typeid(cocos2d::TransitionProgress).name();

2
cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.hpp
View File

@ -1611,8 +1611,6 @@ int register_all_cocos2dx(lua_State* tolua_S);

2
templates/cpp-template-default/proj.ios_mac/HelloCpp.xcodeproj/project.pbxproj
View File

@ -941,6 +941,7 @@
"$(SRCROOT)/../cocos2d/external",
"$(SRCROOT)/../cocos2d/external/chipmunk/include/chipmunk",
);
MACOSX_DEPLOYMENT_TARGET = 10.7;
ONLY_ACTIVE_ARCH = YES;
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = macosx;
@ -969,6 +970,7 @@
"$(SRCROOT)/../cocos2d/external",
"$(SRCROOT)/../cocos2d/external/chipmunk/include/chipmunk",
);
MACOSX_DEPLOYMENT_TARGET = 10.7;
OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1";
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = macosx;