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

[build] update appveyor.yml 

update project files

update appveyor.yml

try to build with vs2013

refactoring projects

update appveyor.yml

update appveyor.yml
This commit is contained in:
Nomango 2019-08-06 09:32:00 +08:00
parent 313066f0df
commit b383c481b1
196 changed files with 414 additions and 731 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
appveyor.yml
View File

@ -2,6 +2,11 @@ version: 0.9.{build}
skip_tags: true skip_tags: true
image:
- Visual Studio 2019
- Visual Studio 2017
- Visual Studio 2015
skip_commits: skip_commits:
message: /\[chore\]/ message: /\[chore\]/
@ -22,16 +27,17 @@ platform:
- Win32 - Win32
before_build: before_build:
- ps: nuget restore - ps: nuget restore projects/Kiwano.sln
build: build:
project: ./Kiwano.sln
parallel: true parallel: true
verbosity: minimal project: projects/Kiwano.sln
verbosity: normal
artifacts: artifacts:
- path: output/Win32/**/*.lib - path: projects/output/
name: Win32 name: $(platform).$(configuration)
type: zip
notifications: notifications:
- provider: Email - provider: Email

223
kiwano/Kiwano.vcxproj
View File

@ -1,223 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<ClInclude Include="2d\GifSprite.h" />
<ClInclude Include="base\types.h" />
<ClInclude Include="kiwano.h" />
<ClInclude Include="config.h" />
<ClInclude Include="macros.h" />
<ClInclude Include="2d\include-forwards.h" />
<ClInclude Include="2d\Action.h" />
<ClInclude Include="2d\ActionGroup.h" />
<ClInclude Include="2d\ActionHelper.h" />
<ClInclude Include="2d\ActionManager.h" />
<ClInclude Include="2d\ActionTween.h" />
<ClInclude Include="2d\Animation.h" />
<ClInclude Include="2d\Canvas.h" />
<ClInclude Include="2d\Color.h" />
<ClInclude Include="2d\DebugNode.h" />
<ClInclude Include="2d\Font.hpp" />
<ClInclude Include="2d\Frames.h" />
<ClInclude Include="2d\Geometry.h" />
<ClInclude Include="2d\GeometryNode.h" />
<ClInclude Include="2d\GifImage.h" />
<ClInclude Include="2d\Image.h" />
<ClInclude Include="2d\Layer.h" />
<ClInclude Include="2d\Node.h" />
<ClInclude Include="2d\Scene.h" />
<ClInclude Include="2d\Sprite.h" />
<ClInclude Include="2d\Text.h" />
<ClInclude Include="2d\TextStyle.hpp" />
<ClInclude Include="2d\Transform.hpp" />
<ClInclude Include="2d\Transition.h" />
<ClInclude Include="base\AsyncTask.h" />
<ClInclude Include="base\Component.h" />
<ClInclude Include="base\Event.hpp" />
<ClInclude Include="base\EventDispatcher.h" />
<ClInclude Include="base\EventListener.h" />
<ClInclude Include="base\Input.h" />
<ClInclude Include="base\keys.hpp" />
<ClInclude Include="base\logs.h" />
<ClInclude Include="base\Object.h" />
<ClInclude Include="base\RefCounter.hpp" />
<ClInclude Include="base\Resource.h" />
<ClInclude Include="base\SmartPtr.hpp" />
<ClInclude Include="base\Timer.h" />
<ClInclude Include="base\TimerManager.h" />
<ClInclude Include="base\time.h" />
<ClInclude Include="base\window.h" />
<ClInclude Include="common\Array.hpp" />
<ClInclude Include="common\Closure.hpp" />
<ClInclude Include="common\ComPtr.hpp" />
<ClInclude Include="common\helper.h" />
<ClInclude Include="common\IntrusiveList.hpp" />
<ClInclude Include="common\IntrusivePtr.hpp" />
<ClInclude Include="common\Json.hpp" />
<ClInclude Include="common\Noncopyable.hpp" />
<ClInclude Include="common\Singleton.hpp" />
<ClInclude Include="common\String.hpp" />
<ClInclude Include="math\constants.hpp" />
<ClInclude Include="math\ease.hpp" />
<ClInclude Include="math\helper.h" />
<ClInclude Include="math\Matrix.hpp" />
<ClInclude Include="math\rand.h" />
<ClInclude Include="math\Rect.hpp" />
<ClInclude Include="math\scalar.hpp" />
<ClInclude Include="math\Vec2.hpp" />
<ClInclude Include="platform\Application.h" />
<ClInclude Include="platform\modules.h" />
<ClInclude Include="renderer\D2DDeviceResources.h" />
<ClInclude Include="renderer\D3D10DeviceResources.h" />
<ClInclude Include="renderer\D3D11DeviceResources.h" />
<ClInclude Include="renderer\D3DDeviceResourcesBase.h" />
<ClInclude Include="renderer\helper.hpp" />
<ClInclude Include="renderer\render.h" />
<ClInclude Include="renderer\TextRenderer.h" />
<ClInclude Include="third-party\StackWalker\StackWalker.h" />
<ClInclude Include="third-party\tinyxml2\tinyxml2.h" />
<ClInclude Include="ui\Button.h" />
<ClInclude Include="ui\Menu.h" />
<ClInclude Include="utils\DataUtil.h" />
<ClInclude Include="utils\FileUtil.h" />
<ClInclude Include="utils\Path.h" />
<ClInclude Include="utils\ResLoader.h" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="2d\Action.cpp" />
<ClCompile Include="2d\ActionGroup.cpp" />
<ClCompile Include="2d\ActionManager.cpp" />
<ClCompile Include="2d\ActionTween.cpp" />
<ClCompile Include="2d\Animation.cpp" />
<ClCompile Include="2d\Canvas.cpp" />
<ClCompile Include="2d\Color.cpp" />
<ClCompile Include="2d\DebugNode.cpp" />
<ClCompile Include="2d\Frames.cpp" />
<ClCompile Include="2d\Geometry.cpp" />
<ClCompile Include="2d\GeometryNode.cpp" />
<ClCompile Include="2d\GifImage.cpp" />
<ClCompile Include="2d\GifSprite.cpp" />
<ClCompile Include="2d\Image.cpp" />
<ClCompile Include="2d\Layer.cpp" />
<ClCompile Include="2d\Node.cpp" />
<ClCompile Include="2d\Scene.cpp" />
<ClCompile Include="2d\Sprite.cpp" />
<ClCompile Include="2d\Text.cpp" />
<ClCompile Include="2d\Transition.cpp" />
<ClCompile Include="base\AsyncTask.cpp" />
<ClCompile Include="base\EventDispatcher.cpp" />
<ClCompile Include="base\EventListener.cpp" />
<ClCompile Include="base\Input.cpp" />
<ClCompile Include="base\logs.cpp" />
<ClCompile Include="base\Object.cpp" />
<ClCompile Include="base\Resource.cpp" />
<ClCompile Include="base\Timer.cpp" />
<ClCompile Include="base\TimerManager.cpp" />
<ClCompile Include="base\time.cpp" />
<ClCompile Include="base\window.cpp" />
<ClCompile Include="platform\Application.cpp" />
<ClCompile Include="platform\modules.cpp" />
<ClCompile Include="renderer\D2DDeviceResources.cpp" />
<ClCompile Include="renderer\D3D10DeviceResources.cpp" />
<ClCompile Include="renderer\D3D11DeviceResources.cpp" />
<ClCompile Include="renderer\render.cpp" />
<ClCompile Include="renderer\TextRenderer.cpp" />
<ClCompile Include="third-party\StackWalker\StackWalker.cpp" />
<ClCompile Include="third-party\tinyxml2\tinyxml2.cpp" />
<ClCompile Include="ui\Button.cpp" />
<ClCompile Include="ui\Menu.cpp" />
<ClCompile Include="utils\DataUtil.cpp" />
<ClCompile Include="utils\FileUtil.cpp" />
<ClCompile Include="utils\Path.cpp" />
<ClCompile Include="utils\ResLoader.cpp" />
</ItemGroup>
<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>
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{FF7F943D-A89C-4E6C-97CF-84F7D8FF8EDF}</ProjectGuid>
<RootNamespace>kiwano</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>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '10.0'">v100</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '11.0'">v110</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '12.0'">v120</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '14.0'">v140</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '15.0'">v141</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '16.0'">v142</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<WholeProgramOptimization>false</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '10.0'">v100</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '11.0'">v110</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '12.0'">v120</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '14.0'">v140</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '15.0'">v141</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '16.0'">v142</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</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>
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<OutDir>$(SolutionDir)\output\$(Platform)\$(Configuration).$(PlatformToolset)\</OutDir>
<IntDir>$(SolutionDir)\build\$(Platform)\$(Configuration).$(PlatformToolset)\$(ProjectName)\</IntDir>
<LinkIncremental>true</LinkIncremental>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<OutDir>$(SolutionDir)\output\$(Platform)\$(Configuration).$(PlatformToolset)\</OutDir>
<IntDir>$(SolutionDir)\build\$(Platform)\$(Configuration).$(PlatformToolset)\$(ProjectName)\</IntDir>
<LinkIncremental>false</LinkIncremental>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<TreatWarningAsError>true</TreatWarningAsError>
<DebugInformationFormat>None</DebugInformationFormat>
</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>
<BufferSecurityCheck>false</BufferSecurityCheck>
<TreatWarningAsError>true</TreatWarningAsError>
<DebugInformationFormat>None</DebugInformationFormat>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>false</GenerateDebugInformation>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
</Link>
</ItemDefinitionGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>

343
kiwano/common/Closure.hpp
View File

@ -1,343 +0,0 @@
// Copyright (c) 2016-2018 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.
#pragma once
#include <stdexcept>
namespace kiwano
{
//
// Closure is a light weight std::function<>-like class
//
namespace __closure_detail
{
//
// is_callable
//
namespace __callable_detail
{
template <typename _Ty, typename _Ret, typename... _Args>
struct helper
{
template <typename _Uty> static int test(...);
template <typename _Uty, _Ret(_Uty::*)(_Args...)> struct class_mem;
template <typename _Uty> static char test(class_mem<_Uty, &_Uty::operator()>*);
template <typename _Uty, _Ret(_Uty::*)(_Args...) const> struct class_const_mem;
template <typename _Uty> static char test(class_const_mem<_Uty, &_Uty::operator()>*);
template<
typename _Uty,
typename _Uret = typename std::decay<decltype(std::declval<_Uty>().operator()(std::declval<_Args>()...))>::type,
typename = typename std::enable_if<std::is_convertible<_Ret, _Uret>::value>::type>
static char test(int);
static constexpr bool value = sizeof(test<_Ty>(0)) == sizeof(char);
};
}
template<typename _Ty, typename _Ret, typename... _Args>
struct is_callable
: public std::bool_constant<__callable_detail::helper<_Ty, _Ret, _Args...>::value>
{
};
//
// Callable
//
template<typename _Ret, typename... _Args>
class Callable
{
public:
virtual ~Callable() {}
virtual void AddRef() = 0;
virtual void Release() = 0;
virtual _Ret Invoke(_Args... args) const = 0;
};
template<typename _Ret, typename... _Args>
class RefCountCallable
: public Callable<_Ret, _Args...>
{
public:
RefCountCallable() : ref_count_(0) {}
virtual void AddRef() override
{
++ref_count_;
}
virtual void Release() override
{
--ref_count_;
if (ref_count_ <= 0)
{
delete this;
}
}
private:
int ref_count_;
};
template<typename _Ty, typename _Ret, typename... _Args>
class ProxyCallable
: public RefCountCallable<_Ret, _Args...>
{
public:
ProxyCallable(_Ty&& val)
: callee_(std::move(val))
{
}
virtual _Ret Invoke(_Args... args) const override
{
return callee_(std::forward<_Args>(args)...);
}
static inline Callable<_Ret, _Args...>* Make(_Ty&& val)
{
return new (std::nothrow) ProxyCallable<_Ty, _Ret, _Args...>(std::move(val));
}
private:
_Ty callee_;
};
template<typename _Ty, typename _Ret, typename... _Args>
class ProxyMemCallable
: public RefCountCallable<_Ret, _Args...>
{
public:
typedef _Ret(_Ty::* _FuncType)(_Args...);
virtual _Ret Invoke(_Args... args) const override
{
return (static_cast<_Ty*>(ptr_)->*func_)(std::forward<_Args>(args)...);
}
static inline Callable<_Ret, _Args...>* Make(void* ptr, _FuncType func)
{
return new (std::nothrow) ProxyMemCallable<_Ty, _Ret, _Args...>(ptr, func);
}
protected:
ProxyMemCallable(void* ptr, _FuncType func)
: ptr_(ptr)
, func_(func)
{
}
protected:
void* ptr_;
_FuncType func_;
};
template<typename _Ty, typename _Ret, typename... _Args>
class ProxyConstMemCallable
: public RefCountCallable<_Ret, _Args...>
{
public:
typedef _Ret(_Ty::* _FuncType)(_Args...) const;
virtual _Ret Invoke(_Args... args) const override
{
return (static_cast<_Ty*>(ptr_)->*func_)(std::forward<_Args>(args)...);
}
static inline Callable<_Ret, _Args...>* Make(void* ptr, _FuncType func)
{
return new (std::nothrow) ProxyConstMemCallable<_Ty, _Ret, _Args...>(ptr, func);
}
protected:
ProxyConstMemCallable(void* ptr, _FuncType func)
: ptr_(ptr)
, func_(func)
{
}
protected:
void* ptr_;
_FuncType func_;
};
}
//
// exceptions
//
class bad_function_call : public std::exception
{
public:
bad_function_call() {}
virtual const char* what() const override
{
return "bad function call";
}
};
//
// Closure details
//
template<typename _Ty>
class Closure;
template<typename _Ret, typename... _Args>
class Closure<_Ret(_Args...)>
{
public:
Closure()
: callable_(nullptr)
{
}
Closure(std::nullptr_t)
: callable_(nullptr)
{
}
Closure(const Closure& rhs)
: callable_(rhs.callable_)
{
if (callable_) callable_->AddRef();
}
Closure(Closure&& rhs) noexcept
: callable_(rhs.callable_)
{
rhs.callable_ = nullptr;
}
Closure(_Ret(*func)(_Args...))
{
callable_ = __closure_detail::ProxyCallable<_Ret(*)(_Args...), _Ret, _Args...>::Make(std::move(func));
if (callable_) callable_->AddRef();
}
template<
typename _Ty,
typename = typename std::enable_if<__closure_detail::is_callable<_Ty, _Ret, _Args...>::value, int>::type>
Closure(_Ty val)
{
callable_ = __closure_detail::ProxyCallable<_Ty, _Ret, _Args...>::Make(std::move(val));
if (callable_) callable_->AddRef();
}
template<typename _Ty,
typename _Uty,
typename = typename std::enable_if<std::is_same<_Ty, _Uty>::value || std::is_base_of<_Ty, _Uty>::value, int>::type>
Closure(_Uty* ptr, _Ret(_Ty::* func)(_Args...))
{
callable_ = __closure_detail::ProxyMemCallable<_Ty, _Ret, _Args...>::Make(ptr, func);
if (callable_) callable_->AddRef();
}
template<typename _Ty,
typename _Uty,
typename = typename std::enable_if<std::is_same<_Ty, _Uty>::value || std::is_base_of<_Ty, _Uty>::value, int>::type>
Closure(_Uty* ptr, _Ret(_Ty::* func)(_Args...) const)
{
callable_ = __closure_detail::ProxyConstMemCallable<_Ty, _Ret, _Args...>::Make(ptr, func);
if (callable_) callable_->AddRef();
}
~Closure()
{
tidy();
}
inline void swap(const Closure& rhs)
{
std::swap(callable_, rhs.callable_);
}
inline _Ret operator()(_Args... args) const
{
if (!callable_)
throw bad_function_call();
return callable_->Invoke(std::forward<_Args>(args)...);
}
inline operator bool() const
{
return !!callable_;
}
inline Closure& operator=(const Closure& rhs)
{
tidy();
callable_ = rhs.callable_;
if (callable_) callable_->AddRef();
return (*this);
}
inline Closure& operator=(Closure&& rhs)
{
tidy();
callable_ = rhs.callable_;
rhs.callable_ = nullptr;
return (*this);
}
private:
inline void tidy()
{
if (callable_)
{
callable_->Release();
callable_ = nullptr;
}
}
private:
__closure_detail::Callable<_Ret, _Args...>* callable_;
};
template<typename _Ty,
typename _Uty,
typename = typename std::enable_if<
std::is_same<_Ty, _Uty>::value || std::is_base_of<_Ty, _Uty>::value, int
>::type,
typename _Ret,
typename... _Args>
inline Closure<_Ret(_Args...)> MakeClosure(_Uty* ptr, _Ret(_Ty::* func)(_Args...))
{
return Closure<_Ret(_Args...)>(ptr, func);
}
template<typename _Ty,
typename _Uty,
typename = typename std::enable_if<
std::is_same<_Ty, _Uty>::value || std::is_base_of<_Ty, _Uty>::value, int
>::type,
typename _Ret,
typename... _Args>
inline Closure<_Ret(_Args...)> MakeClosure(_Uty* ptr, _Ret(_Ty::* func)(_Args...) const)
{
return Closure<_Ret(_Args...)>(ptr, func);
}
}

35
kiwano/common/noncopyable.hpp
View File

@ -1,35 +0,0 @@
// Copyright (c) 2016-2018 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.
#pragma once
namespace kiwano
{
class Noncopyable
{
protected:
Noncopyable() = default;
private:
Noncopyable(const Noncopyable&) = delete;
Noncopyable& operator=(const Noncopyable&) = delete;
};
}

43
projects/Kiwano.sln Normal file
View File

@ -0,0 +1,43 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16
VisualStudioVersion = 16.0.28729.10
MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "kiwano", "kiwano.vcxproj", "{FF7F943D-A89C-4E6C-97CF-84F7D8FF8EDF}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "kiwano-audio", "kiwano-audio.vcxproj", "{1B97937D-8184-426C-BE71-29A163DC76C9}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "kiwano-network", "kiwano-network.vcxproj", "{69DFBE92-C06F-4CF8-9495-CA9BF2E3BAF2}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "kiwano-imgui", "kiwano-imgui.vcxproj", "{A7062ED8-8910-48A5-A3BC-C1612672571F}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
Release|Win32 = Release|Win32
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{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.Deploy.0 = Debug|Win32
{FF7F943D-A89C-4E6C-97CF-84F7D8FF8EDF}.Release|Win32.ActiveCfg = Release|Win32
{FF7F943D-A89C-4E6C-97CF-84F7D8FF8EDF}.Release|Win32.Build.0 = Release|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}.Release|Win32.ActiveCfg = Release|Win32
{1B97937D-8184-426C-BE71-29A163DC76C9}.Release|Win32.Build.0 = Release|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}.Release|Win32.ActiveCfg = Release|Win32
{69DFBE92-C06F-4CF8-9495-CA9BF2E3BAF2}.Release|Win32.Build.0 = Release|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}.Release|Win32.ActiveCfg = Release|Win32
{A7062ED8-8910-48A5-A3BC-C1612672571F}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {FAC2BE2F-19AF-477A-8DC6-4645E66868A4}
EndGlobalSection
EndGlobal

32
kiwano-audio/kiwano-audio.vcxproj → projects/kiwano-audio.vcxproj
View File

@ -1,19 +1,19 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<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="kiwano-audio.h" /> <ClInclude Include="..\src\kiwano-audio\kiwano-audio.h" />
<ClInclude Include="src\audio-modules.h" /> <ClInclude Include="..\src\kiwano-audio\src\audio-modules.h" />
<ClInclude Include="src\audio.h" /> <ClInclude Include="..\src\kiwano-audio\src\audio.h" />
<ClInclude Include="src\Player.h" /> <ClInclude Include="..\src\kiwano-audio\src\Player.h" />
<ClInclude Include="src\Sound.h" /> <ClInclude Include="..\src\kiwano-audio\src\Sound.h" />
<ClInclude Include="src\Transcoder.h" /> <ClInclude Include="..\src\kiwano-audio\src\Transcoder.h" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="src\audio-modules.cpp" /> <ClCompile Include="..\src\kiwano-audio\src\audio-modules.cpp" />
<ClCompile Include="src\audio.cpp" /> <ClCompile Include="..\src\kiwano-audio\src\audio.cpp" />
<ClCompile Include="src\Player.cpp" /> <ClCompile Include="..\src\kiwano-audio\src\Player.cpp" />
<ClCompile Include="src\Sound.cpp" /> <ClCompile Include="..\src\kiwano-audio\src\Sound.cpp" />
<ClCompile Include="src\Transcoder.cpp" /> <ClCompile Include="..\src\kiwano-audio\src\Transcoder.cpp" />
</ItemGroup> </ItemGroup>
<ItemGroup Label="ProjectConfigurations"> <ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32"> <ProjectConfiguration Include="Debug|Win32">
@ -26,7 +26,7 @@
</ProjectConfiguration> </ProjectConfiguration>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\kiwano\kiwano.vcxproj"> <ProjectReference Include="kiwano.vcxproj">
<Project>{ff7f943d-a89c-4e6c-97cf-84f7d8ff8edf}</Project> <Project>{ff7f943d-a89c-4e6c-97cf-84f7d8ff8edf}</Project>
</ProjectReference> </ProjectReference>
</ItemGroup> </ItemGroup>
@ -86,7 +86,9 @@
<Optimization>Disabled</Optimization> <Optimization>Disabled</Optimization>
<TreatWarningAsError>true</TreatWarningAsError> <TreatWarningAsError>true</TreatWarningAsError>
<DebugInformationFormat>None</DebugInformationFormat> <DebugInformationFormat>None</DebugInformationFormat>
<AdditionalIncludeDirectories>../</AdditionalIncludeDirectories> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<AdditionalIncludeDirectories>../src/</AdditionalIncludeDirectories>
<MinimalRebuild>false</MinimalRebuild>
</ClCompile> </ClCompile>
<Link> <Link>
<SubSystem>Windows</SubSystem> <SubSystem>Windows</SubSystem>
@ -101,7 +103,9 @@
<IntrinsicFunctions>true</IntrinsicFunctions> <IntrinsicFunctions>true</IntrinsicFunctions>
<BufferSecurityCheck>false</BufferSecurityCheck> <BufferSecurityCheck>false</BufferSecurityCheck>
<TreatWarningAsError>true</TreatWarningAsError> <TreatWarningAsError>true</TreatWarningAsError>
<AdditionalIncludeDirectories>../</AdditionalIncludeDirectories> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<AdditionalIncludeDirectories>../src/</AdditionalIncludeDirectories>
<MinimalRebuild>false</MinimalRebuild>
</ClCompile> </ClCompile>
<Link> <Link>
<SubSystem>Windows</SubSystem> <SubSystem>Windows</SubSystem>

22
kiwano-audio/kiwano-audio.vcxproj.filters → projects/kiwano-audio.vcxproj.filters
View File

@ -1,37 +1,37 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<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="kiwano-audio.h" /> <ClInclude Include="..\src\kiwano-audio\kiwano-audio.h" />
<ClInclude Include="src\audio.h"> <ClInclude Include="..\src\kiwano-audio\src\audio.h">
<Filter>src</Filter> <Filter>src</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="src\audio-modules.h"> <ClInclude Include="..\src\kiwano-audio\src\audio-modules.h">
<Filter>src</Filter> <Filter>src</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="src\Player.h"> <ClInclude Include="..\src\kiwano-audio\src\Player.h">
<Filter>src</Filter> <Filter>src</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="src\Sound.h"> <ClInclude Include="..\src\kiwano-audio\src\Sound.h">
<Filter>src</Filter> <Filter>src</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="src\Transcoder.h"> <ClInclude Include="..\src\kiwano-audio\src\Transcoder.h">
<Filter>src</Filter> <Filter>src</Filter>
</ClInclude> </ClInclude>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="src\audio.cpp"> <ClCompile Include="..\src\kiwano-audio\src\audio.cpp">
<Filter>src</Filter> <Filter>src</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="src\audio-modules.cpp"> <ClCompile Include="..\src\kiwano-audio\src\audio-modules.cpp">
<Filter>src</Filter> <Filter>src</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="src\Player.cpp"> <ClCompile Include="..\src\kiwano-audio\src\Player.cpp">
<Filter>src</Filter> <Filter>src</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="src\Sound.cpp"> <ClCompile Include="..\src\kiwano-audio\src\Sound.cpp">
<Filter>src</Filter> <Filter>src</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="src\Transcoder.cpp"> <ClCompile Include="..\src\kiwano-audio\src\Transcoder.cpp">
<Filter>src</Filter> <Filter>src</Filter>
</ClCompile> </ClCompile>
</ItemGroup> </ItemGroup>

50
kiwano-imgui/kiwano-imgui.vcxproj → projects/kiwano-imgui.vcxproj
View File

@ -1,28 +1,28 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<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="kiwano-imgui.h" /> <ClInclude Include="..\src\kiwano-imgui\kiwano-imgui.h" />
<ClInclude Include="src\ImGuiLayer.h" /> <ClInclude Include="..\src\kiwano-imgui\src\ImGuiLayer.h" />
<ClInclude Include="src\ImGuiModule.h" /> <ClInclude Include="..\src\kiwano-imgui\src\ImGuiModule.h" />
<ClInclude Include="src\imgui_impl.h" /> <ClInclude Include="..\src\kiwano-imgui\src\imgui_impl.h" />
<ClInclude Include="src\imgui_impl_dx10.h" /> <ClInclude Include="..\src\kiwano-imgui\src\imgui_impl_dx10.h" />
<ClInclude Include="src\imgui_impl_dx11.h" /> <ClInclude Include="..\src\kiwano-imgui\src\imgui_impl_dx11.h" />
<ClInclude Include="third-party\ImGui\imconfig.h" /> <ClInclude Include="..\src\kiwano-imgui\third-party\ImGui\imconfig.h" />
<ClInclude Include="third-party\ImGui\imgui.h" /> <ClInclude Include="..\src\kiwano-imgui\third-party\ImGui\imgui.h" />
<ClInclude Include="third-party\ImGui\imgui_internal.h" /> <ClInclude Include="..\src\kiwano-imgui\third-party\ImGui\imgui_internal.h" />
<ClInclude Include="third-party\ImGui\imstb_rectpack.h" /> <ClInclude Include="..\src\kiwano-imgui\third-party\ImGui\imstb_rectpack.h" />
<ClInclude Include="third-party\ImGui\imstb_textedit.h" /> <ClInclude Include="..\src\kiwano-imgui\third-party\ImGui\imstb_textedit.h" />
<ClInclude Include="third-party\ImGui\imstb_truetype.h" /> <ClInclude Include="..\src\kiwano-imgui\third-party\ImGui\imstb_truetype.h" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="src\ImGuiLayer.cpp" /> <ClCompile Include="..\src\kiwano-imgui\src\ImGuiLayer.cpp" />
<ClCompile Include="src\ImGuiModule.cpp" /> <ClCompile Include="..\src\kiwano-imgui\src\ImGuiModule.cpp" />
<ClCompile Include="src\imgui_impl_dx10.cpp" /> <ClCompile Include="..\src\kiwano-imgui\src\imgui_impl_dx10.cpp" />
<ClCompile Include="src\imgui_impl_dx11.cpp" /> <ClCompile Include="..\src\kiwano-imgui\src\imgui_impl_dx11.cpp" />
<ClCompile Include="third-party\ImGui\imgui.cpp" /> <ClCompile Include="..\src\kiwano-imgui\third-party\ImGui\imgui.cpp" />
<ClCompile Include="third-party\ImGui\imgui_demo.cpp" /> <ClCompile Include="..\src\kiwano-imgui\third-party\ImGui\imgui_demo.cpp" />
<ClCompile Include="third-party\ImGui\imgui_draw.cpp" /> <ClCompile Include="..\src\kiwano-imgui\third-party\ImGui\imgui_draw.cpp" />
<ClCompile Include="third-party\ImGui\imgui_widgets.cpp" /> <ClCompile Include="..\src\kiwano-imgui\third-party\ImGui\imgui_widgets.cpp" />
</ItemGroup> </ItemGroup>
<ItemGroup Label="ProjectConfigurations"> <ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32"> <ProjectConfiguration Include="Debug|Win32">
@ -35,7 +35,7 @@
</ProjectConfiguration> </ProjectConfiguration>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\kiwano\kiwano.vcxproj"> <ProjectReference Include="kiwano.vcxproj">
<Project>{ff7f943d-a89c-4e6c-97cf-84f7d8ff8edf}</Project> <Project>{ff7f943d-a89c-4e6c-97cf-84f7d8ff8edf}</Project>
</ProjectReference> </ProjectReference>
</ItemGroup> </ItemGroup>
@ -95,7 +95,9 @@
<Optimization>Disabled</Optimization> <Optimization>Disabled</Optimization>
<TreatWarningAsError>true</TreatWarningAsError> <TreatWarningAsError>true</TreatWarningAsError>
<DebugInformationFormat>None</DebugInformationFormat> <DebugInformationFormat>None</DebugInformationFormat>
<AdditionalIncludeDirectories>../</AdditionalIncludeDirectories> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<AdditionalIncludeDirectories>../src/</AdditionalIncludeDirectories>
<MinimalRebuild>false</MinimalRebuild>
</ClCompile> </ClCompile>
<Link> <Link>
<SubSystem>Windows</SubSystem> <SubSystem>Windows</SubSystem>
@ -111,7 +113,9 @@
<BufferSecurityCheck>false</BufferSecurityCheck> <BufferSecurityCheck>false</BufferSecurityCheck>
<TreatWarningAsError>true</TreatWarningAsError> <TreatWarningAsError>true</TreatWarningAsError>
<DebugInformationFormat>None</DebugInformationFormat> <DebugInformationFormat>None</DebugInformationFormat>
<AdditionalIncludeDirectories>../</AdditionalIncludeDirectories> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<AdditionalIncludeDirectories>../src/</AdditionalIncludeDirectories>
<MinimalRebuild>false</MinimalRebuild>
</ClCompile> </ClCompile>
<Link> <Link>
<SubSystem>Windows</SubSystem> <SubSystem>Windows</SubSystem>

40
kiwano-imgui/kiwano-imgui.vcxproj.filters → projects/kiwano-imgui.vcxproj.filters
View File

@ -12,64 +12,64 @@
</Filter> </Filter>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="src\imgui_impl_dx10.h"> <ClInclude Include="..\src\kiwano-imgui\src\imgui_impl_dx10.h">
<Filter>src</Filter> <Filter>src</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="src\imgui_impl_dx11.h"> <ClInclude Include="..\src\kiwano-imgui\src\imgui_impl_dx11.h">
<Filter>src</Filter> <Filter>src</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="src\ImGuiLayer.h"> <ClInclude Include="..\src\kiwano-imgui\src\ImGuiLayer.h">
<Filter>src</Filter> <Filter>src</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="third-party\ImGui\imconfig.h"> <ClInclude Include="..\src\kiwano-imgui\third-party\ImGui\imconfig.h">
<Filter>third-party\ImGui</Filter> <Filter>third-party\ImGui</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="third-party\ImGui\imgui.h"> <ClInclude Include="..\src\kiwano-imgui\third-party\ImGui\imgui.h">
<Filter>third-party\ImGui</Filter> <Filter>third-party\ImGui</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="third-party\ImGui\imgui_internal.h"> <ClInclude Include="..\src\kiwano-imgui\third-party\ImGui\imgui_internal.h">
<Filter>third-party\ImGui</Filter> <Filter>third-party\ImGui</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="third-party\ImGui\imstb_rectpack.h"> <ClInclude Include="..\src\kiwano-imgui\third-party\ImGui\imstb_rectpack.h">
<Filter>third-party\ImGui</Filter> <Filter>third-party\ImGui</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="third-party\ImGui\imstb_textedit.h"> <ClInclude Include="..\src\kiwano-imgui\third-party\ImGui\imstb_textedit.h">
<Filter>third-party\ImGui</Filter> <Filter>third-party\ImGui</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="third-party\ImGui\imstb_truetype.h"> <ClInclude Include="..\src\kiwano-imgui\third-party\ImGui\imstb_truetype.h">
<Filter>third-party\ImGui</Filter> <Filter>third-party\ImGui</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="kiwano-imgui.h" /> <ClInclude Include="..\src\kiwano-imgui\kiwano-imgui.h" />
<ClInclude Include="src\imgui_impl.h"> <ClInclude Include="..\src\kiwano-imgui\src\imgui_impl.h">
<Filter>src</Filter> <Filter>src</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="src\ImGuiModule.h"> <ClInclude Include="..\src\kiwano-imgui\src\ImGuiModule.h">
<Filter>src</Filter> <Filter>src</Filter>
</ClInclude> </ClInclude>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="src\imgui_impl_dx10.cpp"> <ClCompile Include="..\src\kiwano-imgui\src\imgui_impl_dx10.cpp">
<Filter>src</Filter> <Filter>src</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="src\imgui_impl_dx11.cpp"> <ClCompile Include="..\src\kiwano-imgui\src\imgui_impl_dx11.cpp">
<Filter>src</Filter> <Filter>src</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="src\ImGuiLayer.cpp"> <ClCompile Include="..\src\kiwano-imgui\src\ImGuiLayer.cpp">
<Filter>src</Filter> <Filter>src</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="third-party\ImGui\imgui.cpp"> <ClCompile Include="..\src\kiwano-imgui\third-party\ImGui\imgui.cpp">
<Filter>third-party\ImGui</Filter> <Filter>third-party\ImGui</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="third-party\ImGui\imgui_demo.cpp"> <ClCompile Include="..\src\kiwano-imgui\third-party\ImGui\imgui_demo.cpp">
<Filter>third-party\ImGui</Filter> <Filter>third-party\ImGui</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="third-party\ImGui\imgui_draw.cpp"> <ClCompile Include="..\src\kiwano-imgui\third-party\ImGui\imgui_draw.cpp">
<Filter>third-party\ImGui</Filter> <Filter>third-party\ImGui</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="third-party\ImGui\imgui_widgets.cpp"> <ClCompile Include="..\src\kiwano-imgui\third-party\ImGui\imgui_widgets.cpp">
<Filter>third-party\ImGui</Filter> <Filter>third-party\ImGui</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="src\ImGuiModule.cpp"> <ClCompile Include="..\src\kiwano-imgui\src\ImGuiModule.cpp">
<Filter>src</Filter> <Filter>src</Filter>
</ClCompile> </ClCompile>
</ItemGroup> </ItemGroup>

24
kiwano-network/kiwano-network.vcxproj → projects/kiwano-network.vcxproj
View File

@ -1,14 +1,14 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<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="kiwano-network.h" /> <ClInclude Include="..\src\kiwano-network\kiwano-network.h" />
<ClInclude Include="src\helper.h" /> <ClInclude Include="..\src\kiwano-network\src\helper.h" />
<ClInclude Include="src\HttpClient.h" /> <ClInclude Include="..\src\kiwano-network\src\HttpClient.h" />
<ClInclude Include="src\HttpRequest.h" /> <ClInclude Include="..\src\kiwano-network\src\HttpRequest.h" />
<ClInclude Include="src\HttpResponse.h" /> <ClInclude Include="..\src\kiwano-network\src\HttpResponse.h" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="src\HttpClient.cpp" /> <ClCompile Include="..\src\kiwano-network\src\HttpClient.cpp" />
</ItemGroup> </ItemGroup>
<ItemGroup Label="ProjectConfigurations"> <ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32"> <ProjectConfiguration Include="Debug|Win32">
@ -21,10 +21,10 @@
</ProjectConfiguration> </ProjectConfiguration>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Library Include="third-party\libs\libcurl.lib" /> <Library Include="..\src\kiwano-network\third-party\libs\libcurl.lib" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\kiwano\kiwano.vcxproj"> <ProjectReference Include="kiwano.vcxproj">
<Project>{ff7f943d-a89c-4e6c-97cf-84f7d8ff8edf}</Project> <Project>{ff7f943d-a89c-4e6c-97cf-84f7d8ff8edf}</Project>
</ProjectReference> </ProjectReference>
</ItemGroup> </ItemGroup>
@ -84,7 +84,9 @@
<Optimization>Disabled</Optimization> <Optimization>Disabled</Optimization>
<TreatWarningAsError>true</TreatWarningAsError> <TreatWarningAsError>true</TreatWarningAsError>
<DebugInformationFormat>None</DebugInformationFormat> <DebugInformationFormat>None</DebugInformationFormat>
<AdditionalIncludeDirectories>../</AdditionalIncludeDirectories> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<AdditionalIncludeDirectories>../src/</AdditionalIncludeDirectories>
<MinimalRebuild>false</MinimalRebuild>
</ClCompile> </ClCompile>
<Link> <Link>
<SubSystem>Windows</SubSystem> <SubSystem>Windows</SubSystem>
@ -100,7 +102,9 @@
<BufferSecurityCheck>false</BufferSecurityCheck> <BufferSecurityCheck>false</BufferSecurityCheck>
<TreatWarningAsError>true</TreatWarningAsError> <TreatWarningAsError>true</TreatWarningAsError>
<DebugInformationFormat>None</DebugInformationFormat> <DebugInformationFormat>None</DebugInformationFormat>
<AdditionalIncludeDirectories>../</AdditionalIncludeDirectories> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<AdditionalIncludeDirectories>../src/</AdditionalIncludeDirectories>
<MinimalRebuild>false</MinimalRebuild>
</ClCompile> </ClCompile>
<Link> <Link>
<SubSystem>Windows</SubSystem> <SubSystem>Windows</SubSystem>

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

@ -1,17 +1,17 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<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="kiwano-network.h" /> <ClInclude Include="..\src\kiwano-network\kiwano-network.h" />
<ClInclude Include="src\helper.h"> <ClInclude Include="..\src\kiwano-network\src\helper.h">
<Filter>src</Filter> <Filter>src</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="src\HttpClient.h"> <ClInclude Include="..\src\kiwano-network\src\HttpClient.h">
<Filter>src</Filter> <Filter>src</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="src\HttpRequest.h"> <ClInclude Include="..\src\kiwano-network\src\HttpRequest.h">
<Filter>src</Filter> <Filter>src</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="src\HttpResponse.h"> <ClInclude Include="..\src\kiwano-network\src\HttpResponse.h">
<Filter>src</Filter> <Filter>src</Filter>
</ClInclude> </ClInclude>
</ItemGroup> </ItemGroup>
@ -24,7 +24,7 @@
</Filter> </Filter>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="src\HttpClient.cpp"> <ClCompile Include="..\src\kiwano-network\src\HttpClient.cpp">
<Filter>src</Filter> <Filter>src</Filter>
</ClCompile> </ClCompile>
</ItemGroup> </ItemGroup>

227
projects/kiwano.vcxproj Normal file
View File

@ -0,0 +1,227 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<ClInclude Include="..\src\kiwano\2d\GifSprite.h" />
<ClInclude Include="..\src\kiwano\base\types.h" />
<ClInclude Include="..\src\kiwano\kiwano.h" />
<ClInclude Include="..\src\kiwano\config.h" />
<ClInclude Include="..\src\kiwano\macros.h" />
<ClInclude Include="..\src\kiwano\2d\include-forwards.h" />
<ClInclude Include="..\src\kiwano\2d\Action.h" />
<ClInclude Include="..\src\kiwano\2d\ActionGroup.h" />
<ClInclude Include="..\src\kiwano\2d\ActionHelper.h" />
<ClInclude Include="..\src\kiwano\2d\ActionManager.h" />
<ClInclude Include="..\src\kiwano\2d\ActionTween.h" />
<ClInclude Include="..\src\kiwano\2d\Animation.h" />
<ClInclude Include="..\src\kiwano\2d\Canvas.h" />
<ClInclude Include="..\src\kiwano\2d\Color.h" />
<ClInclude Include="..\src\kiwano\2d\DebugNode.h" />
<ClInclude Include="..\src\kiwano\2d\Font.hpp" />
<ClInclude Include="..\src\kiwano\2d\Frames.h" />
<ClInclude Include="..\src\kiwano\2d\Geometry.h" />
<ClInclude Include="..\src\kiwano\2d\GeometryNode.h" />
<ClInclude Include="..\src\kiwano\2d\GifImage.h" />
<ClInclude Include="..\src\kiwano\2d\Image.h" />
<ClInclude Include="..\src\kiwano\2d\Layer.h" />
<ClInclude Include="..\src\kiwano\2d\Node.h" />
<ClInclude Include="..\src\kiwano\2d\Scene.h" />
<ClInclude Include="..\src\kiwano\2d\Sprite.h" />
<ClInclude Include="..\src\kiwano\2d\Text.h" />
<ClInclude Include="..\src\kiwano\2d\TextStyle.hpp" />
<ClInclude Include="..\src\kiwano\2d\Transform.hpp" />
<ClInclude Include="..\src\kiwano\2d\Transition.h" />
<ClInclude Include="..\src\kiwano\base\AsyncTask.h" />
<ClInclude Include="..\src\kiwano\base\Component.h" />
<ClInclude Include="..\src\kiwano\base\Event.hpp" />
<ClInclude Include="..\src\kiwano\base\EventDispatcher.h" />
<ClInclude Include="..\src\kiwano\base\EventListener.h" />
<ClInclude Include="..\src\kiwano\base\Input.h" />
<ClInclude Include="..\src\kiwano\base\keys.hpp" />
<ClInclude Include="..\src\kiwano\base\logs.h" />
<ClInclude Include="..\src\kiwano\base\Object.h" />
<ClInclude Include="..\src\kiwano\base\RefCounter.hpp" />
<ClInclude Include="..\src\kiwano\base\Resource.h" />
<ClInclude Include="..\src\kiwano\base\SmartPtr.hpp" />
<ClInclude Include="..\src\kiwano\base\Timer.h" />
<ClInclude Include="..\src\kiwano\base\TimerManager.h" />
<ClInclude Include="..\src\kiwano\base\time.h" />
<ClInclude Include="..\src\kiwano\base\window.h" />
<ClInclude Include="..\src\kiwano\common\Array.hpp" />
<ClInclude Include="..\src\kiwano\common\Closure.hpp" />
<ClInclude Include="..\src\kiwano\common\ComPtr.hpp" />
<ClInclude Include="..\src\kiwano\common\helper.h" />
<ClInclude Include="..\src\kiwano\common\IntrusiveList.hpp" />
<ClInclude Include="..\src\kiwano\common\IntrusivePtr.hpp" />
<ClInclude Include="..\src\kiwano\common\Json.hpp" />
<ClInclude Include="..\src\kiwano\common\Noncopyable.hpp" />
<ClInclude Include="..\src\kiwano\common\Singleton.hpp" />
<ClInclude Include="..\src\kiwano\common\String.hpp" />
<ClInclude Include="..\src\kiwano\math\constants.hpp" />
<ClInclude Include="..\src\kiwano\math\ease.hpp" />
<ClInclude Include="..\src\kiwano\math\helper.h" />
<ClInclude Include="..\src\kiwano\math\Matrix.hpp" />
<ClInclude Include="..\src\kiwano\math\rand.h" />
<ClInclude Include="..\src\kiwano\math\Rect.hpp" />
<ClInclude Include="..\src\kiwano\math\scalar.hpp" />
<ClInclude Include="..\src\kiwano\math\Vec2.hpp" />
<ClInclude Include="..\src\kiwano\platform\Application.h" />
<ClInclude Include="..\src\kiwano\platform\modules.h" />
<ClInclude Include="..\src\kiwano\renderer\D2DDeviceResources.h" />
<ClInclude Include="..\src\kiwano\renderer\D3D10DeviceResources.h" />
<ClInclude Include="..\src\kiwano\renderer\D3D11DeviceResources.h" />
<ClInclude Include="..\src\kiwano\renderer\D3DDeviceResourcesBase.h" />
<ClInclude Include="..\src\kiwano\renderer\helper.hpp" />
<ClInclude Include="..\src\kiwano\renderer\render.h" />
<ClInclude Include="..\src\kiwano\renderer\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\Menu.h" />
<ClInclude Include="..\src\kiwano\utils\DataUtil.h" />
<ClInclude Include="..\src\kiwano\utils\FileUtil.h" />
<ClInclude Include="..\src\kiwano\utils\Path.h" />
<ClInclude Include="..\src\kiwano\utils\ResLoader.h" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\src\kiwano\2d\Action.cpp" />
<ClCompile Include="..\src\kiwano\2d\ActionGroup.cpp" />
<ClCompile Include="..\src\kiwano\2d\ActionManager.cpp" />
<ClCompile Include="..\src\kiwano\2d\ActionTween.cpp" />
<ClCompile Include="..\src\kiwano\2d\Animation.cpp" />
<ClCompile Include="..\src\kiwano\2d\Canvas.cpp" />
<ClCompile Include="..\src\kiwano\2d\Color.cpp" />
<ClCompile Include="..\src\kiwano\2d\DebugNode.cpp" />
<ClCompile Include="..\src\kiwano\2d\Frames.cpp" />
<ClCompile Include="..\src\kiwano\2d\Geometry.cpp" />
<ClCompile Include="..\src\kiwano\2d\GeometryNode.cpp" />
<ClCompile Include="..\src\kiwano\2d\GifImage.cpp" />
<ClCompile Include="..\src\kiwano\2d\GifSprite.cpp" />
<ClCompile Include="..\src\kiwano\2d\Image.cpp" />
<ClCompile Include="..\src\kiwano\2d\Layer.cpp" />
<ClCompile Include="..\src\kiwano\2d\Node.cpp" />
<ClCompile Include="..\src\kiwano\2d\Scene.cpp" />
<ClCompile Include="..\src\kiwano\2d\Sprite.cpp" />
<ClCompile Include="..\src\kiwano\2d\Text.cpp" />
<ClCompile Include="..\src\kiwano\2d\Transition.cpp" />
<ClCompile Include="..\src\kiwano\base\AsyncTask.cpp" />
<ClCompile Include="..\src\kiwano\base\EventDispatcher.cpp" />
<ClCompile Include="..\src\kiwano\base\EventListener.cpp" />
<ClCompile Include="..\src\kiwano\base\Input.cpp" />
<ClCompile Include="..\src\kiwano\base\logs.cpp" />
<ClCompile Include="..\src\kiwano\base\Object.cpp" />
<ClCompile Include="..\src\kiwano\base\Resource.cpp" />
<ClCompile Include="..\src\kiwano\base\Timer.cpp" />
<ClCompile Include="..\src\kiwano\base\TimerManager.cpp" />
<ClCompile Include="..\src\kiwano\base\time.cpp" />
<ClCompile Include="..\src\kiwano\base\window.cpp" />
<ClCompile Include="..\src\kiwano\platform\Application.cpp" />
<ClCompile Include="..\src\kiwano\platform\modules.cpp" />
<ClCompile Include="..\src\kiwano\renderer\D2DDeviceResources.cpp" />
<ClCompile Include="..\src\kiwano\renderer\D3D10DeviceResources.cpp" />
<ClCompile Include="..\src\kiwano\renderer\D3D11DeviceResources.cpp" />
<ClCompile Include="..\src\kiwano\renderer\render.cpp" />
<ClCompile Include="..\src\kiwano\renderer\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\Menu.cpp" />
<ClCompile Include="..\src\kiwano\utils\DataUtil.cpp" />
<ClCompile Include="..\src\kiwano\utils\FileUtil.cpp" />
<ClCompile Include="..\src\kiwano\utils\Path.cpp" />
<ClCompile Include="..\src\kiwano\utils\ResLoader.cpp" />
</ItemGroup>
<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>
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{FF7F943D-A89C-4E6C-97CF-84F7D8FF8EDF}</ProjectGuid>
<RootNamespace>kiwano</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>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '10.0'">v100</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '11.0'">v110</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '12.0'">v120</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '14.0'">v140</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '15.0'">v141</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '16.0'">v142</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<WholeProgramOptimization>false</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '10.0'">v100</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '11.0'">v110</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '12.0'">v120</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '14.0'">v140</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '15.0'">v141</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '16.0'">v142</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</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>
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<OutDir>$(SolutionDir)\output\$(Platform)\$(Configuration).$(PlatformToolset)\</OutDir>
<IntDir>$(SolutionDir)\build\$(Platform)\$(Configuration).$(PlatformToolset)\$(ProjectName)\</IntDir>
<LinkIncremental>true</LinkIncremental>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<OutDir>$(SolutionDir)\output\$(Platform)\$(Configuration).$(PlatformToolset)\</OutDir>
<IntDir>$(SolutionDir)\build\$(Platform)\$(Configuration).$(PlatformToolset)\$(ProjectName)\</IntDir>
<LinkIncremental>false</LinkIncremental>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<TreatWarningAsError>true</TreatWarningAsError>
<DebugInformationFormat>None</DebugInformationFormat>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<MinimalRebuild>false</MinimalRebuild>
</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>
<BufferSecurityCheck>false</BufferSecurityCheck>
<TreatWarningAsError>true</TreatWarningAsError>
<DebugInformationFormat>None</DebugInformationFormat>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<MinimalRebuild>false</MinimalRebuild>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>false</GenerateDebugInformation>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
</Link>
</ItemDefinitionGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>

0
kiwano/Kiwano.vcxproj.filters → projects/kiwano.vcxproj.filters
View File

6
samples/Box2DSample/Box2DSample.vcxproj
View File

@ -65,7 +65,7 @@
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization> <Optimization>Disabled</Optimization>
<ConformanceMode>true</ConformanceMode> <ConformanceMode>true</ConformanceMode>
<AdditionalIncludeDirectories>../..;</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>../../src;</AdditionalIncludeDirectories>
</ClCompile> </ClCompile>
<Link> <Link>
<GenerateDebugInformation>true</GenerateDebugInformation> <GenerateDebugInformation>true</GenerateDebugInformation>
@ -79,7 +79,7 @@
<FunctionLevelLinking>true</FunctionLevelLinking> <FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions> <IntrinsicFunctions>true</IntrinsicFunctions>
<ConformanceMode>true</ConformanceMode> <ConformanceMode>true</ConformanceMode>
<AdditionalIncludeDirectories>../..;</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>../../src;</AdditionalIncludeDirectories>
</ClCompile> </ClCompile>
<Link> <Link>
<EnableCOMDATFolding>true</EnableCOMDATFolding> <EnableCOMDATFolding>true</EnableCOMDATFolding>
@ -92,7 +92,7 @@
<ClCompile Include="main.cpp" /> <ClCompile Include="main.cpp" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\..\kiwano\kiwano.vcxproj"> <ProjectReference Include="..\..\projects\kiwano.vcxproj">
<Project>{ff7f943d-a89c-4e6c-97cf-84f7d8ff8edf}</Project> <Project>{ff7f943d-a89c-4e6c-97cf-84f7d8ff8edf}</Project>
</ProjectReference> </ProjectReference>
</ItemGroup> </ItemGroup>

6
samples/HelloWorld/HelloWorld.vcxproj
View File

@ -66,7 +66,7 @@
<Optimization>Disabled</Optimization> <Optimization>Disabled</Optimization>
<SDLCheck>true</SDLCheck> <SDLCheck>true</SDLCheck>
<ConformanceMode>true</ConformanceMode> <ConformanceMode>true</ConformanceMode>
<AdditionalIncludeDirectories>../..;</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>../../src;</AdditionalIncludeDirectories>
</ClCompile> </ClCompile>
<Link> <Link>
<GenerateDebugInformation>true</GenerateDebugInformation> <GenerateDebugInformation>true</GenerateDebugInformation>
@ -81,7 +81,7 @@
<IntrinsicFunctions>true</IntrinsicFunctions> <IntrinsicFunctions>true</IntrinsicFunctions>
<SDLCheck>true</SDLCheck> <SDLCheck>true</SDLCheck>
<ConformanceMode>true</ConformanceMode> <ConformanceMode>true</ConformanceMode>
<AdditionalIncludeDirectories>../..;</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>../../src;</AdditionalIncludeDirectories>
</ClCompile> </ClCompile>
<Link> <Link>
<EnableCOMDATFolding>true</EnableCOMDATFolding> <EnableCOMDATFolding>true</EnableCOMDATFolding>
@ -94,7 +94,7 @@
<ClCompile Include="main.cpp" /> <ClCompile Include="main.cpp" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\..\kiwano\kiwano.vcxproj"> <ProjectReference Include="..\..\projects\kiwano.vcxproj">
<Project>{ff7f943d-a89c-4e6c-97cf-84f7d8ff8edf}</Project> <Project>{ff7f943d-a89c-4e6c-97cf-84f7d8ff8edf}</Project>
</ProjectReference> </ProjectReference>
</ItemGroup> </ItemGroup>

8
samples/ImGuiSample/ImGuiSample.vcxproj
View File

@ -65,7 +65,7 @@
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization> <Optimization>Disabled</Optimization>
<ConformanceMode>true</ConformanceMode> <ConformanceMode>true</ConformanceMode>
<AdditionalIncludeDirectories>../..;</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>../../src;</AdditionalIncludeDirectories>
</ClCompile> </ClCompile>
<Link> <Link>
<GenerateDebugInformation>true</GenerateDebugInformation> <GenerateDebugInformation>true</GenerateDebugInformation>
@ -79,7 +79,7 @@
<FunctionLevelLinking>true</FunctionLevelLinking> <FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions> <IntrinsicFunctions>true</IntrinsicFunctions>
<ConformanceMode>true</ConformanceMode> <ConformanceMode>true</ConformanceMode>
<AdditionalIncludeDirectories>../..;</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>../../src;</AdditionalIncludeDirectories>
</ClCompile> </ClCompile>
<Link> <Link>
<EnableCOMDATFolding>true</EnableCOMDATFolding> <EnableCOMDATFolding>true</EnableCOMDATFolding>
@ -92,10 +92,10 @@
<ClCompile Include="main.cpp" /> <ClCompile Include="main.cpp" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\..\kiwano-imgui\kiwano-imgui.vcxproj"> <ProjectReference Include="..\..\projects\kiwano-imgui.vcxproj">
<Project>{a7062ed8-8910-48a5-a3bc-c1612672571f}</Project> <Project>{a7062ed8-8910-48a5-a3bc-c1612672571f}</Project>
</ProjectReference> </ProjectReference>
<ProjectReference Include="..\..\kiwano\kiwano.vcxproj"> <ProjectReference Include="..\..\projects\kiwano.vcxproj">
<Project>{ff7f943d-a89c-4e6c-97cf-84f7d8ff8edf}</Project> <Project>{ff7f943d-a89c-4e6c-97cf-84f7d8ff8edf}</Project>
</ProjectReference> </ProjectReference>
</ItemGroup> </ItemGroup>

22
Kiwano.sln → samples/Samples.sln
View File

@ -2,26 +2,24 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16 # Visual Studio Version 16
VisualStudioVersion = 16.0.28729.10 VisualStudioVersion = 16.0.28729.10
MinimumVisualStudioVersion = 10.0.40219.1 MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "HelloWorld", "samples\HelloWorld\HelloWorld.vcxproj", "{3561A359-F9FD-48AB-A977-34E7E568BC8E}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "HelloWorld", "HelloWorld\HelloWorld.vcxproj", "{3561A359-F9FD-48AB-A977-34E7E568BC8E}"
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "kiwano", "kiwano\kiwano.vcxproj", "{FF7F943D-A89C-4E6C-97CF-84F7D8FF8EDF}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Samples", "Samples\Samples.vcxproj", "{45F5738D-CDF2-4024-974D-25B64F9043DE}"
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Samples", "samples\Samples\Samples.vcxproj", "{45F5738D-CDF2-4024-974D-25B64F9043DE}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ImGuiSample", "ImGuiSample\ImGuiSample.vcxproj", "{6152D36C-EA40-4968-A696-244B6CA58395}"
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ImGuiSample", "samples\ImGuiSample\ImGuiSample.vcxproj", "{6152D36C-EA40-4968-A696-244B6CA58395}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Box2DSample", "Box2DSample\Box2DSample.vcxproj", "{324CFF47-4EB2-499A-BE5F-53A82E3BA14B}"
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Box2DSample", "samples\Box2DSample\Box2DSample.vcxproj", "{324CFF47-4EB2-499A-BE5F-53A82E3BA14B}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "kiwano", "..\projects\kiwano.vcxproj", "{FF7F943D-A89C-4E6C-97CF-84F7D8FF8EDF}"
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "kiwano-audio", "kiwano-audio\kiwano-audio.vcxproj", "{1B97937D-8184-426C-BE71-29A163DC76C9}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "kiwano-audio", "..\projects\kiwano-audio.vcxproj", "{1B97937D-8184-426C-BE71-29A163DC76C9}"
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "kiwano-network", "kiwano-network\kiwano-network.vcxproj", "{69DFBE92-C06F-4CF8-9495-CA9BF2E3BAF2}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "kiwano-network", "..\projects\kiwano-network.vcxproj", "{69DFBE92-C06F-4CF8-9495-CA9BF2E3BAF2}"
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "kiwano-imgui", "kiwano-imgui\kiwano-imgui.vcxproj", "{A7062ED8-8910-48A5-A3BC-C1612672571F}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "kiwano-imgui", "..\projects\kiwano-imgui.vcxproj", "{A7062ED8-8910-48A5-A3BC-C1612672571F}"
EndProject EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Libraries", "Libraries", "{44D7EDE1-8C27-4608-8018-F891280A77B2}" Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Libraries", "Libraries", "{44D7EDE1-8C27-4608-8018-F891280A77B2}"
EndProject EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Samples", "Samples", "{E8C0BB3C-0F04-4A0E-8755-5AE759E6288C}"
EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32 Debug|Win32 = Debug|Win32
@ -66,11 +64,7 @@ Global
HideSolutionNode = FALSE HideSolutionNode = FALSE
EndGlobalSection EndGlobalSection
GlobalSection(NestedProjects) = preSolution GlobalSection(NestedProjects) = preSolution
{3561A359-F9FD-48AB-A977-34E7E568BC8E} = {E8C0BB3C-0F04-4A0E-8755-5AE759E6288C}
{FF7F943D-A89C-4E6C-97CF-84F7D8FF8EDF} = {44D7EDE1-8C27-4608-8018-F891280A77B2} {FF7F943D-A89C-4E6C-97CF-84F7D8FF8EDF} = {44D7EDE1-8C27-4608-8018-F891280A77B2}
{45F5738D-CDF2-4024-974D-25B64F9043DE} = {E8C0BB3C-0F04-4A0E-8755-5AE759E6288C}
{6152D36C-EA40-4968-A696-244B6CA58395} = {E8C0BB3C-0F04-4A0E-8755-5AE759E6288C}
{324CFF47-4EB2-499A-BE5F-53A82E3BA14B} = {E8C0BB3C-0F04-4A0E-8755-5AE759E6288C}
{1B97937D-8184-426C-BE71-29A163DC76C9} = {44D7EDE1-8C27-4608-8018-F891280A77B2} {1B97937D-8184-426C-BE71-29A163DC76C9} = {44D7EDE1-8C27-4608-8018-F891280A77B2}
{69DFBE92-C06F-4CF8-9495-CA9BF2E3BAF2} = {44D7EDE1-8C27-4608-8018-F891280A77B2} {69DFBE92-C06F-4CF8-9495-CA9BF2E3BAF2} = {44D7EDE1-8C27-4608-8018-F891280A77B2}
{A7062ED8-8910-48A5-A3BC-C1612672571F} = {44D7EDE1-8C27-4608-8018-F891280A77B2} {A7062ED8-8910-48A5-A3BC-C1612672571F} = {44D7EDE1-8C27-4608-8018-F891280A77B2}

14
samples/Samples/Samples.vcxproj
View File

@ -65,7 +65,7 @@
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization> <Optimization>Disabled</Optimization>
<ConformanceMode>true</ConformanceMode> <ConformanceMode>true</ConformanceMode>
<AdditionalIncludeDirectories>../..;</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>../../src;</AdditionalIncludeDirectories>
</ClCompile> </ClCompile>
<Link> <Link>
<GenerateDebugInformation>true</GenerateDebugInformation> <GenerateDebugInformation>true</GenerateDebugInformation>
@ -74,7 +74,7 @@
<PreBuildEvent> <PreBuildEvent>
<Command> <Command>
xcopy "$(ProjectDir)\res" "$(OutDir)\res\" /D /E /I /F /Y xcopy "$(ProjectDir)\res" "$(OutDir)\res\" /D /E /I /F /Y
xcopy "$(ProjectDir)..\..\kiwano-network\dlls\*.dll" "$(OutDir)" /D /Y xcopy "$(ProjectDir)..\..\src\kiwano-network\dlls\*.dll" "$(OutDir)" /D /Y
</Command> </Command>
<Message>Copy files</Message> <Message>Copy files</Message>
</PreBuildEvent> </PreBuildEvent>
@ -86,7 +86,7 @@
<FunctionLevelLinking>true</FunctionLevelLinking> <FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions> <IntrinsicFunctions>true</IntrinsicFunctions>
<ConformanceMode>true</ConformanceMode> <ConformanceMode>true</ConformanceMode>
<AdditionalIncludeDirectories>../..;</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>../../src;</AdditionalIncludeDirectories>
</ClCompile> </ClCompile>
<Link> <Link>
<EnableCOMDATFolding>true</EnableCOMDATFolding> <EnableCOMDATFolding>true</EnableCOMDATFolding>
@ -97,7 +97,7 @@
<PreBuildEvent> <PreBuildEvent>
<Command> <Command>
xcopy "$(ProjectDir)\res" "$(OutDir)\res\" /D /E /I /F /Y xcopy "$(ProjectDir)\res" "$(OutDir)\res\" /D /E /I /F /Y
xcopy "$(ProjectDir)..\..\kiwano-network\dlls\*.dll" "$(OutDir)" /D /Y xcopy "$(ProjectDir)..\..\src\kiwano-network\dlls\*.dll" "$(OutDir)" /D /Y
</Command> </Command>
<Message>Copy files</Message> <Message>Copy files</Message>
</PreBuildEvent> </PreBuildEvent>
@ -115,13 +115,13 @@
<ClInclude Include="resource.h" /> <ClInclude Include="resource.h" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\..\kiwano-audio\kiwano-audio.vcxproj"> <ProjectReference Include="..\..\projects\kiwano-audio.vcxproj">
<Project>{1b97937d-8184-426c-be71-29a163dc76c9}</Project> <Project>{1b97937d-8184-426c-be71-29a163dc76c9}</Project>
</ProjectReference> </ProjectReference>
<ProjectReference Include="..\..\kiwano-network\kiwano-network.vcxproj"> <ProjectReference Include="..\..\projects\kiwano-network.vcxproj">
<Project>{69dfbe92-c06f-4cf8-9495-ca9bf2e3baf2}</Project> <Project>{69dfbe92-c06f-4cf8-9495-ca9bf2e3baf2}</Project>
</ProjectReference> </ProjectReference>
<ProjectReference Include="..\..\kiwano\kiwano.vcxproj"> <ProjectReference Include="..\..\projects\kiwano.vcxproj">
<Project>{ff7f943d-a89c-4e6c-97cf-84f7d8ff8edf}</Project> <Project>{ff7f943d-a89c-4e6c-97cf-84f7d8ff8edf}</Project>
</ProjectReference> </ProjectReference>
</ItemGroup> </ItemGroup>

0
kiwano-audio/kiwano-audio.h → src/kiwano-audio/kiwano-audio.h
View File

0
kiwano-audio/src/Player.cpp → src/kiwano-audio/src/Player.cpp
View File

0
kiwano-audio/src/Player.h → src/kiwano-audio/src/Player.h
View File

0
kiwano-audio/src/Sound.cpp → src/kiwano-audio/src/Sound.cpp
View File

0
kiwano-audio/src/Sound.h → src/kiwano-audio/src/Sound.h
View File

0
kiwano-audio/src/Transcoder.cpp → src/kiwano-audio/src/Transcoder.cpp
View File

0
kiwano-audio/src/Transcoder.h → src/kiwano-audio/src/Transcoder.h
View File

0
kiwano-audio/src/audio-modules.cpp → src/kiwano-audio/src/audio-modules.cpp
View File

0
kiwano-audio/src/audio-modules.h → src/kiwano-audio/src/audio-modules.h
View File

0
kiwano-audio/src/audio.cpp → src/kiwano-audio/src/audio.cpp
View File

0
kiwano-audio/src/audio.h → src/kiwano-audio/src/audio.h
View File

0
kiwano-imgui/kiwano-imgui.h → src/kiwano-imgui/kiwano-imgui.h
View File

0
kiwano-imgui/src/ImGuiLayer.cpp → src/kiwano-imgui/src/ImGuiLayer.cpp
View File

0
kiwano-imgui/src/ImGuiLayer.h → src/kiwano-imgui/src/ImGuiLayer.h
View File

0
kiwano-imgui/src/ImGuiModule.cpp → src/kiwano-imgui/src/ImGuiModule.cpp
View File

0
kiwano-imgui/src/ImGuiModule.h → src/kiwano-imgui/src/ImGuiModule.h
View File

0
kiwano-imgui/src/imgui_impl.h → src/kiwano-imgui/src/imgui_impl.h
View File

0
kiwano-imgui/src/imgui_impl_dx10.cpp → src/kiwano-imgui/src/imgui_impl_dx10.cpp
View File

0
kiwano-imgui/src/imgui_impl_dx10.h → src/kiwano-imgui/src/imgui_impl_dx10.h
View File

0
kiwano-imgui/src/imgui_impl_dx11.cpp → src/kiwano-imgui/src/imgui_impl_dx11.cpp
View File

0
kiwano-imgui/src/imgui_impl_dx11.h → src/kiwano-imgui/src/imgui_impl_dx11.h
View File

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

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

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

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

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

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

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

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

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

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

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

0
kiwano-network/dlls/libcrypto-1_1.dll → src/kiwano-network/dlls/libcrypto-1_1.dll
View File

0
kiwano-network/dlls/libcurl.dll → src/kiwano-network/dlls/libcurl.dll
View File

0
kiwano-network/dlls/libssl-1_1.dll → src/kiwano-network/dlls/libssl-1_1.dll
View File

0
kiwano-network/kiwano-network.h → src/kiwano-network/kiwano-network.h
View File

0
kiwano-network/src/HttpClient.cpp → src/kiwano-network/src/HttpClient.cpp
View File

0
kiwano-network/src/HttpClient.h → src/kiwano-network/src/HttpClient.h
View File

0
kiwano-network/src/HttpRequest.h → src/kiwano-network/src/HttpRequest.h
View File

0
kiwano-network/src/HttpResponse.h → src/kiwano-network/src/HttpResponse.h
View File

0
kiwano-network/src/helper.h → src/kiwano-network/src/helper.h
View File

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

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

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

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

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

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

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

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

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

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

0
kiwano/2d/Action.cpp → src/kiwano/2d/Action.cpp
View File

0
kiwano/2d/Action.h → src/kiwano/2d/Action.h
View File

0
kiwano/2d/ActionGroup.cpp → src/kiwano/2d/ActionGroup.cpp
View File

0
kiwano/2d/ActionGroup.h → src/kiwano/2d/ActionGroup.h
View File

0
kiwano/2d/ActionHelper.h → src/kiwano/2d/ActionHelper.h
View File

0
kiwano/2d/ActionManager.cpp → src/kiwano/2d/ActionManager.cpp
View File

0
kiwano/2d/ActionManager.h → src/kiwano/2d/ActionManager.h
View File

2
kiwano/2d/ActionTween.cpp → src/kiwano/2d/ActionTween.cpp
View File

@ -35,7 +35,7 @@ namespace kiwano
inline EaseFunc MakeEaseElasticOut(float period) { return std::bind(math::EaseElasticOut, std::placeholders::_1, period); } inline EaseFunc MakeEaseElasticOut(float period) { return std::bind(math::EaseElasticOut, std::placeholders::_1, period); }
inline EaseFunc MakeEaseElasticInOut(float period) { return std::bind(math::EaseElasticInOut, std::placeholders::_1, period); } inline EaseFunc MakeEaseElasticInOut(float period) { return std::bind(math::EaseElasticInOut, std::placeholders::_1, period); }
KGE_API EaseFunc Ease::Linear = math::Linear; KGE_API EaseFunc Ease::Linear = math::Linear;
KGE_API EaseFunc Ease::EaseIn = MakeEaseIn(2.f); KGE_API EaseFunc Ease::EaseIn = MakeEaseIn(2.f);
KGE_API EaseFunc Ease::EaseOut = MakeEaseOut(2.f); KGE_API EaseFunc Ease::EaseOut = MakeEaseOut(2.f);
KGE_API EaseFunc Ease::EaseInOut = MakeEaseInOut(2.f); KGE_API EaseFunc Ease::EaseInOut = MakeEaseInOut(2.f);

0
kiwano/2d/ActionTween.h → src/kiwano/2d/ActionTween.h
View File

0
kiwano/2d/Animation.cpp → src/kiwano/2d/Animation.cpp
View File

0
kiwano/2d/Animation.h → src/kiwano/2d/Animation.h
View File

0
kiwano/2d/Canvas.cpp → src/kiwano/2d/Canvas.cpp
View File

0
kiwano/2d/Canvas.h → src/kiwano/2d/Canvas.h
View File

0
kiwano/2d/Color.cpp → src/kiwano/2d/Color.cpp
View File

0
kiwano/2d/Color.h → src/kiwano/2d/Color.h
View File

0
kiwano/2d/DebugNode.cpp → src/kiwano/2d/DebugNode.cpp
View File

0
kiwano/2d/DebugNode.h → src/kiwano/2d/DebugNode.h
View File

0
kiwano/2d/Font.hpp → src/kiwano/2d/Font.hpp
View File

0
kiwano/2d/Frames.cpp → src/kiwano/2d/Frames.cpp
View File

0
kiwano/2d/Frames.h → src/kiwano/2d/Frames.h
View File

0
kiwano/2d/Geometry.cpp → src/kiwano/2d/Geometry.cpp
View File

0
kiwano/2d/Geometry.h → src/kiwano/2d/Geometry.h
View File

0
kiwano/2d/GeometryNode.cpp → src/kiwano/2d/GeometryNode.cpp
View File

0
kiwano/2d/GeometryNode.h → src/kiwano/2d/GeometryNode.h
View File

0
kiwano/2d/GifImage.cpp → src/kiwano/2d/GifImage.cpp
View File

0
kiwano/2d/GifImage.h → src/kiwano/2d/GifImage.h
View File

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

0
kiwano/2d/GifSprite.h → src/kiwano/2d/GifSprite.h
View File

0
kiwano/2d/Image.cpp → src/kiwano/2d/Image.cpp
View File

0
kiwano/2d/Image.h → src/kiwano/2d/Image.h
View File

0
kiwano/2d/Layer.cpp → src/kiwano/2d/Layer.cpp
View File

Some files were not shown because too many files have changed in this diff Show More