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

tests

This commit is contained in:
andyque 2014-06-06 10:12:23 +08:00
parent c96a6086c3
commit 6bbf5a1459
4 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/cocos2d_tests.xcodeproj/project.pbxproj
View File

@ -5464,6 +5464,7 @@
isa = XCBuildConfiguration;
buildSettings = {
CODE_SIGN_IDENTITY = "iPhone Developer";
DEBUG_INFORMATION_FORMAT = dwarf;
GCC_PREPROCESSOR_DEFINITIONS = (
"$(inherited)",
CC_TARGET_OS_IPHONE,
@ -5480,6 +5481,7 @@
isa = XCBuildConfiguration;
buildSettings = {
CODE_SIGN_IDENTITY = "iPhone Developer";
DEBUG_INFORMATION_FORMAT = dwarf;
GCC_PREPROCESSOR_DEFINITIONS = (
"$(inherited)",
CC_TARGET_OS_IPHONE,

4
cocos/editor-support/cocostudio/CocoLoader.cpp
View File

@ -23,6 +23,7 @@
****************************************************************************/
#include "CocoLoader.h"
#include <iostream>
namespace cocostudio {
const char* kTypeNames[] = { "Null", "False", "True", "Object", "Array", "String", "Number" };
@ -185,7 +186,8 @@ namespace cocostudio {
char* pStringAddr = pStartAddr + m_pFileHeader->m_lStringMemAddr ;
m_pRootNode = (stExpCocoNode*)pCocoMemAddr;
std::cout<<"header size = "<<sizeof(m_pFileHeader)<<std::endl;
std::cout<<"unsigned long = "<<sizeof(unsigned long)<<std::endl;
if(1 == m_pFileHeader->m_nFirstUsed)
{
for(int i = 0 ; i < m_pFileHeader->m_ObjectCount ; i++)

1
cocos/editor-support/cocostudio/WidgetReader/WidgetReader.cpp
View File

@ -182,7 +182,6 @@ namespace cocostudio
for (int i = 0; i < pCocoNode->GetChildNum(); ++i) {
std::string key = stChildArray[i].GetName(pCocoLoader);
std::string value = stChildArray[i].GetValue();
CCLOG("%s", value.c_str());
if (key == "ignoreSize") {
widget->ignoreContentAdaptWithSize(valueToBool(value));

1
cocos/editor-support/cocostudio/WidgetReader/WidgetReader.h
View File

@ -73,6 +73,7 @@ namespace cocostudio
std::function<bool(std::string)> valueToBool;
std::function<float(std::string)> valueToFloat;
};
}