VS项目文件同步

This commit is contained in:
Haibo 2018-07-16 22:43:56 +08:00
parent d180c4dd74
commit 767a5da6c1
10 changed files with 29 additions and 28 deletions

View File

@ -1,7 +1,6 @@
#include "..\e2dcommon.h"
#include <iomanip>
#include <cwctype>
#include <algorithm>
#include <comutil.h>
#pragma comment(lib, "comsuppw.lib")

View File

@ -1,7 +1,6 @@
#include "..\e2dnode.h"
#include "..\e2dmanager.h"
#include "..\e2daction.h"
#include <algorithm>
const e2d::Node::Property e2d::Node::Property::Origin = { 0 };

View File

@ -58,7 +58,7 @@ bool e2d::File::exists() const
bool e2d::File::isFolder() const
{
return _attributes & FILE_ATTRIBUTE_DIRECTORY;
return (_attributes & FILE_ATTRIBUTE_DIRECTORY) != 0;
}
e2d::String e2d::File::getFilePath() const

View File

@ -1,6 +1,4 @@
#include "..\e2dtool.h"
#include <algorithm>
extern "C" const GUID DECLSPEC_SELECTANY FOLDERID_LocalAppData = {
0xF1B32785, 0x6FBA, 0x4FCF, { 0x9D, 0x55, 0x7B, 0x8E, 0x7F, 0x15, 0x70, 0x91 }

View File

@ -49,6 +49,7 @@
#include <chrono>
#include <sstream>
#include <functional>
#include <algorithm>
// Import Libraries
#pragma comment(lib, "d2d1.lib")

View File

@ -21,7 +21,6 @@
<ItemGroup>
<ClInclude Include="..\..\core\e2daction.h" />
<ClInclude Include="..\..\core\e2dbase.h" />
<ClInclude Include="..\..\core\e2dcollider.h" />
<ClInclude Include="..\..\core\e2dcommon.h" />
<ClInclude Include="..\..\core\e2dcustom.h" />
<ClInclude Include="..\..\core\e2dmacros.h" />
@ -59,7 +58,6 @@
<ClCompile Include="..\..\core\Base\Time.cpp" />
<ClCompile Include="..\..\core\Base\Window.cpp" />
<ClCompile Include="..\..\core\Common\Collider.cpp" />
<ClCompile Include="..\..\core\Common\Collision.cpp" />
<ClCompile Include="..\..\core\Common\Color.cpp" />
<ClCompile Include="..\..\core\Common\Config.cpp" />
<ClCompile Include="..\..\core\Common\Font.cpp" />
@ -76,9 +74,11 @@
<ClCompile Include="..\..\core\Custom\SystemException.cpp" />
<ClCompile Include="..\..\core\Custom\TextRenderer.cpp" />
<ClCompile Include="..\..\core\Custom\VoiceCallback.cpp" />
<ClCompile Include="..\..\core\Event\Collision.cpp" />
<ClCompile Include="..\..\core\Event\KeyEvent.cpp" />
<ClCompile Include="..\..\core\Event\MouseEvent.cpp" />
<ClCompile Include="..\..\core\Manager\ActionManager.cpp" />
<ClCompile Include="..\..\core\Manager\CollisionManager.cpp" />
<ClCompile Include="..\..\core\Manager\InputManager.cpp" />
<ClCompile Include="..\..\core\Manager\SceneManager.cpp" />
<ClCompile Include="..\..\core\Node\Button.cpp" />
<ClCompile Include="..\..\core\Node\Menu.cpp" />

View File

@ -22,20 +22,19 @@
<Filter Include="Transition">
<UniqueIdentifier>{337d5a0f-60fd-473a-83da-b2a3515affd9}</UniqueIdentifier>
</Filter>
<Filter Include="Collider">
<UniqueIdentifier>{4ff7f97f-95dd-4060-badc-0362c74a7318}</UniqueIdentifier>
</Filter>
<Filter Include="Node\Shape">
<UniqueIdentifier>{f0ed2748-5199-48d1-930c-286afd27c235}</UniqueIdentifier>
</Filter>
<Filter Include="Custom">
<UniqueIdentifier>{8ef0d8e2-1138-40c0-a1a8-0eb681721f4e}</UniqueIdentifier>
</Filter>
<Filter Include="Event">
<UniqueIdentifier>{69654184-01f6-4729-9559-802cd79bcb4b}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\core\e2daction.h" />
<ClInclude Include="..\..\core\e2dbase.h" />
<ClInclude Include="..\..\core\e2dcollider.h" />
<ClInclude Include="..\..\core\e2dcommon.h" />
<ClInclude Include="..\..\core\e2dcustom.h" />
<ClInclude Include="..\..\core\e2dmacros.h" />
@ -254,11 +253,14 @@
<ClCompile Include="..\..\core\Manager\CollisionManager.cpp">
<Filter>Manager</Filter>
</ClCompile>
<ClCompile Include="..\..\core\Manager\InputManager.cpp">
<Filter>Manager</Filter>
<ClCompile Include="..\..\core\Event\Collision.cpp">
<Filter>Event</Filter>
</ClCompile>
<ClCompile Include="..\..\core\Common\Collision.cpp">
<Filter>Common</Filter>
<ClCompile Include="..\..\core\Event\KeyEvent.cpp">
<Filter>Event</Filter>
</ClCompile>
<ClCompile Include="..\..\core\Event\MouseEvent.cpp">
<Filter>Event</Filter>
</ClCompile>
</ItemGroup>
</Project>

View File

@ -165,7 +165,6 @@
<ItemGroup>
<ClInclude Include="..\..\core\e2daction.h" />
<ClInclude Include="..\..\core\e2dbase.h" />
<ClInclude Include="..\..\core\e2dcollider.h" />
<ClInclude Include="..\..\core\e2dcommon.h" />
<ClInclude Include="..\..\core\e2dcustom.h" />
<ClInclude Include="..\..\core\e2dmacros.h" />
@ -203,7 +202,6 @@
<ClCompile Include="..\..\core\Base\Time.cpp" />
<ClCompile Include="..\..\core\Base\Window.cpp" />
<ClCompile Include="..\..\core\Common\Collider.cpp" />
<ClCompile Include="..\..\core\Common\Collision.cpp" />
<ClCompile Include="..\..\core\Common\Color.cpp" />
<ClCompile Include="..\..\core\Common\Config.cpp" />
<ClCompile Include="..\..\core\Common\Font.cpp" />
@ -220,9 +218,11 @@
<ClCompile Include="..\..\core\Custom\SystemException.cpp" />
<ClCompile Include="..\..\core\Custom\TextRenderer.cpp" />
<ClCompile Include="..\..\core\Custom\VoiceCallback.cpp" />
<ClCompile Include="..\..\core\Event\Collision.cpp" />
<ClCompile Include="..\..\core\Event\KeyEvent.cpp" />
<ClCompile Include="..\..\core\Event\MouseEvent.cpp" />
<ClCompile Include="..\..\core\Manager\ActionManager.cpp" />
<ClCompile Include="..\..\core\Manager\CollisionManager.cpp" />
<ClCompile Include="..\..\core\Manager\InputManager.cpp" />
<ClCompile Include="..\..\core\Manager\SceneManager.cpp" />
<ClCompile Include="..\..\core\Node\Button.cpp" />
<ClCompile Include="..\..\core\Node\Menu.cpp" />

View File

@ -25,17 +25,16 @@
<Filter Include="Node\Shape">
<UniqueIdentifier>{47b7c15b-ac05-4773-a9ee-7aa352830f02}</UniqueIdentifier>
</Filter>
<Filter Include="Collider">
<UniqueIdentifier>{2092de23-7fdd-430a-9936-1038c55b504b}</UniqueIdentifier>
</Filter>
<Filter Include="Custom">
<UniqueIdentifier>{7660a3fa-36f9-4b1b-8942-e38e02c0c95b}</UniqueIdentifier>
</Filter>
<Filter Include="Event">
<UniqueIdentifier>{c597916e-c162-41a4-849a-c568513f6d14}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\core\e2daction.h" />
<ClInclude Include="..\..\core\e2dbase.h" />
<ClInclude Include="..\..\core\e2dcollider.h" />
<ClInclude Include="..\..\core\e2dcommon.h" />
<ClInclude Include="..\..\core\e2dcustom.h" />
<ClInclude Include="..\..\core\e2dmacros.h" />
@ -254,11 +253,14 @@
<ClCompile Include="..\..\core\Manager\CollisionManager.cpp">
<Filter>Manager</Filter>
</ClCompile>
<ClCompile Include="..\..\core\Manager\InputManager.cpp">
<Filter>Manager</Filter>
<ClCompile Include="..\..\core\Event\Collision.cpp">
<Filter>Event</Filter>
</ClCompile>
<ClCompile Include="..\..\core\Common\Collision.cpp">
<Filter>Common</Filter>
<ClCompile Include="..\..\core\Event\KeyEvent.cpp">
<Filter>Event</Filter>
</ClCompile>
<ClCompile Include="..\..\core\Event\MouseEvent.cpp">
<Filter>Event</Filter>
</ClCompile>
</ItemGroup>
</Project>

View File

@ -23,7 +23,7 @@
<ProjectGuid>{FF7F943D-A89C-4E6C-97CF-84F7D8FF8EDF}</ProjectGuid>
<Keyword>Win32Proj</Keyword>
<RootNamespace>Easy2D</RootNamespace>
<WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
<WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">