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

Merge branch 'gles20' of github.com:dualface/cocos2d-x into gles20

This commit is contained in:
YuLei 2012-09-06 09:50:52 +08:00
parent 7ba88dca4c eae5f7368e
commit 3679f742cb
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cocos2dx/platform/win32/CCFileUtils.cpp
View File

@ -96,6 +96,7 @@ const char* CCFileUtils::fullPathFromRelativePath(const char *pszRelativePath)
else if (resourceRootPath.length() > 0)
{
pRet->m_sString = resourceRootPath.c_str();
pRet->m_sString += m_obDirectory.c_str();
pRet->m_sString += pszRelativePath;
}
else