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

Merge branch 'iss2430-modify_enum' of https://github.com/minggo/cocos2d-x into iss2430-modify_enum

This commit is contained in:
minggo 2013-07-26 17:47:52 +08:00
parent 7817dd6c0f bafc01c2aa
commit 859da78499
3 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cocos2dx/platform/win32/CCImage.cpp
View File

@ -370,7 +370,7 @@ bool Image::initWithString(
const char * pText,
int nWidth/* = 0*/,
int nHeight/* = 0*/,
ETextAlign eAlignMask/* = kAlignCenter*/,
TextAlign eAlignMask/* = kAlignCenter*/,
const char * pFontName/* = nil*/,
int nSize/* = 0*/)
{

1
extensions/proj.win32/libExtensions.vcxproj
View File

@ -142,6 +142,7 @@
<ClCompile Include="..\CCBReader\CCScale9SpriteLoader.cpp" />
<ClCompile Include="..\CCBReader\CCScrollViewLoader.cpp" />
<ClCompile Include="..\CCBReader\CCSpriteLoader.cpp" />
<ClCompile Include="..\CCDeprecated-ext.cpp" />
<ClCompile Include="..\Components\CCComAttribute.cpp" />
<ClCompile Include="..\Components\CCComAudio.cpp" />
<ClCompile Include="..\Components\CCComController.cpp" />

1
extensions/proj.win32/libExtensions.vcxproj.filters
View File

@ -357,6 +357,7 @@
<ClCompile Include="..\network\SocketIO.cpp">
<Filter>network</Filter>
</ClCompile>
<ClCompile Include="..\CCDeprecated-ext.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\GUI\CCScrollView\CCScrollView.h">