mewin/nana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'feature-group' into develop

Browse Source 
Conflicts:
	build/vc2013/nana.vcxproj
	build/vc2013/nana.vcxproj.filters
This commit is contained in:
Jinhao
2015-07-12 11:31:06 +08:00
parent f762589975 82cfa7da31
commit 17556cae99
6 changed files with 650 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
build/vc2015/nana.vcxproj
View File

@@ -223,6 +223,7 @@
<ClCompile Include="..\..\source\gui\widgets\float_listbox.cpp" />
<ClCompile Include="..\..\source\gui\widgets\form.cpp" />
<ClCompile Include="..\..\source\gui\widgets\frame.cpp" />
<ClCompile Include="..\..\source\gui\widgets\group.cpp" />
<ClCompile Include="..\..\source\gui\widgets\label.cpp" />
<ClCompile Include="..\..\source\gui\widgets\listbox.cpp" />
<ClCompile Include="..\..\source\gui\widgets\menu.cpp" />
@@ -257,9 +258,6 @@
<ClCompile Include="..\..\source\traits.cpp" />
<ClCompile Include="..\..\source\unicode_bidi.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\include\nana\filesystem\filesystem.hpp" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>

8
build/vc2015/nana.vcxproj.filters
View File

@@ -303,10 +303,8 @@
<ClCompile Include="..\..\source\filesystem\filesystem.cpp">
<Filter>Source Files\nana\filesystem</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\include\nana\filesystem\filesystem.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClCompile Include="..\..\source\gui\widgets\group.cpp">
<Filter>Source Files\nana\gui\widgets</Filter>
</ClCompile>
</ItemGroup>
</Project>