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

[GUI] Fixing compilation errors for win32. 

Conflicts:
	extensions/proj.win32/libExtensions.vcxproj.filters
This commit is contained in:
James Chen 2013-09-16 19:53:59 +08:00
parent 21d299150e
commit 621e682e6e
3 changed files with 251 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
extensions/CocoStudio/GUI/Layouts/Layout.cpp
View File

@ -462,7 +462,7 @@ bool RectClippingNode::init()
rect[2] = Point(m_clippingSize.width, m_clippingSize.height);
rect[3] = Point(0, m_clippingSize.height);
Color4F green = {0, 1, 0, 1};
Color4F green = Color4F(0, 1, 0, 1);
m_pInnerStencil->drawPolygon(rect, 4, green, 0, green);
if (CCClippingNode::init(m_pInnerStencil))
{
@ -480,7 +480,7 @@ void RectClippingNode::setClippingSize(const Size &size)
rect[1] = Point(m_clippingSize.width, 0);
rect[2] = Point(m_clippingSize.width, m_clippingSize.height);
rect[3] = Point(0, m_clippingSize.height);
Color4F green = {0, 1, 0, 1};
Color4F green = Color4F(0, 1, 0, 1);
m_pInnerStencil->clear();
m_pInnerStencil->drawPolygon(rect, 4, green, 0, green);
}

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

@ -143,11 +143,39 @@
<ClCompile Include="..\CocoStudio\Components\CCComController.cpp" />
<ClCompile Include="..\CocoStudio\Components\CCComRender.cpp" />
<ClCompile Include="..\CocoStudio\Components\CCInputDelegate.cpp" />
<ClCompile Include="..\CocoStudio\GUI\Action\UIAction.cpp" />
<ClCompile Include="..\CocoStudio\GUI\Action\UIActionFrame.cpp" />
<ClCompile Include="..\CocoStudio\GUI\Action\UIActionManager.cpp" />
<ClCompile Include="..\CocoStudio\GUI\Action\UIActionNode.cpp" />
<ClCompile Include="..\CocoStudio\GUI\BaseClasses\UIRootWidget.cpp" />
<ClCompile Include="..\CocoStudio\GUI\BaseClasses\UIWidget.cpp" />
<ClCompile Include="..\CocoStudio\GUI\Layouts\Layout.cpp" />
<ClCompile Include="..\CocoStudio\GUI\Layouts\LayoutExecutant.cpp" />
<ClCompile Include="..\CocoStudio\GUI\Layouts\LayoutParameter.cpp" />
<ClCompile Include="..\CocoStudio\GUI\Layouts\UILayoutDefine.cpp" />
<ClCompile Include="..\CocoStudio\GUI\System\CocosGUI.cpp" />
<ClCompile Include="..\CocoStudio\GUI\System\UIHelper.cpp" />
<ClCompile Include="..\CocoStudio\GUI\System\UIInputManager.cpp" />
<ClCompile Include="..\CocoStudio\GUI\System\UILayer.cpp" />
<ClCompile Include="..\CocoStudio\GUI\UIWidgets\ScrollWidget\UIDragPanel.cpp" />
<ClCompile Include="..\CocoStudio\GUI\UIWidgets\ScrollWidget\UIListView.cpp" />
<ClCompile Include="..\CocoStudio\GUI\UIWidgets\ScrollWidget\UIPageView.cpp" />
<ClCompile Include="..\CocoStudio\GUI\UIWidgets\ScrollWidget\UIScrollView.cpp" />
<ClCompile Include="..\CocoStudio\GUI\UIWidgets\UIButton.cpp" />
<ClCompile Include="..\CocoStudio\GUI\UIWidgets\UICheckBox.cpp" />
<ClCompile Include="..\CocoStudio\GUI\UIWidgets\UIImageView.cpp" />
<ClCompile Include="..\CocoStudio\GUI\UIWidgets\UILabel.cpp" />
<ClCompile Include="..\CocoStudio\GUI\UIWidgets\UILabelAtlas.cpp" />
<ClCompile Include="..\CocoStudio\GUI\UIWidgets\UILabelBMFont.cpp" />
<ClCompile Include="..\CocoStudio\GUI\UIWidgets\UILoadingBar.cpp" />
<ClCompile Include="..\CocoStudio\GUI\UIWidgets\UISlider.cpp" />
<ClCompile Include="..\CocoStudio\GUI\UIWidgets\UITextField.cpp" />
<ClCompile Include="..\CocoStudio\Json\CSContentJsonDictionary.cpp" />
<ClCompile Include="..\CocoStudio\Json\DictionaryHelper.cpp" />
<ClCompile Include="..\CocoStudio\Json\lib_json\json_reader.cpp" />
<ClCompile Include="..\CocoStudio\Json\lib_json\json_value.cpp" />
<ClCompile Include="..\CocoStudio\Json\lib_json\json_writer.cpp" />
<ClCompile Include="..\CocoStudio\Reader\CCSGUIReader.cpp" />
<ClCompile Include="..\CocoStudio\Reader\CCSSceneReader.cpp" />
<ClCompile Include="..\GUI\CCControlExtension\CCControl.cpp" />
<ClCompile Include="..\GUI\CCControlExtension\CCControlButton.cpp" />
@ -254,6 +282,34 @@
<ClInclude Include="..\CocoStudio\Components\CCComController.h" />
<ClInclude Include="..\CocoStudio\Components\CCComRender.h" />
<ClInclude Include="..\CocoStudio\Components\CCInputDelegate.h" />
<ClInclude Include="..\CocoStudio\GUI\Action\UIAction.h" />
<ClInclude Include="..\CocoStudio\GUI\Action\UIActionFrame.h" />
<ClInclude Include="..\CocoStudio\GUI\Action\UIActionManager.h" />
<ClInclude Include="..\CocoStudio\GUI\Action\UIActionNode.h" />
<ClInclude Include="..\CocoStudio\GUI\BaseClasses\UIRootWidget.h" />
<ClInclude Include="..\CocoStudio\GUI\BaseClasses\UIWidget.h" />
<ClInclude Include="..\CocoStudio\GUI\Layouts\Layout.h" />
<ClInclude Include="..\CocoStudio\GUI\Layouts\LayoutExecutant.h" />
<ClInclude Include="..\CocoStudio\GUI\Layouts\LayoutParameter.h" />
<ClInclude Include="..\CocoStudio\GUI\Layouts\UILayoutDefine.h" />
<ClInclude Include="..\CocoStudio\GUI\System\CocosGUI.h" />
<ClInclude Include="..\CocoStudio\GUI\System\UIHelper.h" />
<ClInclude Include="..\CocoStudio\GUI\System\UIInputManager.h" />
<ClInclude Include="..\CocoStudio\GUI\System\UILayer.h" />
<ClInclude Include="..\CocoStudio\GUI\UIWidgets\ScrollWidget\UIDragPanel.h" />
<ClInclude Include="..\CocoStudio\GUI\UIWidgets\ScrollWidget\UIListView.h" />
<ClInclude Include="..\CocoStudio\GUI\UIWidgets\ScrollWidget\UIPageView.h" />
<ClInclude Include="..\CocoStudio\GUI\UIWidgets\ScrollWidget\UIScrollInterface.h" />
<ClInclude Include="..\CocoStudio\GUI\UIWidgets\ScrollWidget\UIScrollView.h" />
<ClInclude Include="..\CocoStudio\GUI\UIWidgets\UIButton.h" />
<ClInclude Include="..\CocoStudio\GUI\UIWidgets\UICheckBox.h" />
<ClInclude Include="..\CocoStudio\GUI\UIWidgets\UIImageView.h" />
<ClInclude Include="..\CocoStudio\GUI\UIWidgets\UILabel.h" />
<ClInclude Include="..\CocoStudio\GUI\UIWidgets\UILabelAtlas.h" />
<ClInclude Include="..\CocoStudio\GUI\UIWidgets\UILabelBMFont.h" />
<ClInclude Include="..\CocoStudio\GUI\UIWidgets\UILoadingBar.h" />
<ClInclude Include="..\CocoStudio\GUI\UIWidgets\UISlider.h" />
<ClInclude Include="..\CocoStudio\GUI\UIWidgets\UITextField.h" />
<ClInclude Include="..\CocoStudio\Json\CSContentJsonDictionary.h" />
<ClInclude Include="..\CocoStudio\Json\DictionaryHelper.h" />
<ClInclude Include="..\CocoStudio\Json\lib_json\autolink.h" />
@ -266,6 +322,7 @@
<ClInclude Include="..\CocoStudio\Json\lib_json\reader.h" />
<ClInclude Include="..\CocoStudio\Json\lib_json\value.h" />
<ClInclude Include="..\CocoStudio\Json\lib_json\writer.h" />
<ClInclude Include="..\CocoStudio\Reader\CCSGUIReader.h" />
<ClInclude Include="..\CocoStudio\Reader\CCSSceneReader.h" />
<ClInclude Include="..\GUI\CCControlExtension\CCControl.h" />
<ClInclude Include="..\GUI\CCControlExtension\CCControlButton.h" />

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

@ -67,6 +67,27 @@
<Filter Include="CocoStudio\Json\lib_json">
<UniqueIdentifier>{d305abea-33cc-4ae8-b78d-b5fb59927e59}</UniqueIdentifier>
</Filter>
<Filter Include="CocoStudio\GUI">
<UniqueIdentifier>{9af947f9-84cd-4051-953e-67291da6528c}</UniqueIdentifier>
</Filter>
<Filter Include="CocoStudio\GUI\Action">
<UniqueIdentifier>{6ad66a63-e7d6-4285-b30a-7ab70a299f7e}</UniqueIdentifier>
</Filter>
<Filter Include="CocoStudio\GUI\BaseClasses">
<UniqueIdentifier>{9713ac75-d9ba-494a-8dcf-03e30f8ee2b2}</UniqueIdentifier>
</Filter>
<Filter Include="CocoStudio\GUI\Layouts">
<UniqueIdentifier>{2d6f3e38-bb46-4bec-9ec1-73d90cefb3ba}</UniqueIdentifier>
</Filter>
<Filter Include="CocoStudio\GUI\System">
<UniqueIdentifier>{7556b22b-b7ca-4f3b-938d-0f9c8047892c}</UniqueIdentifier>
</Filter>
<Filter Include="CocoStudio\GUI\UIWidgets">
<UniqueIdentifier>{f66c34f1-f75a-4f06-9788-c48972bc0ff2}</UniqueIdentifier>
</Filter>
<Filter Include="CocoStudio\GUI\UIWidgets\ScrollWidget">
<UniqueIdentifier>{1c44450b-d06e-4638-9f0c-1ff62e67ec84}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\GUI\CCScrollView\CCScrollView.cpp">
@ -376,6 +397,90 @@
<ClCompile Include="..\CocoStudio\Armature\external_tool\GLES-Render.cpp">
<Filter>CocoStudio\Armature\external_tool</Filter>
</ClCompile>
<ClCompile Include="..\CocoStudio\GUI\UIWidgets\ScrollWidget\UIListView.cpp">
<Filter>CocoStudio\GUI\UIWidgets\ScrollWidget</Filter>
</ClCompile>
<ClCompile Include="..\CocoStudio\GUI\UIWidgets\ScrollWidget\UIPageView.cpp">
<Filter>CocoStudio\GUI\UIWidgets\ScrollWidget</Filter>
</ClCompile>
<ClCompile Include="..\CocoStudio\GUI\UIWidgets\ScrollWidget\UIScrollView.cpp">
<Filter>CocoStudio\GUI\UIWidgets\ScrollWidget</Filter>
</ClCompile>
<ClCompile Include="..\CocoStudio\GUI\UIWidgets\ScrollWidget\UIDragPanel.cpp">
<Filter>CocoStudio\GUI\UIWidgets\ScrollWidget</Filter>
</ClCompile>
<ClCompile Include="..\CocoStudio\GUI\UIWidgets\UIImageView.cpp">
<Filter>CocoStudio\GUI\UIWidgets</Filter>
</ClCompile>
<ClCompile Include="..\CocoStudio\GUI\UIWidgets\UILabel.cpp">
<Filter>CocoStudio\GUI\UIWidgets</Filter>
</ClCompile>
<ClCompile Include="..\CocoStudio\GUI\UIWidgets\UILabelAtlas.cpp">
<Filter>CocoStudio\GUI\UIWidgets</Filter>
</ClCompile>
<ClCompile Include="..\CocoStudio\GUI\UIWidgets\UILabelBMFont.cpp">
<Filter>CocoStudio\GUI\UIWidgets</Filter>
</ClCompile>
<ClCompile Include="..\CocoStudio\GUI\UIWidgets\UILoadingBar.cpp">
<Filter>CocoStudio\GUI\UIWidgets</Filter>
</ClCompile>
<ClCompile Include="..\CocoStudio\GUI\UIWidgets\UISlider.cpp">
<Filter>CocoStudio\GUI\UIWidgets</Filter>
</ClCompile>
<ClCompile Include="..\CocoStudio\GUI\UIWidgets\UITextField.cpp">
<Filter>CocoStudio\GUI\UIWidgets</Filter>
</ClCompile>
<ClCompile Include="..\CocoStudio\GUI\UIWidgets\UIButton.cpp">
<Filter>CocoStudio\GUI\UIWidgets</Filter>
</ClCompile>
<ClCompile Include="..\CocoStudio\GUI\UIWidgets\UICheckBox.cpp">
<Filter>CocoStudio\GUI\UIWidgets</Filter>
</ClCompile>
<ClCompile Include="..\CocoStudio\GUI\Action\UIAction.cpp">
<Filter>CocoStudio\GUI\Action</Filter>
</ClCompile>
<ClCompile Include="..\CocoStudio\GUI\Action\UIActionFrame.cpp">
<Filter>CocoStudio\GUI\Action</Filter>
</ClCompile>
<ClCompile Include="..\CocoStudio\GUI\Action\UIActionManager.cpp">
<Filter>CocoStudio\GUI\Action</Filter>
</ClCompile>
<ClCompile Include="..\CocoStudio\GUI\Action\UIActionNode.cpp">
<Filter>CocoStudio\GUI\Action</Filter>
</ClCompile>
<ClCompile Include="..\CocoStudio\GUI\BaseClasses\UIRootWidget.cpp">
<Filter>CocoStudio\GUI\BaseClasses</Filter>
</ClCompile>
<ClCompile Include="..\CocoStudio\GUI\BaseClasses\UIWidget.cpp">
<Filter>CocoStudio\GUI\BaseClasses</Filter>
</ClCompile>
<ClCompile Include="..\CocoStudio\GUI\Layouts\Layout.cpp">
<Filter>CocoStudio\GUI\Layouts</Filter>
</ClCompile>
<ClCompile Include="..\CocoStudio\GUI\Layouts\LayoutExecutant.cpp">
<Filter>CocoStudio\GUI\Layouts</Filter>
</ClCompile>
<ClCompile Include="..\CocoStudio\GUI\Layouts\LayoutParameter.cpp">
<Filter>CocoStudio\GUI\Layouts</Filter>
</ClCompile>
<ClCompile Include="..\CocoStudio\GUI\Layouts\UILayoutDefine.cpp">
<Filter>CocoStudio\GUI\Layouts</Filter>
</ClCompile>
<ClCompile Include="..\CocoStudio\GUI\System\CocosGUI.cpp">
<Filter>CocoStudio\GUI\System</Filter>
</ClCompile>
<ClCompile Include="..\CocoStudio\GUI\System\UIHelper.cpp">
<Filter>CocoStudio\GUI\System</Filter>
</ClCompile>
<ClCompile Include="..\CocoStudio\GUI\System\UIInputManager.cpp">
<Filter>CocoStudio\GUI\System</Filter>
</ClCompile>
<ClCompile Include="..\CocoStudio\GUI\System\UILayer.cpp">
<Filter>CocoStudio\GUI\System</Filter>
</ClCompile>
<ClCompile Include="..\CocoStudio\Reader\CCSGUIReader.cpp">
<Filter>CocoStudio\Reader</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\GUI\CCScrollView\CCScrollView.h">
@ -740,8 +845,92 @@
<ClInclude Include="..\CocoStudio\Components\CCComRender.h">
<Filter>CocoStudio\Components</Filter>
</ClInclude>
<ClInclude Include="..\CocoStudio\Armature\external_tool\GLES-Render.h">
<Filter>CocoStudio\Armature\external_tool</Filter>
<ClInclude Include="..\CocoStudio\GUI\UIWidgets\ScrollWidget\UIListView.h">
<Filter>CocoStudio\GUI\UIWidgets\ScrollWidget</Filter>
</ClInclude>
<ClInclude Include="..\CocoStudio\GUI\UIWidgets\ScrollWidget\UIPageView.h">
<Filter>CocoStudio\GUI\UIWidgets\ScrollWidget</Filter>
</ClInclude>
<ClInclude Include="..\CocoStudio\GUI\UIWidgets\ScrollWidget\UIScrollInterface.h">
<Filter>CocoStudio\GUI\UIWidgets\ScrollWidget</Filter>
</ClInclude>
<ClInclude Include="..\CocoStudio\GUI\UIWidgets\ScrollWidget\UIScrollView.h">
<Filter>CocoStudio\GUI\UIWidgets\ScrollWidget</Filter>
</ClInclude>
<ClInclude Include="..\CocoStudio\GUI\UIWidgets\ScrollWidget\UIDragPanel.h">
<Filter>CocoStudio\GUI\UIWidgets\ScrollWidget</Filter>
</ClInclude>
<ClInclude Include="..\CocoStudio\GUI\UIWidgets\UICheckBox.h">
<Filter>CocoStudio\GUI\UIWidgets</Filter>
</ClInclude>
<ClInclude Include="..\CocoStudio\GUI\UIWidgets\UIImageView.h">
<Filter>CocoStudio\GUI\UIWidgets</Filter>
</ClInclude>
<ClInclude Include="..\CocoStudio\GUI\UIWidgets\UILabel.h">
<Filter>CocoStudio\GUI\UIWidgets</Filter>
</ClInclude>
<ClInclude Include="..\CocoStudio\GUI\UIWidgets\UILabelAtlas.h">
<Filter>CocoStudio\GUI\UIWidgets</Filter>
</ClInclude>
<ClInclude Include="..\CocoStudio\GUI\UIWidgets\UILabelBMFont.h">
<Filter>CocoStudio\GUI\UIWidgets</Filter>
</ClInclude>
<ClInclude Include="..\CocoStudio\GUI\UIWidgets\UILoadingBar.h">
<Filter>CocoStudio\GUI\UIWidgets</Filter>
</ClInclude>
<ClInclude Include="..\CocoStudio\GUI\UIWidgets\UISlider.h">
<Filter>CocoStudio\GUI\UIWidgets</Filter>
</ClInclude>
<ClInclude Include="..\CocoStudio\GUI\UIWidgets\UITextField.h">
<Filter>CocoStudio\GUI\UIWidgets</Filter>
</ClInclude>
<ClInclude Include="..\CocoStudio\GUI\UIWidgets\UIButton.h">
<Filter>CocoStudio\GUI\UIWidgets</Filter>
</ClInclude>
<ClInclude Include="..\CocoStudio\GUI\Action\UIAction.h">
<Filter>CocoStudio\GUI\Action</Filter>
</ClInclude>
<ClInclude Include="..\CocoStudio\GUI\Action\UIActionFrame.h">
<Filter>CocoStudio\GUI\Action</Filter>
</ClInclude>
<ClInclude Include="..\CocoStudio\GUI\Action\UIActionManager.h">
<Filter>CocoStudio\GUI\Action</Filter>
</ClInclude>
<ClInclude Include="..\CocoStudio\GUI\Action\UIActionNode.h">
<Filter>CocoStudio\GUI\Action</Filter>
</ClInclude>
<ClInclude Include="..\CocoStudio\GUI\BaseClasses\UIRootWidget.h">
<Filter>CocoStudio\GUI\BaseClasses</Filter>
</ClInclude>
<ClInclude Include="..\CocoStudio\GUI\BaseClasses\UIWidget.h">
<Filter>CocoStudio\GUI\BaseClasses</Filter>
</ClInclude>
<ClInclude Include="..\CocoStudio\GUI\Layouts\Layout.h">
<Filter>CocoStudio\GUI\Layouts</Filter>
</ClInclude>
<ClInclude Include="..\CocoStudio\GUI\Layouts\LayoutExecutant.h">
<Filter>CocoStudio\GUI\Layouts</Filter>
</ClInclude>
<ClInclude Include="..\CocoStudio\GUI\Layouts\LayoutParameter.h">
<Filter>CocoStudio\GUI\Layouts</Filter>
</ClInclude>
<ClInclude Include="..\CocoStudio\GUI\Layouts\UILayoutDefine.h">
<Filter>CocoStudio\GUI\Layouts</Filter>
</ClInclude>
<ClInclude Include="..\CocoStudio\GUI\System\CocosGUI.h">
<Filter>CocoStudio\GUI\System</Filter>
</ClInclude>
<ClInclude Include="..\CocoStudio\GUI\System\UIHelper.h">
<Filter>CocoStudio\GUI\System</Filter>
</ClInclude>
<ClInclude Include="..\CocoStudio\GUI\System\UIInputManager.h">
<Filter>CocoStudio\GUI\System</Filter>
</ClInclude>
<ClInclude Include="..\CocoStudio\GUI\System\UILayer.h">
<Filter>CocoStudio\GUI\System</Filter>
</ClInclude>
<ClInclude Include="..\CocoStudio\Reader\CCSGUIReader.h">
<Filter>CocoStudio\Reader</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
@ -758,4 +947,4 @@
<Filter>CocoStudio\Json\lib_json</Filter>
</None>
</ItemGroup>
</Project>
</Project>