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

refactoring project

This commit is contained in:
Nomango 2019-09-30 10:59:04 +08:00
parent 57ceb53f68
commit b590497d25
58 changed files with 207 additions and 566 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
projects/Kiwano.sln
View File

@ -13,44 +13,26 @@ EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32 Debug|Win32 = Debug|Win32
Debug|x64 = Debug|x64
Release|Win32 = Release|Win32 Release|Win32 = Release|Win32
Release|x64 = Release|x64
EndGlobalSection EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution GlobalSection(ProjectConfigurationPlatforms) = postSolution
{FF7F943D-A89C-4E6C-97CF-84F7D8FF8EDF}.Debug|Win32.ActiveCfg = Debug|Win32 {FF7F943D-A89C-4E6C-97CF-84F7D8FF8EDF}.Debug|Win32.ActiveCfg = Debug|Win32
{FF7F943D-A89C-4E6C-97CF-84F7D8FF8EDF}.Debug|Win32.Build.0 = Debug|Win32 {FF7F943D-A89C-4E6C-97CF-84F7D8FF8EDF}.Debug|Win32.Build.0 = Debug|Win32
{FF7F943D-A89C-4E6C-97CF-84F7D8FF8EDF}.Debug|Win32.Deploy.0 = Debug|Win32 {FF7F943D-A89C-4E6C-97CF-84F7D8FF8EDF}.Debug|Win32.Deploy.0 = Debug|Win32
{FF7F943D-A89C-4E6C-97CF-84F7D8FF8EDF}.Debug|x64.ActiveCfg = Debug|x64
{FF7F943D-A89C-4E6C-97CF-84F7D8FF8EDF}.Debug|x64.Build.0 = Debug|x64
{FF7F943D-A89C-4E6C-97CF-84F7D8FF8EDF}.Release|Win32.ActiveCfg = Release|Win32 {FF7F943D-A89C-4E6C-97CF-84F7D8FF8EDF}.Release|Win32.ActiveCfg = Release|Win32
{FF7F943D-A89C-4E6C-97CF-84F7D8FF8EDF}.Release|Win32.Build.0 = Release|Win32 {FF7F943D-A89C-4E6C-97CF-84F7D8FF8EDF}.Release|Win32.Build.0 = Release|Win32
{FF7F943D-A89C-4E6C-97CF-84F7D8FF8EDF}.Release|x64.ActiveCfg = Release|x64
{FF7F943D-A89C-4E6C-97CF-84F7D8FF8EDF}.Release|x64.Build.0 = Release|x64
{1B97937D-8184-426C-BE71-29A163DC76C9}.Debug|Win32.ActiveCfg = Debug|Win32 {1B97937D-8184-426C-BE71-29A163DC76C9}.Debug|Win32.ActiveCfg = Debug|Win32
{1B97937D-8184-426C-BE71-29A163DC76C9}.Debug|Win32.Build.0 = Debug|Win32 {1B97937D-8184-426C-BE71-29A163DC76C9}.Debug|Win32.Build.0 = Debug|Win32
{1B97937D-8184-426C-BE71-29A163DC76C9}.Debug|x64.ActiveCfg = Debug|x64
{1B97937D-8184-426C-BE71-29A163DC76C9}.Debug|x64.Build.0 = Debug|x64
{1B97937D-8184-426C-BE71-29A163DC76C9}.Release|Win32.ActiveCfg = Release|Win32 {1B97937D-8184-426C-BE71-29A163DC76C9}.Release|Win32.ActiveCfg = Release|Win32
{1B97937D-8184-426C-BE71-29A163DC76C9}.Release|Win32.Build.0 = Release|Win32 {1B97937D-8184-426C-BE71-29A163DC76C9}.Release|Win32.Build.0 = Release|Win32
{1B97937D-8184-426C-BE71-29A163DC76C9}.Release|x64.ActiveCfg = Release|x64
{1B97937D-8184-426C-BE71-29A163DC76C9}.Release|x64.Build.0 = Release|x64
{69DFBE92-C06F-4CF8-9495-CA9BF2E3BAF2}.Debug|Win32.ActiveCfg = Debug|Win32 {69DFBE92-C06F-4CF8-9495-CA9BF2E3BAF2}.Debug|Win32.ActiveCfg = Debug|Win32
{69DFBE92-C06F-4CF8-9495-CA9BF2E3BAF2}.Debug|Win32.Build.0 = Debug|Win32 {69DFBE92-C06F-4CF8-9495-CA9BF2E3BAF2}.Debug|Win32.Build.0 = Debug|Win32
{69DFBE92-C06F-4CF8-9495-CA9BF2E3BAF2}.Debug|x64.ActiveCfg = Debug|x64
{69DFBE92-C06F-4CF8-9495-CA9BF2E3BAF2}.Debug|x64.Build.0 = Debug|x64
{69DFBE92-C06F-4CF8-9495-CA9BF2E3BAF2}.Release|Win32.ActiveCfg = Release|Win32 {69DFBE92-C06F-4CF8-9495-CA9BF2E3BAF2}.Release|Win32.ActiveCfg = Release|Win32
{69DFBE92-C06F-4CF8-9495-CA9BF2E3BAF2}.Release|Win32.Build.0 = Release|Win32 {69DFBE92-C06F-4CF8-9495-CA9BF2E3BAF2}.Release|Win32.Build.0 = Release|Win32
{69DFBE92-C06F-4CF8-9495-CA9BF2E3BAF2}.Release|x64.ActiveCfg = Release|x64
{69DFBE92-C06F-4CF8-9495-CA9BF2E3BAF2}.Release|x64.Build.0 = Release|x64
{A7062ED8-8910-48A5-A3BC-C1612672571F}.Debug|Win32.ActiveCfg = Debug|Win32 {A7062ED8-8910-48A5-A3BC-C1612672571F}.Debug|Win32.ActiveCfg = Debug|Win32
{A7062ED8-8910-48A5-A3BC-C1612672571F}.Debug|Win32.Build.0 = Debug|Win32 {A7062ED8-8910-48A5-A3BC-C1612672571F}.Debug|Win32.Build.0 = Debug|Win32
{A7062ED8-8910-48A5-A3BC-C1612672571F}.Debug|x64.ActiveCfg = Debug|x64
{A7062ED8-8910-48A5-A3BC-C1612672571F}.Debug|x64.Build.0 = Debug|x64
{A7062ED8-8910-48A5-A3BC-C1612672571F}.Release|Win32.ActiveCfg = Release|Win32 {A7062ED8-8910-48A5-A3BC-C1612672571F}.Release|Win32.ActiveCfg = Release|Win32
{A7062ED8-8910-48A5-A3BC-C1612672571F}.Release|Win32.Build.0 = Release|Win32 {A7062ED8-8910-48A5-A3BC-C1612672571F}.Release|Win32.Build.0 = Release|Win32
{A7062ED8-8910-48A5-A3BC-C1612672571F}.Release|x64.ActiveCfg = Release|x64
{A7062ED8-8910-48A5-A3BC-C1612672571F}.Release|x64.Build.0 = Release|x64
EndGlobalSection EndGlobalSection
GlobalSection(SolutionProperties) = preSolution GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE HideSolutionNode = FALSE

76
projects/kiwano-audio/kiwano-audio.vcxproj
View File

@ -24,14 +24,6 @@
<Configuration>Release</Configuration> <Configuration>Release</Configuration>
<Platform>Win32</Platform> <Platform>Win32</Platform>
</ProjectConfiguration> </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>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\kiwano\kiwano.vcxproj"> <ProjectReference Include="..\kiwano\kiwano.vcxproj">
@ -56,19 +48,6 @@
<CharacterSet>Unicode</CharacterSet> <CharacterSet>Unicode</CharacterSet>
<PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset> <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<CharacterSet>Unicode</CharacterSet>
<PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
<PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings"> <ImportGroup Label="ExtensionSettings">
</ImportGroup> </ImportGroup>
@ -80,12 +59,6 @@
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <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" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup> </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 Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<OutDir>$(SolutionDir)\output\$(PlatformToolset)\$(Platform)\$(Configuration)\</OutDir> <OutDir>$(SolutionDir)\output\$(PlatformToolset)\$(Platform)\$(Configuration)\</OutDir>
@ -97,16 +70,6 @@
<IntDir>$(SolutionDir)\build\$(PlatformToolset)\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir> <IntDir>$(SolutionDir)\build\$(PlatformToolset)\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
<LinkIncremental>true</LinkIncremental> <LinkIncremental>true</LinkIncremental>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<OutDir>$(SolutionDir)\output\$(PlatformToolset)\$(Platform)\$(Configuration)\</OutDir>
<IntDir>$(SolutionDir)\build\$(PlatformToolset)\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
<LinkIncremental>true</LinkIncremental>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<OutDir>$(SolutionDir)\output\$(PlatformToolset)\$(Platform)\$(Configuration)\</OutDir>
<IntDir>$(SolutionDir)\build\$(PlatformToolset)\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
<LinkIncremental>true</LinkIncremental>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile> <ClCompile>
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
@ -114,7 +77,7 @@
<TreatWarningAsError>true</TreatWarningAsError> <TreatWarningAsError>true</TreatWarningAsError>
<DebugInformationFormat>EditAndContinue</DebugInformationFormat> <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<AdditionalIncludeDirectories>../../src/</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>../../src;../../src/3rd-party;</AdditionalIncludeDirectories>
<MinimalRebuild>false</MinimalRebuild> <MinimalRebuild>false</MinimalRebuild>
</ClCompile> </ClCompile>
<Link> <Link>
@ -132,42 +95,7 @@
<TreatWarningAsError>true</TreatWarningAsError> <TreatWarningAsError>true</TreatWarningAsError>
<DebugInformationFormat>EditAndContinue</DebugInformationFormat> <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<AdditionalIncludeDirectories>../../src/</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>../../src;../../src/3rd-party;</AdditionalIncludeDirectories>
<MinimalRebuild>false</MinimalRebuild>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>false</GenerateDebugInformation>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<TreatWarningAsError>true</TreatWarningAsError>
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<AdditionalIncludeDirectories>../../src/</AdditionalIncludeDirectories>
<MinimalRebuild>false</MinimalRebuild>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<BufferSecurityCheck>false</BufferSecurityCheck>
<TreatWarningAsError>true</TreatWarningAsError>
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<AdditionalIncludeDirectories>../../src/</AdditionalIncludeDirectories>
<MinimalRebuild>false</MinimalRebuild> <MinimalRebuild>false</MinimalRebuild>
</ClCompile> </ClCompile>
<Link> <Link>

96
projects/kiwano-imgui/kiwano-imgui.vcxproj
View File

@ -7,22 +7,22 @@
<ClInclude Include="..\..\src\kiwano-imgui\src\imgui_impl.h" /> <ClInclude Include="..\..\src\kiwano-imgui\src\imgui_impl.h" />
<ClInclude Include="..\..\src\kiwano-imgui\src\imgui_impl_dx10.h" /> <ClInclude Include="..\..\src\kiwano-imgui\src\imgui_impl_dx10.h" />
<ClInclude Include="..\..\src\kiwano-imgui\src\imgui_impl_dx11.h" /> <ClInclude Include="..\..\src\kiwano-imgui\src\imgui_impl_dx11.h" />
<ClInclude Include="..\..\src\kiwano-imgui\third-party\ImGui\imconfig.h" /> <ClInclude Include="..\..\src\3rd-party\imgui\imconfig.h" />
<ClInclude Include="..\..\src\kiwano-imgui\third-party\ImGui\imgui.h" /> <ClInclude Include="..\..\src\3rd-party\imgui\imgui.h" />
<ClInclude Include="..\..\src\kiwano-imgui\third-party\ImGui\imgui_internal.h" /> <ClInclude Include="..\..\src\3rd-party\imgui\imgui_internal.h" />
<ClInclude Include="..\..\src\kiwano-imgui\third-party\ImGui\imstb_rectpack.h" /> <ClInclude Include="..\..\src\3rd-party\imgui\imstb_rectpack.h" />
<ClInclude Include="..\..\src\kiwano-imgui\third-party\ImGui\imstb_textedit.h" /> <ClInclude Include="..\..\src\3rd-party\imgui\imstb_textedit.h" />
<ClInclude Include="..\..\src\kiwano-imgui\third-party\ImGui\imstb_truetype.h" /> <ClInclude Include="..\..\src\3rd-party\imgui\imstb_truetype.h" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="..\..\src\kiwano-imgui\src\ImGuiLayer.cpp" /> <ClCompile Include="..\..\src\kiwano-imgui\src\ImGuiLayer.cpp" />
<ClCompile Include="..\..\src\kiwano-imgui\src\ImGuiModule.cpp" /> <ClCompile Include="..\..\src\kiwano-imgui\src\ImGuiModule.cpp" />
<ClCompile Include="..\..\src\kiwano-imgui\src\imgui_impl_dx10.cpp" /> <ClCompile Include="..\..\src\kiwano-imgui\src\imgui_impl_dx10.cpp" />
<ClCompile Include="..\..\src\kiwano-imgui\src\imgui_impl_dx11.cpp" /> <ClCompile Include="..\..\src\kiwano-imgui\src\imgui_impl_dx11.cpp" />
<ClCompile Include="..\..\src\kiwano-imgui\third-party\ImGui\imgui.cpp" /> <ClCompile Include="..\..\src\3rd-party\imgui\imgui.cpp" />
<ClCompile Include="..\..\src\kiwano-imgui\third-party\ImGui\imgui_demo.cpp" /> <ClCompile Include="..\..\src\3rd-party\imgui\imgui_demo.cpp" />
<ClCompile Include="..\..\src\kiwano-imgui\third-party\ImGui\imgui_draw.cpp" /> <ClCompile Include="..\..\src\3rd-party\imgui\imgui_draw.cpp" />
<ClCompile Include="..\..\src\kiwano-imgui\third-party\ImGui\imgui_widgets.cpp" /> <ClCompile Include="..\..\src\3rd-party\imgui\imgui_widgets.cpp" />
</ItemGroup> </ItemGroup>
<ItemGroup Label="ProjectConfigurations"> <ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32"> <ProjectConfiguration Include="Debug|Win32">
@ -33,14 +33,6 @@
<Configuration>Release</Configuration> <Configuration>Release</Configuration>
<Platform>Win32</Platform> <Platform>Win32</Platform>
</ProjectConfiguration> </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>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\kiwano\kiwano.vcxproj"> <ProjectReference Include="..\kiwano\kiwano.vcxproj">
@ -65,19 +57,6 @@
<CharacterSet>Unicode</CharacterSet> <CharacterSet>Unicode</CharacterSet>
<PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset> <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<CharacterSet>Unicode</CharacterSet>
<PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
<PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings"> <ImportGroup Label="ExtensionSettings">
</ImportGroup> </ImportGroup>
@ -89,12 +68,6 @@
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <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" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup> </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 Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<OutDir>$(SolutionDir)\output\$(PlatformToolset)\$(Platform)\$(Configuration)\</OutDir> <OutDir>$(SolutionDir)\output\$(PlatformToolset)\$(Platform)\$(Configuration)\</OutDir>
@ -106,16 +79,6 @@
<IntDir>$(SolutionDir)\build\$(PlatformToolset)\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir> <IntDir>$(SolutionDir)\build\$(PlatformToolset)\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
<LinkIncremental>true</LinkIncremental> <LinkIncremental>true</LinkIncremental>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<OutDir>$(SolutionDir)\output\$(PlatformToolset)\$(Platform)\$(Configuration)\</OutDir>
<IntDir>$(SolutionDir)\build\$(PlatformToolset)\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
<LinkIncremental>true</LinkIncremental>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<OutDir>$(SolutionDir)\output\$(PlatformToolset)\$(Platform)\$(Configuration)\</OutDir>
<IntDir>$(SolutionDir)\build\$(PlatformToolset)\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
<LinkIncremental>true</LinkIncremental>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile> <ClCompile>
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
@ -123,7 +86,7 @@
<TreatWarningAsError>true</TreatWarningAsError> <TreatWarningAsError>true</TreatWarningAsError>
<DebugInformationFormat>EditAndContinue</DebugInformationFormat> <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<AdditionalIncludeDirectories>../../src/</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>../../src;../../src/3rd-party;</AdditionalIncludeDirectories>
<MinimalRebuild>false</MinimalRebuild> <MinimalRebuild>false</MinimalRebuild>
</ClCompile> </ClCompile>
<Link> <Link>
@ -141,42 +104,7 @@
<TreatWarningAsError>true</TreatWarningAsError> <TreatWarningAsError>true</TreatWarningAsError>
<DebugInformationFormat>EditAndContinue</DebugInformationFormat> <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<AdditionalIncludeDirectories>../../src/</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>../../src;../../src/3rd-party;</AdditionalIncludeDirectories>
<MinimalRebuild>false</MinimalRebuild>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>false</GenerateDebugInformation>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<TreatWarningAsError>true</TreatWarningAsError>
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<AdditionalIncludeDirectories>../../src/</AdditionalIncludeDirectories>
<MinimalRebuild>false</MinimalRebuild>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<BufferSecurityCheck>false</BufferSecurityCheck>
<TreatWarningAsError>true</TreatWarningAsError>
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<AdditionalIncludeDirectories>../../src/</AdditionalIncludeDirectories>
<MinimalRebuild>false</MinimalRebuild> <MinimalRebuild>false</MinimalRebuild>
</ClCompile> </ClCompile>
<Link> <Link>

44
projects/kiwano-imgui/kiwano-imgui.vcxproj.filters
View File

@ -4,10 +4,10 @@
<Filter Include="src"> <Filter Include="src">
<UniqueIdentifier>{ed21cd51-048d-4bbc-804a-d09a8afa1423}</UniqueIdentifier> <UniqueIdentifier>{ed21cd51-048d-4bbc-804a-d09a8afa1423}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="third-party"> <Filter Include="3rd-party">
<UniqueIdentifier>{f737b6d4-4462-49c1-8e9d-5c834bed598f}</UniqueIdentifier> <UniqueIdentifier>{f737b6d4-4462-49c1-8e9d-5c834bed598f}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="third-party\ImGui"> <Filter Include="3rd-party\imgui">
<UniqueIdentifier>{5b9d2eaa-0247-4ef5-8410-3221821b1221}</UniqueIdentifier> <UniqueIdentifier>{5b9d2eaa-0247-4ef5-8410-3221821b1221}</UniqueIdentifier>
</Filter> </Filter>
</ItemGroup> </ItemGroup>
@ -21,23 +21,23 @@
<ClInclude Include="..\..\src\kiwano-imgui\src\ImGuiLayer.h"> <ClInclude Include="..\..\src\kiwano-imgui\src\ImGuiLayer.h">
<Filter>src</Filter> <Filter>src</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\kiwano-imgui\third-party\ImGui\imconfig.h"> <ClInclude Include="..\..\src\3rd-party\imgui\imconfig.h">
<Filter>third-party\ImGui</Filter> <Filter>3rd-party\imgui</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\kiwano-imgui\third-party\ImGui\imgui.h"> <ClInclude Include="..\..\src\3rd-party\imgui\imgui.h">
<Filter>third-party\ImGui</Filter> <Filter>3rd-party\imgui</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\kiwano-imgui\third-party\ImGui\imgui_internal.h"> <ClInclude Include="..\..\src\3rd-party\imgui\imgui_internal.h">
<Filter>third-party\ImGui</Filter> <Filter>3rd-party\imgui</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\kiwano-imgui\third-party\ImGui\imstb_rectpack.h"> <ClInclude Include="..\..\src\3rd-party\imgui\imstb_rectpack.h">
<Filter>third-party\ImGui</Filter> <Filter>3rd-party\imgui</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\kiwano-imgui\third-party\ImGui\imstb_textedit.h"> <ClInclude Include="..\..\src\3rd-party\imgui\imstb_textedit.h">
<Filter>third-party\ImGui</Filter> <Filter>3rd-party\imgui</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\kiwano-imgui\third-party\ImGui\imstb_truetype.h"> <ClInclude Include="..\..\src\3rd-party\imgui\imstb_truetype.h">
<Filter>third-party\ImGui</Filter> <Filter>3rd-party\imgui</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\kiwano-imgui\kiwano-imgui.h" /> <ClInclude Include="..\..\src\kiwano-imgui\kiwano-imgui.h" />
<ClInclude Include="..\..\src\kiwano-imgui\src\imgui_impl.h"> <ClInclude Include="..\..\src\kiwano-imgui\src\imgui_impl.h">
@ -57,17 +57,17 @@
<ClCompile Include="..\..\src\kiwano-imgui\src\ImGuiLayer.cpp"> <ClCompile Include="..\..\src\kiwano-imgui\src\ImGuiLayer.cpp">
<Filter>src</Filter> <Filter>src</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\src\kiwano-imgui\third-party\ImGui\imgui.cpp"> <ClCompile Include="..\..\src\3rd-party\imgui\imgui.cpp">
<Filter>third-party\ImGui</Filter> <Filter>3rd-party\imgui</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\src\kiwano-imgui\third-party\ImGui\imgui_demo.cpp"> <ClCompile Include="..\..\src\3rd-party\imgui\imgui_demo.cpp">
<Filter>third-party\ImGui</Filter> <Filter>3rd-party\imgui</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\src\kiwano-imgui\third-party\ImGui\imgui_draw.cpp"> <ClCompile Include="..\..\src\3rd-party\imgui\imgui_draw.cpp">
<Filter>third-party\ImGui</Filter> <Filter>3rd-party\imgui</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\src\kiwano-imgui\third-party\ImGui\imgui_widgets.cpp"> <ClCompile Include="..\..\src\3rd-party\imgui\imgui_widgets.cpp">
<Filter>third-party\ImGui</Filter> <Filter>3rd-party\imgui</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\src\kiwano-imgui\src\ImGuiModule.cpp"> <ClCompile Include="..\..\src\kiwano-imgui\src\ImGuiModule.cpp">
<Filter>src</Filter> <Filter>src</Filter>

84
projects/kiwano-network/kiwano-network.vcxproj
View File

@ -2,13 +2,13 @@
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup> <ItemGroup>
<ClInclude Include="..\..\src\kiwano-network\kiwano-network.h" /> <ClInclude Include="..\..\src\kiwano-network\kiwano-network.h" />
<ClInclude Include="..\..\src\kiwano-network\src\helper.h" />
<ClInclude Include="..\..\src\kiwano-network\src\HttpClient.h" /> <ClInclude Include="..\..\src\kiwano-network\src\HttpClient.h" />
<ClInclude Include="..\..\src\kiwano-network\src\HttpRequest.hpp" /> <ClInclude Include="..\..\src\kiwano-network\src\HttpRequest.h" />
<ClInclude Include="..\..\src\kiwano-network\src\HttpResponse.hpp" /> <ClInclude Include="..\..\src\kiwano-network\src\HttpResponse.h" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="..\..\src\kiwano-network\src\HttpClient.cpp" /> <ClCompile Include="..\..\src\kiwano-network\src\HttpClient.cpp" />
<ClCompile Include="..\..\src\kiwano-network\src\HttpRequest.cpp" />
</ItemGroup> </ItemGroup>
<ItemGroup Label="ProjectConfigurations"> <ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32"> <ProjectConfiguration Include="Debug|Win32">
@ -19,17 +19,9 @@
<Configuration>Release</Configuration> <Configuration>Release</Configuration>
<Platform>Win32</Platform> <Platform>Win32</Platform>
</ProjectConfiguration> </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>
<ItemGroup> <ItemGroup>
<Library Include="..\..\src\kiwano-network\third-party\libs\libcurl.lib" /> <Library Include="..\..\src\3rd-party\curl\libs\libcurl.lib" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\kiwano\kiwano.vcxproj"> <ProjectReference Include="..\kiwano\kiwano.vcxproj">
@ -54,19 +46,6 @@
<CharacterSet>Unicode</CharacterSet> <CharacterSet>Unicode</CharacterSet>
<PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset> <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<CharacterSet>Unicode</CharacterSet>
<PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
<PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings"> <ImportGroup Label="ExtensionSettings">
</ImportGroup> </ImportGroup>
@ -78,12 +57,6 @@
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <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" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup> </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 Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<OutDir>$(SolutionDir)\output\$(PlatformToolset)\$(Platform)\$(Configuration)\</OutDir> <OutDir>$(SolutionDir)\output\$(PlatformToolset)\$(Platform)\$(Configuration)\</OutDir>
@ -95,16 +68,6 @@
<IntDir>$(SolutionDir)\build\$(PlatformToolset)\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir> <IntDir>$(SolutionDir)\build\$(PlatformToolset)\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
<LinkIncremental>true</LinkIncremental> <LinkIncremental>true</LinkIncremental>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<OutDir>$(SolutionDir)\output\$(PlatformToolset)\$(Platform)\$(Configuration)\</OutDir>
<IntDir>$(SolutionDir)\build\$(PlatformToolset)\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
<LinkIncremental>true</LinkIncremental>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<OutDir>$(SolutionDir)\output\$(PlatformToolset)\$(Platform)\$(Configuration)\</OutDir>
<IntDir>$(SolutionDir)\build\$(PlatformToolset)\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
<LinkIncremental>true</LinkIncremental>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile> <ClCompile>
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
@ -112,7 +75,7 @@
<TreatWarningAsError>true</TreatWarningAsError> <TreatWarningAsError>true</TreatWarningAsError>
<DebugInformationFormat>EditAndContinue</DebugInformationFormat> <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<AdditionalIncludeDirectories>../../src/</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>../../src;../../src/3rd-party;</AdditionalIncludeDirectories>
<MinimalRebuild>false</MinimalRebuild> <MinimalRebuild>false</MinimalRebuild>
</ClCompile> </ClCompile>
<Link> <Link>
@ -130,42 +93,7 @@
<TreatWarningAsError>true</TreatWarningAsError> <TreatWarningAsError>true</TreatWarningAsError>
<DebugInformationFormat>EditAndContinue</DebugInformationFormat> <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<AdditionalIncludeDirectories>../../src/</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>../../src;../../src/3rd-party;</AdditionalIncludeDirectories>
<MinimalRebuild>false</MinimalRebuild>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>false</GenerateDebugInformation>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<TreatWarningAsError>true</TreatWarningAsError>
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<AdditionalIncludeDirectories>../../src/</AdditionalIncludeDirectories>
<MinimalRebuild>false</MinimalRebuild>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<BufferSecurityCheck>false</BufferSecurityCheck>
<TreatWarningAsError>true</TreatWarningAsError>
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<AdditionalIncludeDirectories>../../src/</AdditionalIncludeDirectories>
<MinimalRebuild>false</MinimalRebuild> <MinimalRebuild>false</MinimalRebuild>
</ClCompile> </ClCompile>
<Link> <Link>

12
projects/kiwano-network/kiwano-network.vcxproj.filters
View File

@ -2,16 +2,13 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup> <ItemGroup>
<ClInclude Include="..\..\src\kiwano-network\kiwano-network.h" /> <ClInclude Include="..\..\src\kiwano-network\kiwano-network.h" />
<ClInclude Include="..\..\src\kiwano-network\src\helper.h">
<Filter>src</Filter>
</ClInclude>
<ClInclude Include="..\..\src\kiwano-network\src\HttpClient.h"> <ClInclude Include="..\..\src\kiwano-network\src\HttpClient.h">
<Filter>src</Filter> <Filter>src</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\kiwano-network\src\HttpRequest.hpp"> <ClInclude Include="..\..\src\kiwano-network\src\HttpRequest.h">
<Filter>src</Filter> <Filter>src</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\kiwano-network\src\HttpResponse.hpp"> <ClInclude Include="..\..\src\kiwano-network\src\HttpResponse.h">
<Filter>src</Filter> <Filter>src</Filter>
</ClInclude> </ClInclude>
</ItemGroup> </ItemGroup>
@ -27,9 +24,12 @@
<ClCompile Include="..\..\src\kiwano-network\src\HttpClient.cpp"> <ClCompile Include="..\..\src\kiwano-network\src\HttpClient.cpp">
<Filter>src</Filter> <Filter>src</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\src\kiwano-network\src\HttpRequest.cpp">
<Filter>src</Filter>
</ClCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Library Include="..\..\src\kiwano-network\third-party\libs\libcurl.lib"> <Library Include="..\..\src\3rd-party\curl\libs\libcurl.lib">
<Filter>libs</Filter> <Filter>libs</Filter>
</Library> </Library>
</ItemGroup> </ItemGroup>

81
projects/kiwano/kiwano.vcxproj
View File

@ -13,6 +13,7 @@
<ClInclude Include="..\..\src\kiwano\2d\GifSprite.h" /> <ClInclude Include="..\..\src\kiwano\2d\GifSprite.h" />
<ClInclude Include="..\..\src\kiwano\base\Director.h" /> <ClInclude Include="..\..\src\kiwano\base\Director.h" />
<ClInclude Include="..\..\src\kiwano\base\win32\ComPtr.hpp" /> <ClInclude Include="..\..\src\kiwano\base\win32\ComPtr.hpp" />
<ClInclude Include="..\..\src\kiwano\base\win32\helper.h" />
<ClInclude Include="..\..\src\kiwano\core\basic_json.hpp" /> <ClInclude Include="..\..\src\kiwano\core\basic_json.hpp" />
<ClInclude Include="..\..\src\kiwano\core\function.hpp" /> <ClInclude Include="..\..\src\kiwano\core\function.hpp" />
<ClInclude Include="..\..\src\kiwano\core\core.h" /> <ClInclude Include="..\..\src\kiwano\core\core.h" />
@ -83,14 +84,14 @@
<ClInclude Include="..\..\src\kiwano\renderer\win32\D3DDeviceResourcesBase.h" /> <ClInclude Include="..\..\src\kiwano\renderer\win32\D3DDeviceResourcesBase.h" />
<ClInclude Include="..\..\src\kiwano\renderer\win32\FontCollectionLoader.h" /> <ClInclude Include="..\..\src\kiwano\renderer\win32\FontCollectionLoader.h" />
<ClInclude Include="..\..\src\kiwano\renderer\win32\TextRenderer.h" /> <ClInclude Include="..\..\src\kiwano\renderer\win32\TextRenderer.h" />
<ClInclude Include="..\..\src\kiwano\third-party\StackWalker\StackWalker.h" />
<ClInclude Include="..\..\src\kiwano\third-party\tinyxml2\tinyxml2.h" />
<ClInclude Include="..\..\src\kiwano\ui\Button.h" /> <ClInclude Include="..\..\src\kiwano\ui\Button.h" />
<ClInclude Include="..\..\src\kiwano\ui\Menu.h" /> <ClInclude Include="..\..\src\kiwano\ui\Menu.h" />
<ClInclude Include="..\..\src\kiwano\utils\DataUtil.h" /> <ClInclude Include="..\..\src\kiwano\utils\DataUtil.h" />
<ClInclude Include="..\..\src\kiwano\utils\FileUtil.h" /> <ClInclude Include="..\..\src\kiwano\utils\FileUtil.h" />
<ClInclude Include="..\..\src\kiwano\utils\Path.h" /> <ClInclude Include="..\..\src\kiwano\utils\Path.h" />
<ClInclude Include="..\..\src\kiwano\utils\ResourceCache.h" /> <ClInclude Include="..\..\src\kiwano\utils\ResourceCache.h" />
<ClInclude Include="..\..\src\3rd-party\StackWalker\StackWalker.h" />
<ClInclude Include="..\..\src\3rd-party\tinyxml2\tinyxml2.h" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="..\..\src\kiwano\2d\action\Action.cpp" /> <ClCompile Include="..\..\src\kiwano\2d\action\Action.cpp" />
@ -145,14 +146,14 @@
<ClCompile Include="..\..\src\kiwano\renderer\win32\D3D11DeviceResources.cpp" /> <ClCompile Include="..\..\src\kiwano\renderer\win32\D3D11DeviceResources.cpp" />
<ClCompile Include="..\..\src\kiwano\renderer\win32\FontCollectionLoader.cpp" /> <ClCompile Include="..\..\src\kiwano\renderer\win32\FontCollectionLoader.cpp" />
<ClCompile Include="..\..\src\kiwano\renderer\win32\TextRenderer.cpp" /> <ClCompile Include="..\..\src\kiwano\renderer\win32\TextRenderer.cpp" />
<ClCompile Include="..\..\src\kiwano\third-party\StackWalker\StackWalker.cpp" />
<ClCompile Include="..\..\src\kiwano\third-party\tinyxml2\tinyxml2.cpp" />
<ClCompile Include="..\..\src\kiwano\ui\Button.cpp" /> <ClCompile Include="..\..\src\kiwano\ui\Button.cpp" />
<ClCompile Include="..\..\src\kiwano\ui\Menu.cpp" /> <ClCompile Include="..\..\src\kiwano\ui\Menu.cpp" />
<ClCompile Include="..\..\src\kiwano\utils\DataUtil.cpp" /> <ClCompile Include="..\..\src\kiwano\utils\DataUtil.cpp" />
<ClCompile Include="..\..\src\kiwano\utils\FileUtil.cpp" /> <ClCompile Include="..\..\src\kiwano\utils\FileUtil.cpp" />
<ClCompile Include="..\..\src\kiwano\utils\Path.cpp" /> <ClCompile Include="..\..\src\kiwano\utils\Path.cpp" />
<ClCompile Include="..\..\src\kiwano\utils\ResourceCache.cpp" /> <ClCompile Include="..\..\src\kiwano\utils\ResourceCache.cpp" />
<ClCompile Include="..\..\src\3rd-party\StackWalker\StackWalker.cpp" />
<ClCompile Include="..\..\src\3rd-party\tinyxml2\tinyxml2.cpp" />
</ItemGroup> </ItemGroup>
<ItemGroup Label="ProjectConfigurations"> <ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32"> <ProjectConfiguration Include="Debug|Win32">
@ -163,14 +164,6 @@
<Configuration>Release</Configuration> <Configuration>Release</Configuration>
<Platform>Win32</Platform> <Platform>Win32</Platform>
</ProjectConfiguration> </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>
<PropertyGroup Label="Globals"> <PropertyGroup Label="Globals">
<ProjectGuid>{FF7F943D-A89C-4E6C-97CF-84F7D8FF8EDF}</ProjectGuid> <ProjectGuid>{FF7F943D-A89C-4E6C-97CF-84F7D8FF8EDF}</ProjectGuid>
@ -190,19 +183,6 @@
<CharacterSet>Unicode</CharacterSet> <CharacterSet>Unicode</CharacterSet>
<PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset> <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<CharacterSet>Unicode</CharacterSet>
<PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
<PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings"> <ImportGroup Label="ExtensionSettings">
</ImportGroup> </ImportGroup>
@ -212,12 +192,6 @@
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <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" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup> </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 Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<OutDir>$(SolutionDir)\output\$(PlatformToolset)\$(Platform)\$(Configuration)\</OutDir> <OutDir>$(SolutionDir)\output\$(PlatformToolset)\$(Platform)\$(Configuration)\</OutDir>
@ -229,16 +203,6 @@
<IntDir>$(SolutionDir)\build\$(PlatformToolset)\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir> <IntDir>$(SolutionDir)\build\$(PlatformToolset)\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
<LinkIncremental>true</LinkIncremental> <LinkIncremental>true</LinkIncremental>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<OutDir>$(SolutionDir)\output\$(PlatformToolset)\$(Platform)\$(Configuration)\</OutDir>
<IntDir>$(SolutionDir)\build\$(PlatformToolset)\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
<LinkIncremental>true</LinkIncremental>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<OutDir>$(SolutionDir)\output\$(PlatformToolset)\$(Platform)\$(Configuration)\</OutDir>
<IntDir>$(SolutionDir)\build\$(PlatformToolset)\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
<LinkIncremental>true</LinkIncremental>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile> <ClCompile>
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
@ -247,6 +211,7 @@
<DebugInformationFormat>EditAndContinue</DebugInformationFormat> <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<MinimalRebuild>false</MinimalRebuild> <MinimalRebuild>false</MinimalRebuild>
<AdditionalIncludeDirectories>../../src;../../src/3rd-party;</AdditionalIncludeDirectories>
</ClCompile> </ClCompile>
<Link> <Link>
<SubSystem>Windows</SubSystem> <SubSystem>Windows</SubSystem>
@ -264,39 +229,7 @@
<DebugInformationFormat>EditAndContinue</DebugInformationFormat> <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<MinimalRebuild>false</MinimalRebuild> <MinimalRebuild>false</MinimalRebuild>
</ClCompile> <AdditionalIncludeDirectories>../../src;../../src/3rd-party;</AdditionalIncludeDirectories>
<Link>
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>false</GenerateDebugInformation>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<TreatWarningAsError>true</TreatWarningAsError>
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<MinimalRebuild>false</MinimalRebuild>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<BufferSecurityCheck>false</BufferSecurityCheck>
<TreatWarningAsError>true</TreatWarningAsError>
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<MinimalRebuild>false</MinimalRebuild>
</ClCompile> </ClCompile>
<Link> <Link>
<SubSystem>Windows</SubSystem> <SubSystem>Windows</SubSystem>

45
projects/kiwano/kiwano.vcxproj.filters
View File

@ -22,15 +22,6 @@
<Filter Include="renderer"> <Filter Include="renderer">
<UniqueIdentifier>{7897afce-24cb-42b4-9443-56508e4ec89c}</UniqueIdentifier> <UniqueIdentifier>{7897afce-24cb-42b4-9443-56508e4ec89c}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="third-party">
<UniqueIdentifier>{91029e1e-40c2-40d9-bfc4-a51d9df02b80}</UniqueIdentifier>
</Filter>
<Filter Include="third-party\StackWalker">
<UniqueIdentifier>{1fec4835-63a1-4612-80b5-828dadf0ac63}</UniqueIdentifier>
</Filter>
<Filter Include="third-party\tinyxml2">
<UniqueIdentifier>{0cae76f7-7016-4a45-bb26-a130fbce8024}</UniqueIdentifier>
</Filter>
<Filter Include="2d\action"> <Filter Include="2d\action">
<UniqueIdentifier>{9314f30d-5742-48b6-94e5-e3b4284106f6}</UniqueIdentifier> <UniqueIdentifier>{9314f30d-5742-48b6-94e5-e3b4284106f6}</UniqueIdentifier>
</Filter> </Filter>
@ -43,6 +34,15 @@
<Filter Include="base\win32"> <Filter Include="base\win32">
<UniqueIdentifier>{192a47a9-9df6-4f40-a7d3-888eb00c53ac}</UniqueIdentifier> <UniqueIdentifier>{192a47a9-9df6-4f40-a7d3-888eb00c53ac}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="3rd-party">
<UniqueIdentifier>{d2453005-418d-42a7-9dbd-5f29021d472c}</UniqueIdentifier>
</Filter>
<Filter Include="3rd-party\StackWalker">
<UniqueIdentifier>{7883b9c3-7251-4401-ac8f-a8d47191bc17}</UniqueIdentifier>
</Filter>
<Filter Include="3rd-party\tinyxml2">
<UniqueIdentifier>{5f00587e-28b0-4925-ad5d-ac5efab9c541}</UniqueIdentifier>
</Filter>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="..\..\src\kiwano\ui\Button.h"> <ClInclude Include="..\..\src\kiwano\ui\Button.h">
@ -138,18 +138,12 @@
<ClInclude Include="..\..\src\kiwano\base\AsyncTask.h"> <ClInclude Include="..\..\src\kiwano\base\AsyncTask.h">
<Filter>base</Filter> <Filter>base</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\kiwano\third-party\StackWalker\StackWalker.h">
<Filter>third-party\StackWalker</Filter>
</ClInclude>
<ClInclude Include="..\..\src\kiwano\utils\FileUtil.h"> <ClInclude Include="..\..\src\kiwano\utils\FileUtil.h">
<Filter>utils</Filter> <Filter>utils</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\kiwano\2d\GifSprite.h"> <ClInclude Include="..\..\src\kiwano\2d\GifSprite.h">
<Filter>2d</Filter> <Filter>2d</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\kiwano\third-party\tinyxml2\tinyxml2.h">
<Filter>third-party\tinyxml2</Filter>
</ClInclude>
<ClInclude Include="..\..\src\kiwano\base\Director.h"> <ClInclude Include="..\..\src\kiwano\base\Director.h">
<Filter>base</Filter> <Filter>base</Filter>
</ClInclude> </ClInclude>
@ -309,6 +303,15 @@
<ClInclude Include="..\..\src\kiwano\base\win32\ComPtr.hpp"> <ClInclude Include="..\..\src\kiwano\base\win32\ComPtr.hpp">
<Filter>base\win32</Filter> <Filter>base\win32</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\kiwano\base\win32\helper.h">
<Filter>base\win32</Filter>
</ClInclude>
<ClInclude Include="..\..\src\3rd-party\StackWalker\StackWalker.h">
<Filter>3rd-party\StackWalker</Filter>
</ClInclude>
<ClInclude Include="..\..\src\3rd-party\tinyxml2\tinyxml2.h">
<Filter>3rd-party\tinyxml2</Filter>
</ClInclude>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="..\..\src\kiwano\ui\Button.cpp"> <ClCompile Include="..\..\src\kiwano\ui\Button.cpp">
@ -368,18 +371,12 @@
<ClCompile Include="..\..\src\kiwano\base\AsyncTask.cpp"> <ClCompile Include="..\..\src\kiwano\base\AsyncTask.cpp">
<Filter>base</Filter> <Filter>base</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\src\kiwano\third-party\StackWalker\StackWalker.cpp">
<Filter>third-party\StackWalker</Filter>
</ClCompile>
<ClCompile Include="..\..\src\kiwano\utils\FileUtil.cpp"> <ClCompile Include="..\..\src\kiwano\utils\FileUtil.cpp">
<Filter>utils</Filter> <Filter>utils</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\src\kiwano\2d\GifSprite.cpp"> <ClCompile Include="..\..\src\kiwano\2d\GifSprite.cpp">
<Filter>2d</Filter> <Filter>2d</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\src\kiwano\third-party\tinyxml2\tinyxml2.cpp">
<Filter>third-party\tinyxml2</Filter>
</ClCompile>
<ClCompile Include="..\..\src\kiwano\base\Director.cpp"> <ClCompile Include="..\..\src\kiwano\base\Director.cpp">
<Filter>base</Filter> <Filter>base</Filter>
</ClCompile> </ClCompile>
@ -491,5 +488,11 @@
<ClCompile Include="..\..\src\kiwano\base\Component.cpp"> <ClCompile Include="..\..\src\kiwano\base\Component.cpp">
<Filter>base</Filter> <Filter>base</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\src\3rd-party\StackWalker\StackWalker.cpp">
<Filter>3rd-party\StackWalker</Filter>
</ClCompile>
<ClCompile Include="..\..\src\3rd-party\tinyxml2\tinyxml2.cpp">
<Filter>3rd-party\tinyxml2</Filter>
</ClCompile>
</ItemGroup> </ItemGroup>
</Project> </Project>

0
src/kiwano/third-party/StackWalker/StackWalker.cpp → src/3rd-party/StackWalker/StackWalker.cpp vendored
View File

4
src/kiwano/third-party/StackWalker/StackWalker.h → src/3rd-party/StackWalker/StackWalker.h vendored
View File

@ -12,8 +12,6 @@
// so we need not to check the version (because we only support _MSC_VER >= 1100)! // so we need not to check the version (because we only support _MSC_VER >= 1100)!
#pragma once #pragma once
#include "../../macros.h"
// special defines for VC5/6 (if no actual PSDK is installed): // special defines for VC5/6 (if no actual PSDK is installed):
#if _MSC_VER < 1300 #if _MSC_VER < 1300
typedef unsigned __int64 DWORD64, *PDWORD64; typedef unsigned __int64 DWORD64, *PDWORD64;
@ -25,7 +23,7 @@ typedef unsigned long SIZE_T, *PSIZE_T;
#endif // _MSC_VER < 1300 #endif // _MSC_VER < 1300
class StackWalkerInternal; // forward class StackWalkerInternal; // forward
class KGE_API StackWalker class StackWalker
{ {
public: public:
typedef enum StackWalkOptions typedef enum StackWalkOptions

0
src/kiwano-network/third-party/curl/curl.h → src/3rd-party/curl/curl.h vendored
View File

0
src/kiwano-network/third-party/curl/curlbuild.h → src/3rd-party/curl/curlbuild.h vendored
View File

0
src/kiwano-network/third-party/curl/curlrules.h → src/3rd-party/curl/curlrules.h vendored
View File

0
src/kiwano-network/third-party/curl/curlver.h → src/3rd-party/curl/curlver.h vendored
View File

0
src/kiwano-network/third-party/curl/easy.h → src/3rd-party/curl/easy.h vendored
View File

0
src/kiwano-network/third-party/dlls/libcrypto-1_1.dll → src/3rd-party/curl/libs/libcrypto-1_1.dll vendored
View File

0
src/kiwano-network/third-party/dlls/libcurl.dll → src/3rd-party/curl/libs/libcurl.dll vendored
View File

0
src/kiwano-network/third-party/libs/libcurl.lib → src/3rd-party/curl/libs/libcurl.lib vendored
View File

0
src/kiwano-network/third-party/dlls/libssl-1_1.dll → src/3rd-party/curl/libs/libssl-1_1.dll vendored
View File

0
src/kiwano-network/third-party/curl/mprintf.h → src/3rd-party/curl/mprintf.h vendored
View File

0
src/kiwano-network/third-party/curl/multi.h → src/3rd-party/curl/multi.h vendored
View File

0
src/kiwano-network/third-party/curl/stdcheaders.h → src/3rd-party/curl/stdcheaders.h vendored
View File

0
src/kiwano-network/third-party/curl/typecheck-gcc.h → src/3rd-party/curl/typecheck-gcc.h vendored
View File

0
src/kiwano-imgui/third-party/ImGui/LICENSE.txt → src/3rd-party/imgui/LICENSE.txt vendored
View File

0
src/kiwano-imgui/third-party/ImGui/imconfig.h → src/3rd-party/imgui/imconfig.h vendored
View File

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

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

0
src/kiwano-imgui/third-party/ImGui/imgui_demo.cpp → src/3rd-party/imgui/imgui_demo.cpp vendored
View File

0
src/kiwano-imgui/third-party/ImGui/imgui_draw.cpp → src/3rd-party/imgui/imgui_draw.cpp vendored
View File

0
src/kiwano-imgui/third-party/ImGui/imgui_internal.h → src/3rd-party/imgui/imgui_internal.h vendored
View File

0
src/kiwano-imgui/third-party/ImGui/imgui_widgets.cpp → src/3rd-party/imgui/imgui_widgets.cpp vendored
View File

0
src/kiwano-imgui/third-party/ImGui/imstb_rectpack.h → src/3rd-party/imgui/imstb_rectpack.h vendored
View File

0
src/kiwano-imgui/third-party/ImGui/imstb_textedit.h → src/3rd-party/imgui/imstb_textedit.h vendored
View File

0
src/kiwano-imgui/third-party/ImGui/imstb_truetype.h → src/3rd-party/imgui/imstb_truetype.h vendored
View File

0
src/kiwano/third-party/tinyxml2/LICENSE.txt → src/3rd-party/tinyxml2/LICENSE.txt vendored
View File

0
src/kiwano/third-party/tinyxml2/tinyxml2.cpp → src/3rd-party/tinyxml2/tinyxml2.cpp vendored
View File

0
src/kiwano/third-party/tinyxml2/tinyxml2.h → src/3rd-party/tinyxml2/tinyxml2.h vendored
View File

2
src/kiwano-audio/src/audio.cpp
View File

@ -18,7 +18,7 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE. // THE SOFTWARE.
#include <kiwano/base/Logger.h> #include <kiwano/base/win32/helper.h>
#include "audio-modules.h" #include "audio-modules.h"
#include "audio.h" #include "audio.h"

2
src/kiwano-imgui/kiwano-imgui.h
View File

@ -24,4 +24,4 @@
#include "src/ImGuiModule.h" #include "src/ImGuiModule.h"
// ImGui // ImGui
#include "third-party/ImGui/imgui.h" #include <imgui/imgui.h>

2
src/kiwano-imgui/src/imgui_impl_dx10.h
View File

@ -1,7 +1,7 @@
// dear imgui: Renderer for Kiwano (DirectX10) // dear imgui: Renderer for Kiwano (DirectX10)
#pragma once #pragma once
#include "../third-party/ImGui/imgui.h" #include <imgui/imgui.h>
struct ID3D10Device; struct ID3D10Device;

2
src/kiwano-imgui/src/imgui_impl_dx11.cpp
View File

@ -1,6 +1,6 @@
// dear imgui: Renderer for Kiwano (DirectX11) // dear imgui: Renderer for Kiwano (DirectX11)
#include <kiwano/base/Logger.h> #include <kiwano/base/win32/helper.h>
#include "imgui_impl_dx11.h" #include "imgui_impl_dx11.h"
// DirectX // DirectX

2
src/kiwano-imgui/src/imgui_impl_dx11.h
View File

@ -1,7 +1,7 @@
// dear imgui: Renderer for Kiwano (DirectX11) // dear imgui: Renderer for Kiwano (DirectX11)
#pragma once #pragma once
#include "../third-party/ImGui/imgui.h" #include <imgui/imgui.h>
struct ID3D11Device; struct ID3D11Device;
struct ID3D11DeviceContext; struct ID3D11DeviceContext;

5
src/kiwano-network/kiwano-network.h
View File

@ -20,7 +20,6 @@
#pragma once #pragma once
#include "src/helper.h" #include "src/HttpRequest.h"
#include "src/HttpRequest.hpp" #include "src/HttpResponse.h"
#include "src/HttpResponse.hpp"
#include "src/HttpClient.h" #include "src/HttpClient.h"

17
src/kiwano-network/src/HttpClient.cpp
View File

@ -18,17 +18,16 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE. // THE SOFTWARE.
#include <kiwano/base/Logger.h>
#include <kiwano/platform/Application.h>
#include "helper.h"
#include "HttpRequest.hpp"
#include "HttpResponse.hpp"
#include "HttpClient.h"
#include <thread> #include <thread>
#include <codecvt> #include <codecvt>
// CURL #include "HttpRequest.h"
#include "../third-party/curl/curl.h" #include "HttpResponse.h"
#include "HttpClient.h"
#include <kiwano/base/Logger.h>
#include <kiwano/platform/Application.h>
#include <curl/curl.h> // CURL
namespace namespace
{ {
@ -373,7 +372,7 @@ namespace kiwano
if (callback) if (callback)
{ {
callback(request, response); callback(request.get(), response.get());
} }
} }
} }

23
src/kiwano-network/src/helper.h → src/kiwano-network/src/HttpRequest.cpp
View File

@ -19,13 +19,30 @@
// THE SOFTWARE. // THE SOFTWARE.
#pragma once #pragma once
#include <kiwano/base/SmartPtr.hpp> #include "HttpRequest.h"
namespace kiwano namespace kiwano
{ {
namespace network namespace network
{ {
KGE_DECLARE_SMART_PTR(HttpRequest); void HttpRequest::SetJsonData(Json const& json)
KGE_DECLARE_SMART_PTR(HttpResponse); {
SetHeader(L"Content-Type", L"application/json;charset=UTF-8");
data_ = json.dump();
}
void HttpRequest::SetHeader(String const& field, String const& content)
{
auto iter = headers_.find(field);
if (iter != headers_.end())
{
headers_[field] = content;
}
else
{
headers_.insert(std::make_pair(field, content));
}
}
} }
} }

93
src/kiwano-network/src/HttpRequest.hpp → src/kiwano-network/src/HttpRequest.h
View File

@ -22,17 +22,22 @@
#include <kiwano/core/Function.hpp> #include <kiwano/core/Function.hpp>
#include <kiwano/core/basic_json.hpp> #include <kiwano/core/basic_json.hpp>
#include <kiwano/base/ObjectBase.h> #include <kiwano/base/ObjectBase.h>
#include <kiwano/base/SmartPtr.hpp>
namespace kiwano namespace kiwano
{ {
namespace network namespace network
{ {
typedef Function<void(HttpRequestPtr, HttpResponsePtr)> ResponseCallback; class HttpResponse;
KGE_DECLARE_SMART_PTR(HttpRequest);
class KGE_API HttpRequest class KGE_API HttpRequest
: public ObjectBase : public ObjectBase
{ {
public: public:
using ResponseCallback = Function<void(HttpRequest*, HttpResponse*)>;
enum class Type enum class Type
{ {
Unknown, Unknown,
@ -42,91 +47,35 @@ namespace kiwano
Delete Delete
}; };
inline HttpRequest() inline HttpRequest() : type_(Type::Unknown) {}
: type_(Type::Unknown)
{
} inline HttpRequest(Type type) : type_(type) {}
inline HttpRequest(Type type) inline void SetUrl(String const& url) { url_ = url; }
: type_(type)
{
} inline String const& GetUrl() const { return url_; }
inline void SetUrl(String const& url) inline void SetType(Type type) { type_ = type; }
{
url_ = url;
}
inline String const& GetUrl() const inline Type GetType() const { return type_; }
{
return url_;
}
inline void SetType(Type type) inline void SetData(String const& data) { data_ = data; }
{
type_ = type;
}
inline Type GetType() const void SetJsonData(Json const& json);
{
return type_;
}
inline void SetData(String const& data) inline String const& GetData() const { return data_; }
{
data_ = data;
}
inline void SetJsonData(Json const& json) inline void SetHeaders(Map<String, String> const& headers) { headers_ = headers; }
{
SetHeader(L"Content-Type", L"application/json;charset=UTF-8");
data_ = json.dump();
}
inline String const& GetData() const void SetHeader(String const& field, String const& content);
{
return data_;
}
inline void SetHeaders(Map<String, String> const& headers) inline Map<String, String>& GetHeaders() { return headers_; }
{
headers_ = headers;
}
inline void SetHeader(String const& field, String const& content) inline String const& GetHeader(String const& header) const { return headers_.at(header); }
{
auto iter = headers_.find(field);
if (iter != headers_.end())
{
headers_[field] = content;
}
else
{
headers_.insert(std::make_pair(field, content));
}
}
inline Map<String, String>& GetHeaders() inline void SetResponseCallback(ResponseCallback const& callback) { response_cb_ = callback; }
{
return headers_;
}
inline String const& GetHeader(String const& header) const inline ResponseCallback const& GetResponseCallback() const { return response_cb_; }
{
return headers_.at(header);
}
inline void SetResponseCallback(ResponseCallback const& callback)
{
response_cb_ = callback;
}
inline ResponseCallback const& GetResponseCallback() const
{
return response_cb_;
}
protected: protected:
Type type_; Type type_;

68
src/kiwano-network/src/HttpResponse.hpp → src/kiwano-network/src/HttpResponse.h
View File

@ -19,79 +19,41 @@
// THE SOFTWARE. // THE SOFTWARE.
#pragma once #pragma once
#include <kiwano/core/Function.hpp> #include "HttpRequest.h"
#include <kiwano/core/basic_json.hpp>
#include <kiwano/base/ObjectBase.h>
namespace kiwano namespace kiwano
{ {
namespace network namespace network
{ {
KGE_DECLARE_SMART_PTR(HttpResponse);
class KGE_API HttpResponse class KGE_API HttpResponse
: public ObjectBase : public ObjectBase
{ {
public: public:
inline HttpResponse(HttpRequestPtr request) inline HttpResponse(HttpRequestPtr request) : request_(request), succeed_(false), response_code_(0) {}
: request_(request)
, succeed_(false)
, response_code_(0)
{
}
inline HttpRequestPtr GetRequest() const inline HttpRequestPtr GetRequest() const { return request_; }
{
return request_;
}
inline void SetSucceed(bool succeed) inline void SetSucceed(bool succeed) { succeed_ = succeed; }
{
succeed_ = succeed;
}
inline bool IsSucceed() const inline bool IsSucceed() const { return succeed_; }
{
return succeed_;
}
inline void SetResponseCode(long response_code) inline void SetResponseCode(long response_code) { response_code_ = response_code; }
{
response_code_ = response_code;
}
inline long GetResponseCode() const inline long GetResponseCode() const { return response_code_; }
{
return response_code_;
}
inline void SetHeader(String const& response_header) inline void SetHeader(String const& response_header) { response_header_ = response_header; }
{
response_header_ = response_header;
}
inline String GetHeader() const inline String GetHeader() const { return response_header_; }
{
return response_header_;
}
inline void SetData(String const& response_data) inline void SetData(String const& response_data) { response_data_ = response_data; }
{
response_data_ = response_data;
}
inline String const& GetData() const inline String const& GetData() const { return response_data_; }
{
return response_data_;
}
inline void SetError(String const& error_buffer) inline void SetError(String const& error_buffer) { error_buffer_ = error_buffer; }
{
error_buffer_ = error_buffer;
}
inline String const& GetError() const inline String const& GetError() const { return error_buffer_; }
{
return error_buffer_;
}
protected: protected:
bool succeed_; bool succeed_;

2
src/kiwano/2d/GifSprite.cpp
View File

@ -19,7 +19,7 @@
// THE SOFTWARE. // THE SOFTWARE.
#include "GifSprite.h" #include "GifSprite.h"
#include "../base/Logger.h" #include "../base/win32/helper.h"
#include "../renderer/TextureCache.h" #include "../renderer/TextureCache.h"
#include "../renderer/Renderer.h" #include "../renderer/Renderer.h"

33
src/kiwano/base/Logger.h
View File

@ -27,26 +27,26 @@
#ifndef KGE_LOG #ifndef KGE_LOG
# ifdef KGE_DEBUG # ifdef KGE_DEBUG
# define KGE_LOG(FORMAT, ...) ::kiwano::Logger::GetInstance()->Messagef((FORMAT ## "\n"), __VA_ARGS__) # define KGE_LOG(FORMAT, ...) ::kiwano::Logger::GetInstance()->Messagef((FORMAT ## "\n"), __VA_ARGS__)
# else # else
# define KGE_LOG __noop # define KGE_LOG __noop
# endif # endif
#endif #endif
#ifndef KGE_WARNING_LOG #ifndef KGE_WARNING_LOG
# define KGE_WARNING_LOG(FORMAT, ...) ::kiwano::Logger::GetInstance()->Warningf((FORMAT ## "\n"), __VA_ARGS__) # define KGE_WARNING_LOG(FORMAT, ...) ::kiwano::Logger::GetInstance()->Warningf((FORMAT ## "\n"), __VA_ARGS__)
#endif #endif
#ifndef KGE_ERROR_LOG #ifndef KGE_ERROR_LOG
# define KGE_ERROR_LOG(FORMAT, ...) ::kiwano::Logger::GetInstance()->Errorf((FORMAT ## "\n"), __VA_ARGS__) # define KGE_ERROR_LOG(FORMAT, ...) ::kiwano::Logger::GetInstance()->Errorf((FORMAT ## "\n"), __VA_ARGS__)
#endif #endif
#ifndef KGE_PRINT #ifndef KGE_PRINT
# define KGE_PRINT(...) ::kiwano::Logger::GetInstance()->Println(__VA_ARGS__) # define KGE_PRINT(...) ::kiwano::Logger::GetInstance()->Println(__VA_ARGS__)
#endif #endif
#ifndef KGE_PRINTF #ifndef KGE_PRINTF
# define KGE_PRINTF(FORMAT, ...) ::kiwano::Logger::GetInstance()->Printf((FORMAT), __VA_ARGS__) # define KGE_PRINTF(FORMAT, ...) ::kiwano::Logger::GetInstance()->Printf((FORMAT), __VA_ARGS__)
#endif #endif
namespace kiwano namespace kiwano
@ -295,26 +295,3 @@ namespace kiwano
return out; return out;
} }
} }
//
// Display stack trace on exception
//
#include "../third-party/StackWalker/StackWalker.h"
namespace kiwano
{
inline void ThrowIfFailed(HRESULT hr)
{
if (FAILED(hr))
{
KGE_ERROR_LOG(L"Fatal error with HRESULT of %08X", hr);
StackWalker{}.ShowCallstack();
static char buffer[1024 + 1];
sprintf_s(buffer, "Fatal error with HRESULT of %08X", hr);
throw std::runtime_error(buffer);
}
}
}

2
src/kiwano/base/Window.cpp
View File

@ -19,7 +19,7 @@
// THE SOFTWARE. // THE SOFTWARE.
#include "Window.h" #include "Window.h"
#include "Logger.h" #include "win32/helper.h"
#include "../platform/Application.h" #include "../platform/Application.h"
#define WINDOW_FIXED_STYLE WS_OVERLAPPED | WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX #define WINDOW_FIXED_STYLE WS_OVERLAPPED | WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX

40
src/kiwano/base/win32/helper.h Normal file
View File

@ -0,0 +1,40 @@
// Copyright (c) 2018-2019 Kiwano - Nomango
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
// in the Software without restriction, including without limitation the rights
// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
// copies of the Software, and to permit persons to whom the Software is
// furnished to do so, subject to the following conditions:
//
// The above copyright notice and this permission notice shall be included in
// all copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.
#include "../Logger.h"
#include <StackWalker/StackWalker.h>
namespace kiwano
{
// Display stack trace on exception
inline void ThrowIfFailed(HRESULT hr)
{
if (FAILED(hr))
{
KGE_ERROR_LOG(L"Fatal error with HRESULT of %08X", hr);
StackWalker{}.ShowCallstack();
static char buffer[1024 + 1];
sprintf_s(buffer, "Fatal error with HRESULT of %08X", hr);
throw std::runtime_error(buffer);
}
}
}

6
src/kiwano/platform/Application.cpp
View File

@ -20,7 +20,7 @@
#include "Application.h" #include "Application.h"
#include "modules.h" #include "modules.h"
#include "../base/Logger.h" #include "../base/win32/helper.h"
#include "../base/input.h" #include "../base/input.h"
#include "../base/Director.h" #include "../base/Director.h"
#include "../renderer/TextureCache.h" #include "../renderer/TextureCache.h"
@ -65,9 +65,7 @@ namespace kiwano
, inited_(false) , inited_(false)
, time_scale_(1.f) , time_scale_(1.f)
{ {
ThrowIfFailed( ThrowIfFailed(::CoInitialize(nullptr));
::CoInitialize(nullptr)
);
Use(Renderer::GetInstance()); Use(Renderer::GetInstance());
Use(Input::GetInstance()); Use(Input::GetInstance());

2
src/kiwano/renderer/Geometry.cpp
View File

@ -20,7 +20,7 @@
#include "Geometry.h" #include "Geometry.h"
#include "Renderer.h" #include "Renderer.h"
#include "../base/Logger.h" #include "../base/win32/helper.h"
namespace kiwano namespace kiwano
{ {

2
src/kiwano/renderer/RenderTarget.cpp
View File

@ -19,7 +19,7 @@
// THE SOFTWARE. // THE SOFTWARE.
#include "RenderTarget.h" #include "RenderTarget.h"
#include "../base/Logger.h" #include "../base/win32/helper.h"
namespace kiwano namespace kiwano
{ {

2
src/kiwano/renderer/Renderer.cpp
View File

@ -19,7 +19,7 @@
// THE SOFTWARE. // THE SOFTWARE.
#include "Renderer.h" #include "Renderer.h"
#include "../base/Logger.h" #include "../base/win32/helper.h"
#include "../base/Window.h" #include "../base/Window.h"
#include "../utils/FileUtil.h" #include "../utils/FileUtil.h"

2
src/kiwano/renderer/TextLayout.cpp
View File

@ -20,7 +20,7 @@
#include "TextLayout.h" #include "TextLayout.h"
#include "Renderer.h" #include "Renderer.h"
#include "../base/Logger.h" #include "../base/win32/helper.h"
namespace kiwano namespace kiwano
{ {

4
src/kiwano/renderer/Texture.cpp
View File

@ -20,11 +20,11 @@
#include "Texture.h" #include "Texture.h"
#include "Renderer.h" #include "Renderer.h"
#include "../base/Logger.h" #include "../base/win32/helper.h"
namespace kiwano namespace kiwano
{ {
InterpolationMode Texture::default_interpolation_mode_ = InterpolationMode::Linear; InterpolationMode Texture::default_interpolation_mode_ = InterpolationMode::Linear;
Texture::Texture() Texture::Texture()
: interpolation_mode_(default_interpolation_mode_) : interpolation_mode_(default_interpolation_mode_)

2
src/kiwano/utils/ResourceCache.h
View File

@ -23,7 +23,7 @@
#include "../base/Resource.h" #include "../base/Resource.h"
#include "../2d/include-forwards.h" #include "../2d/include-forwards.h"
#include "../renderer/GifImage.h" #include "../renderer/GifImage.h"
#include "../third-party/tinyxml2/tinyxml2.h" #include <tinyxml2/tinyxml2.h>
namespace kiwano namespace kiwano
{ {