Lenheart
/
Magic_Game
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix project files

This commit is contained in:
Nomango 2019-03-11 12:12:31 +08:00 committed by Nomango
parent 4540b51f47
commit 2f4501067b
19 changed files with 48 additions and 180 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

147
3rd-party/ImGui/ImGui.vcxproj vendored
View File

@ -1,147 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Debug|x64">
<Configuration>Debug</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|x64">
<Configuration>Release</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
</ItemGroup>
<ItemGroup>
<ClInclude Include="ImGui\imconfig.h" />
<ClInclude Include="ImGui\imgui.h" />
<ClInclude Include="ImGui\imgui_internal.h" />
<ClInclude Include="ImGui\imstb_rectpack.h" />
<ClInclude Include="ImGui\imstb_textedit.h" />
<ClInclude Include="ImGui\imstb_truetype.h" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="ImGui\imgui.cpp" />
<ClCompile Include="ImGui\imgui_demo.cpp" />
<ClCompile Include="ImGui\imgui_draw.cpp" />
<ClCompile Include="ImGui\imgui_widgets.cpp" />
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{AA7C72A9-DDBF-4398-A301-8EE157E37D4C}</ProjectGuid>
<RootNamespace>ImGui</RootNamespace>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Label="Shared">
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<LinkIncremental>true</LinkIncremental>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<LinkIncremental>true</LinkIncremental>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LinkIncremental>false</LinkIncremental>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<LinkIncremental>false</LinkIncremental>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<ConformanceMode>true</ConformanceMode>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<ConformanceMode>true</ConformanceMode>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<ConformanceMode>true</ConformanceMode>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<ConformanceMode>true</ConformanceMode>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
</ItemDefinitionGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>

17
3rd-party/ImGui/ImGui.vcxproj.filters vendored
View File

@ -1,17 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<ClInclude Include="ImGui\imconfig.h" />
<ClInclude Include="ImGui\imgui.h" />
<ClInclude Include="ImGui\imgui_internal.h" />
<ClInclude Include="ImGui\imstb_rectpack.h" />
<ClInclude Include="ImGui\imstb_textedit.h" />
<ClInclude Include="ImGui\imstb_truetype.h" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="ImGui\imgui.cpp" />
<ClCompile Include="ImGui\imgui_demo.cpp" />
<ClCompile Include="ImGui\imgui_draw.cpp" />
<ClCompile Include="ImGui\imgui_widgets.cpp" />
</ItemGroup>
</Project>

0
3rd-party/ImGui/ImGui/LICENSE.txt → 3rd-party/ImGui/LICENSE.txt vendored
View File

0
3rd-party/ImGui/ImGui/imconfig.h → 3rd-party/ImGui/imconfig.h vendored
View File

0
3rd-party/ImGui/ImGui/imgui.cpp → 3rd-party/ImGui/imgui.cpp vendored
View File

0
3rd-party/ImGui/ImGui/imgui.h → 3rd-party/ImGui/imgui.h vendored
View File

0
3rd-party/ImGui/ImGui/imgui_demo.cpp → 3rd-party/ImGui/imgui_demo.cpp vendored
View File

0
3rd-party/ImGui/ImGui/imgui_draw.cpp → 3rd-party/ImGui/imgui_draw.cpp vendored
View File

0
3rd-party/ImGui/ImGui/imgui_internal.h → 3rd-party/ImGui/imgui_internal.h vendored
View File

0
3rd-party/ImGui/ImGui/imgui_widgets.cpp → 3rd-party/ImGui/imgui_widgets.cpp vendored
View File

0
3rd-party/ImGui/ImGui/imstb_rectpack.h → 3rd-party/ImGui/imstb_rectpack.h vendored
View File

0
3rd-party/ImGui/ImGui/imstb_textedit.h → 3rd-party/ImGui/imstb_textedit.h vendored
View File

0
3rd-party/ImGui/ImGui/imstb_truetype.h → 3rd-party/ImGui/imstb_truetype.h vendored
View File

10
project/Easy2D.sln
View File

@ -12,8 +12,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Box2D", "..\3rd-party\box2d
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Box2DSample", "Box2DSample\Box2DSample.vcxproj", "{324CFF47-4EB2-499A-BE5F-53A82E3BA14B}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Box2DSample", "Box2DSample\Box2DSample.vcxproj", "{324CFF47-4EB2-499A-BE5F-53A82E3BA14B}"
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ImGui", "..\3rd-party\ImGui\ImGui.vcxproj", "{AA7C72A9-DDBF-4398-A301-8EE157E37D4C}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ImGuiSample", "ImGuiSample\ImGuiSample.vcxproj", "{6152D36C-EA40-4968-A696-244B6CA58395}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ImGuiSample", "ImGuiSample\ImGuiSample.vcxproj", "{6152D36C-EA40-4968-A696-244B6CA58395}"
EndProject EndProject
Global Global
@ -66,14 +64,6 @@ Global
{324CFF47-4EB2-499A-BE5F-53A82E3BA14B}.Release|Win32.Build.0 = Release|Win32 {324CFF47-4EB2-499A-BE5F-53A82E3BA14B}.Release|Win32.Build.0 = Release|Win32
{324CFF47-4EB2-499A-BE5F-53A82E3BA14B}.Release|x64.ActiveCfg = Release|x64 {324CFF47-4EB2-499A-BE5F-53A82E3BA14B}.Release|x64.ActiveCfg = Release|x64
{324CFF47-4EB2-499A-BE5F-53A82E3BA14B}.Release|x64.Build.0 = Release|x64 {324CFF47-4EB2-499A-BE5F-53A82E3BA14B}.Release|x64.Build.0 = Release|x64
{AA7C72A9-DDBF-4398-A301-8EE157E37D4C}.Debug|Win32.ActiveCfg = Debug|Win32
{AA7C72A9-DDBF-4398-A301-8EE157E37D4C}.Debug|Win32.Build.0 = Debug|Win32
{AA7C72A9-DDBF-4398-A301-8EE157E37D4C}.Debug|x64.ActiveCfg = Debug|x64
{AA7C72A9-DDBF-4398-A301-8EE157E37D4C}.Debug|x64.Build.0 = Debug|x64
{AA7C72A9-DDBF-4398-A301-8EE157E37D4C}.Release|Win32.ActiveCfg = Release|Win32
{AA7C72A9-DDBF-4398-A301-8EE157E37D4C}.Release|Win32.Build.0 = Release|Win32
{AA7C72A9-DDBF-4398-A301-8EE157E37D4C}.Release|x64.ActiveCfg = Release|x64
{AA7C72A9-DDBF-4398-A301-8EE157E37D4C}.Release|x64.Build.0 = Release|x64
{6152D36C-EA40-4968-A696-244B6CA58395}.Debug|Win32.ActiveCfg = Debug|Win32 {6152D36C-EA40-4968-A696-244B6CA58395}.Debug|Win32.ActiveCfg = Debug|Win32
{6152D36C-EA40-4968-A696-244B6CA58395}.Debug|Win32.Build.0 = Debug|Win32 {6152D36C-EA40-4968-A696-244B6CA58395}.Debug|Win32.Build.0 = Debug|Win32
{6152D36C-EA40-4968-A696-244B6CA58395}.Debug|x64.ActiveCfg = Debug|x64 {6152D36C-EA40-4968-A696-244B6CA58395}.Debug|x64.ActiveCfg = Debug|x64

13
project/ImGuiSample/ImGuiSample.vcxproj
View File

@ -132,18 +132,25 @@
</Link> </Link>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="..\..\3rd-party\ImGui\imgui.cpp" />
<ClCompile Include="..\..\3rd-party\ImGui\imgui_demo.cpp" />
<ClCompile Include="..\..\3rd-party\ImGui\imgui_draw.cpp" />
<ClCompile Include="..\..\3rd-party\ImGui\imgui_widgets.cpp" />
<ClCompile Include="imgui_impl_dx11.cpp" /> <ClCompile Include="imgui_impl_dx11.cpp" />
<ClCompile Include="imgui_impl_win32.cpp" /> <ClCompile Include="imgui_impl_win32.cpp" />
<ClCompile Include="main.cpp" /> <ClCompile Include="main.cpp" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="..\..\3rd-party\ImGui\imconfig.h" />
<ClInclude Include="..\..\3rd-party\ImGui\imgui.h" />
<ClInclude Include="..\..\3rd-party\ImGui\imgui_internal.h" />
<ClInclude Include="..\..\3rd-party\ImGui\imstb_rectpack.h" />
<ClInclude Include="..\..\3rd-party\ImGui\imstb_textedit.h" />
<ClInclude Include="..\..\3rd-party\ImGui\imstb_truetype.h" />
<ClInclude Include="imgui_impl_dx11.h" /> <ClInclude Include="imgui_impl_dx11.h" />
<ClInclude Include="imgui_impl_win32.h" /> <ClInclude Include="imgui_impl_win32.h" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\..\3rd-party\ImGui\ImGui.vcxproj">
<Project>{aa7c72a9-ddbf-4398-a301-8ee157e37d4c}</Project>
</ProjectReference>
<ProjectReference Include="..\Easy2D\Easy2D.vcxproj"> <ProjectReference Include="..\Easy2D\Easy2D.vcxproj">
<Project>{ff7f943d-a89c-4e6c-97cf-84f7d8ff8edf}</Project> <Project>{ff7f943d-a89c-4e6c-97cf-84f7d8ff8edf}</Project>
</ProjectReference> </ProjectReference>

35
project/ImGuiSample/ImGuiSample.vcxproj.filters
View File

@ -4,9 +4,44 @@
<ClCompile Include="main.cpp" /> <ClCompile Include="main.cpp" />
<ClCompile Include="imgui_impl_win32.cpp" /> <ClCompile Include="imgui_impl_win32.cpp" />
<ClCompile Include="imgui_impl_dx11.cpp" /> <ClCompile Include="imgui_impl_dx11.cpp" />
<ClCompile Include="..\..\3rd-party\ImGui\imgui.cpp">
<Filter>imgui</Filter>
</ClCompile>
<ClCompile Include="..\..\3rd-party\ImGui\imgui_demo.cpp">
<Filter>imgui</Filter>
</ClCompile>
<ClCompile Include="..\..\3rd-party\ImGui\imgui_draw.cpp">
<Filter>imgui</Filter>
</ClCompile>
<ClCompile Include="..\..\3rd-party\ImGui\imgui_widgets.cpp">
<Filter>imgui</Filter>
</ClCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="imgui_impl_win32.h" /> <ClInclude Include="imgui_impl_win32.h" />
<ClInclude Include="imgui_impl_dx11.h" /> <ClInclude Include="imgui_impl_dx11.h" />
<ClInclude Include="..\..\3rd-party\ImGui\imconfig.h">
<Filter>imgui</Filter>
</ClInclude>
<ClInclude Include="..\..\3rd-party\ImGui\imgui.h">
<Filter>imgui</Filter>
</ClInclude>
<ClInclude Include="..\..\3rd-party\ImGui\imgui_internal.h">
<Filter>imgui</Filter>
</ClInclude>
<ClInclude Include="..\..\3rd-party\ImGui\imstb_rectpack.h">
<Filter>imgui</Filter>
</ClInclude>
<ClInclude Include="..\..\3rd-party\ImGui\imstb_textedit.h">
<Filter>imgui</Filter>
</ClInclude>
<ClInclude Include="..\..\3rd-party\ImGui\imstb_truetype.h">
<Filter>imgui</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<Filter Include="imgui">
<UniqueIdentifier>{24ae99cd-ee12-481f-bb03-d8be40d99342}</UniqueIdentifier>
</Filter>
</ItemGroup> </ItemGroup>
</Project> </Project>

2
project/ImGuiSample/imgui_impl_dx11.cpp
View File

@ -1,6 +1,6 @@
// dear imgui: Renderer for Easy2D (DirectX11) // dear imgui: Renderer for Easy2D (DirectX11)
#include "imgui/imgui.h" #include "imgui.h"
#include "imgui_impl_dx11.h" #include "imgui_impl_dx11.h"
// DirectX // DirectX

2
project/ImGuiSample/imgui_impl_win32.cpp
View File

@ -1,7 +1,7 @@
// dear imgui: Platform Binding for Windows (standard windows API for 32 and 64 bits applications) // dear imgui: Platform Binding for Windows (standard windows API for 32 and 64 bits applications)
// This needs to be used along with a Renderer (e.g. DirectX11, OpenGL3, Vulkan..) // This needs to be used along with a Renderer (e.g. DirectX11, OpenGL3, Vulkan..)
#include "imgui/imgui.h" #include "imgui.h"
#include "imgui_impl_win32.h" #include "imgui_impl_win32.h"
#ifndef WIN32_LEAN_AND_MEAN #ifndef WIN32_LEAN_AND_MEAN
#define WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN

2
project/ImGuiSample/main.cpp
View File

@ -1,5 +1,5 @@
// ImGui // ImGui
#include "imgui/imgui.h" #include "imgui.h"
#include "imgui_impl_win32.h" #include "imgui_impl_win32.h"
#include "imgui_impl_dx11.h" #include "imgui_impl_dx11.h"
#include <tchar.h> #include <tchar.h>