diff --git a/appveyor.yml b/appveyor.yml index 677647ad..da142a75 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -2,6 +2,11 @@ version: 0.9.{build} skip_tags: true +image: +- Visual Studio 2019 +- Visual Studio 2017 +- Visual Studio 2015 + skip_commits: message: /\[chore\]/ @@ -22,16 +27,17 @@ platform: - Win32 before_build: -- ps: nuget restore +- ps: nuget restore projects/Kiwano.sln build: - project: ./Kiwano.sln parallel: true - verbosity: minimal + project: projects/Kiwano.sln + verbosity: normal artifacts: -- path: output/Win32/**/*.lib - name: Win32 +- path: projects/output/ + name: $(platform).$(configuration) + type: zip notifications: - provider: Email diff --git a/kiwano/Kiwano.vcxproj b/kiwano/Kiwano.vcxproj deleted file mode 100644 index c43b2b97..00000000 --- a/kiwano/Kiwano.vcxproj +++ /dev/null @@ -1,223 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Debug - Win32 - - - Release - Win32 - - - - {FF7F943D-A89C-4E6C-97CF-84F7D8FF8EDF} - kiwano - - - - StaticLibrary - true - Unicode - v100 - v110 - v120 - v140 - v141 - v142 - - - StaticLibrary - false - false - Unicode - v100 - v110 - v120 - v140 - v141 - v142 - - - - - - - - - - - - - $(SolutionDir)\output\$(Platform)\$(Configuration).$(PlatformToolset)\ - $(SolutionDir)\build\$(Platform)\$(Configuration).$(PlatformToolset)\$(ProjectName)\ - true - - - $(SolutionDir)\output\$(Platform)\$(Configuration).$(PlatformToolset)\ - $(SolutionDir)\build\$(Platform)\$(Configuration).$(PlatformToolset)\$(ProjectName)\ - false - - - - Level3 - Disabled - true - None - - - Windows - true - - - - - Level3 - MaxSpeed - true - true - false - true - None - - - Windows - false - true - true - - - - - - \ No newline at end of file diff --git a/kiwano/common/Closure.hpp b/kiwano/common/Closure.hpp deleted file mode 100644 index 8890b20c..00000000 --- a/kiwano/common/Closure.hpp +++ /dev/null @@ -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 - -namespace kiwano -{ - // - // Closure is a light weight std::function<>-like class - // - - namespace __closure_detail - { - // - // is_callable - // - - namespace __callable_detail - { - template - struct helper - { - template static int test(...); - - template struct class_mem; - template static char test(class_mem<_Uty, &_Uty::operator()>*); - - template struct class_const_mem; - template static char test(class_const_mem<_Uty, &_Uty::operator()>*); - - template< - typename _Uty, - typename _Uret = typename std::decay().operator()(std::declval<_Args>()...))>::type, - typename = typename std::enable_if::value>::type> - static char test(int); - - static constexpr bool value = sizeof(test<_Ty>(0)) == sizeof(char); - }; - } - - template - struct is_callable - : public std::bool_constant<__callable_detail::helper<_Ty, _Ret, _Args...>::value> - { - }; - - // - // Callable - // - - template - class Callable - { - public: - virtual ~Callable() {} - - virtual void AddRef() = 0; - virtual void Release() = 0; - virtual _Ret Invoke(_Args... args) const = 0; - }; - - template - 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 - 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 - 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 - 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 - class Closure; - - template - 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::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::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::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::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); - } -} diff --git a/kiwano/common/noncopyable.hpp b/kiwano/common/noncopyable.hpp deleted file mode 100644 index e6278f6e..00000000 --- a/kiwano/common/noncopyable.hpp +++ /dev/null @@ -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; - }; -} diff --git a/projects/Kiwano.sln b/projects/Kiwano.sln new file mode 100644 index 00000000..4047e40b --- /dev/null +++ b/projects/Kiwano.sln @@ -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 diff --git a/kiwano-audio/kiwano-audio.vcxproj b/projects/kiwano-audio.vcxproj similarity index 82% rename from kiwano-audio/kiwano-audio.vcxproj rename to projects/kiwano-audio.vcxproj index 13ea72f2..c8bbbaa6 100644 --- a/kiwano-audio/kiwano-audio.vcxproj +++ b/projects/kiwano-audio.vcxproj @@ -1,19 +1,19 @@ - - - - - - + + + + + + - - - - - + + + + + @@ -26,7 +26,7 @@ - + {ff7f943d-a89c-4e6c-97cf-84f7d8ff8edf} @@ -86,7 +86,9 @@ Disabled true None - ../ + true + ../src/ + false Windows @@ -101,7 +103,9 @@ true false true - ../ + true + ../src/ + false Windows diff --git a/kiwano-audio/kiwano-audio.vcxproj.filters b/projects/kiwano-audio.vcxproj.filters similarity index 53% rename from kiwano-audio/kiwano-audio.vcxproj.filters rename to projects/kiwano-audio.vcxproj.filters index d82aacef..62e0774b 100644 --- a/kiwano-audio/kiwano-audio.vcxproj.filters +++ b/projects/kiwano-audio.vcxproj.filters @@ -1,37 +1,37 @@  - - + + src - + src - + src - + src - + src - + src - + src - + src - + src - + src diff --git a/kiwano-imgui/kiwano-imgui.vcxproj b/projects/kiwano-imgui.vcxproj similarity index 73% rename from kiwano-imgui/kiwano-imgui.vcxproj rename to projects/kiwano-imgui.vcxproj index ddf59a82..5d1ed79d 100644 --- a/kiwano-imgui/kiwano-imgui.vcxproj +++ b/projects/kiwano-imgui.vcxproj @@ -1,28 +1,28 @@ - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - + + + + + + + + @@ -35,7 +35,7 @@ - + {ff7f943d-a89c-4e6c-97cf-84f7d8ff8edf} @@ -95,7 +95,9 @@ Disabled true None - ../ + true + ../src/ + false Windows @@ -111,7 +113,9 @@ false true None - ../ + true + ../src/ + false Windows diff --git a/kiwano-imgui/kiwano-imgui.vcxproj.filters b/projects/kiwano-imgui.vcxproj.filters similarity index 52% rename from kiwano-imgui/kiwano-imgui.vcxproj.filters rename to projects/kiwano-imgui.vcxproj.filters index 4a6acaaf..6bca8291 100644 --- a/kiwano-imgui/kiwano-imgui.vcxproj.filters +++ b/projects/kiwano-imgui.vcxproj.filters @@ -12,64 +12,64 @@ - + src - + src - + src - + third-party\ImGui - + third-party\ImGui - + third-party\ImGui - + third-party\ImGui - + third-party\ImGui - + third-party\ImGui - - + + src - + src - + src - + src - + src - + third-party\ImGui - + third-party\ImGui - + third-party\ImGui - + third-party\ImGui - + src diff --git a/kiwano-network/kiwano-network.vcxproj b/projects/kiwano-network.vcxproj similarity index 85% rename from kiwano-network/kiwano-network.vcxproj rename to projects/kiwano-network.vcxproj index e46724e7..7f6613a0 100644 --- a/kiwano-network/kiwano-network.vcxproj +++ b/projects/kiwano-network.vcxproj @@ -1,14 +1,14 @@ - - - - - + + + + + - + @@ -21,10 +21,10 @@ - + - + {ff7f943d-a89c-4e6c-97cf-84f7d8ff8edf} @@ -84,7 +84,9 @@ Disabled true None - ../ + true + ../src/ + false Windows @@ -100,7 +102,9 @@ false true None - ../ + true + ../src/ + false Windows diff --git a/kiwano-network/kiwano-network.vcxproj.filters b/projects/kiwano-network.vcxproj.filters similarity index 67% rename from kiwano-network/kiwano-network.vcxproj.filters rename to projects/kiwano-network.vcxproj.filters index 978948ba..1a0803ae 100644 --- a/kiwano-network/kiwano-network.vcxproj.filters +++ b/projects/kiwano-network.vcxproj.filters @@ -1,17 +1,17 @@  - - + + src - + src - + src - + src @@ -24,7 +24,7 @@ - + src diff --git a/projects/kiwano.vcxproj b/projects/kiwano.vcxproj new file mode 100644 index 00000000..5f52109c --- /dev/null +++ b/projects/kiwano.vcxproj @@ -0,0 +1,227 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Debug + Win32 + + + Release + Win32 + + + + {FF7F943D-A89C-4E6C-97CF-84F7D8FF8EDF} + kiwano + + + + StaticLibrary + true + Unicode + v100 + v110 + v120 + v140 + v141 + v142 + + + StaticLibrary + false + false + Unicode + v100 + v110 + v120 + v140 + v141 + v142 + + + + + + + + + + + + + $(SolutionDir)\output\$(Platform)\$(Configuration).$(PlatformToolset)\ + $(SolutionDir)\build\$(Platform)\$(Configuration).$(PlatformToolset)\$(ProjectName)\ + true + + + $(SolutionDir)\output\$(Platform)\$(Configuration).$(PlatformToolset)\ + $(SolutionDir)\build\$(Platform)\$(Configuration).$(PlatformToolset)\$(ProjectName)\ + false + + + + Level3 + Disabled + true + None + true + false + + + Windows + true + + + + + Level3 + MaxSpeed + true + true + false + true + None + true + false + + + Windows + false + true + true + + + + + + \ No newline at end of file diff --git a/kiwano/Kiwano.vcxproj.filters b/projects/kiwano.vcxproj.filters similarity index 100% rename from kiwano/Kiwano.vcxproj.filters rename to projects/kiwano.vcxproj.filters diff --git a/samples/Box2DSample/Box2DSample.vcxproj b/samples/Box2DSample/Box2DSample.vcxproj index bcc63051..c13803c7 100644 --- a/samples/Box2DSample/Box2DSample.vcxproj +++ b/samples/Box2DSample/Box2DSample.vcxproj @@ -65,7 +65,7 @@ Level3 Disabled true - ../..; + ../../src; true @@ -79,7 +79,7 @@ true true true - ../..; + ../../src; true @@ -92,7 +92,7 @@ - + {ff7f943d-a89c-4e6c-97cf-84f7d8ff8edf} diff --git a/samples/HelloWorld/HelloWorld.vcxproj b/samples/HelloWorld/HelloWorld.vcxproj index 919213aa..92f3f564 100644 --- a/samples/HelloWorld/HelloWorld.vcxproj +++ b/samples/HelloWorld/HelloWorld.vcxproj @@ -66,7 +66,7 @@ Disabled true true - ../..; + ../../src; true @@ -81,7 +81,7 @@ true true true - ../..; + ../../src; true @@ -94,7 +94,7 @@ - + {ff7f943d-a89c-4e6c-97cf-84f7d8ff8edf} diff --git a/samples/ImGuiSample/ImGuiSample.vcxproj b/samples/ImGuiSample/ImGuiSample.vcxproj index d1fd88e7..67d075ba 100644 --- a/samples/ImGuiSample/ImGuiSample.vcxproj +++ b/samples/ImGuiSample/ImGuiSample.vcxproj @@ -65,7 +65,7 @@ Level3 Disabled true - ../..; + ../../src; true @@ -79,7 +79,7 @@ true true true - ../..; + ../../src; true @@ -92,10 +92,10 @@ - + {a7062ed8-8910-48a5-a3bc-c1612672571f} - + {ff7f943d-a89c-4e6c-97cf-84f7d8ff8edf} diff --git a/Kiwano.sln b/samples/Samples.sln similarity index 78% rename from Kiwano.sln rename to samples/Samples.sln index e213c856..d3cda943 100644 --- a/Kiwano.sln +++ b/samples/Samples.sln @@ -2,26 +2,24 @@ 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}") = "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 -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 -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 -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 -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 -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 -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 -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 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Libraries", "Libraries", "{44D7EDE1-8C27-4608-8018-F891280A77B2}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Samples", "Samples", "{E8C0BB3C-0F04-4A0E-8755-5AE759E6288C}" -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 @@ -66,11 +64,7 @@ Global HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution - {3561A359-F9FD-48AB-A977-34E7E568BC8E} = {E8C0BB3C-0F04-4A0E-8755-5AE759E6288C} {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} {69DFBE92-C06F-4CF8-9495-CA9BF2E3BAF2} = {44D7EDE1-8C27-4608-8018-F891280A77B2} {A7062ED8-8910-48A5-A3BC-C1612672571F} = {44D7EDE1-8C27-4608-8018-F891280A77B2} diff --git a/samples/Samples/Samples.vcxproj b/samples/Samples/Samples.vcxproj index 29f7af65..3cd0051b 100644 --- a/samples/Samples/Samples.vcxproj +++ b/samples/Samples/Samples.vcxproj @@ -65,7 +65,7 @@ Level3 Disabled true - ../..; + ../../src; true @@ -74,7 +74,7 @@ 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 Copy files @@ -86,7 +86,7 @@ true true true - ../..; + ../../src; true @@ -97,7 +97,7 @@ 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 Copy files @@ -115,13 +115,13 @@ - + {1b97937d-8184-426c-be71-29a163dc76c9} - + {69dfbe92-c06f-4cf8-9495-ca9bf2e3baf2} - + {ff7f943d-a89c-4e6c-97cf-84f7d8ff8edf} diff --git a/kiwano-audio/kiwano-audio.h b/src/kiwano-audio/kiwano-audio.h similarity index 100% rename from kiwano-audio/kiwano-audio.h rename to src/kiwano-audio/kiwano-audio.h diff --git a/kiwano-audio/src/Player.cpp b/src/kiwano-audio/src/Player.cpp similarity index 100% rename from kiwano-audio/src/Player.cpp rename to src/kiwano-audio/src/Player.cpp diff --git a/kiwano-audio/src/Player.h b/src/kiwano-audio/src/Player.h similarity index 100% rename from kiwano-audio/src/Player.h rename to src/kiwano-audio/src/Player.h diff --git a/kiwano-audio/src/Sound.cpp b/src/kiwano-audio/src/Sound.cpp similarity index 100% rename from kiwano-audio/src/Sound.cpp rename to src/kiwano-audio/src/Sound.cpp diff --git a/kiwano-audio/src/Sound.h b/src/kiwano-audio/src/Sound.h similarity index 100% rename from kiwano-audio/src/Sound.h rename to src/kiwano-audio/src/Sound.h diff --git a/kiwano-audio/src/Transcoder.cpp b/src/kiwano-audio/src/Transcoder.cpp similarity index 100% rename from kiwano-audio/src/Transcoder.cpp rename to src/kiwano-audio/src/Transcoder.cpp diff --git a/kiwano-audio/src/Transcoder.h b/src/kiwano-audio/src/Transcoder.h similarity index 100% rename from kiwano-audio/src/Transcoder.h rename to src/kiwano-audio/src/Transcoder.h diff --git a/kiwano-audio/src/audio-modules.cpp b/src/kiwano-audio/src/audio-modules.cpp similarity index 100% rename from kiwano-audio/src/audio-modules.cpp rename to src/kiwano-audio/src/audio-modules.cpp diff --git a/kiwano-audio/src/audio-modules.h b/src/kiwano-audio/src/audio-modules.h similarity index 100% rename from kiwano-audio/src/audio-modules.h rename to src/kiwano-audio/src/audio-modules.h diff --git a/kiwano-audio/src/audio.cpp b/src/kiwano-audio/src/audio.cpp similarity index 100% rename from kiwano-audio/src/audio.cpp rename to src/kiwano-audio/src/audio.cpp diff --git a/kiwano-audio/src/audio.h b/src/kiwano-audio/src/audio.h similarity index 100% rename from kiwano-audio/src/audio.h rename to src/kiwano-audio/src/audio.h diff --git a/kiwano-imgui/kiwano-imgui.h b/src/kiwano-imgui/kiwano-imgui.h similarity index 100% rename from kiwano-imgui/kiwano-imgui.h rename to src/kiwano-imgui/kiwano-imgui.h diff --git a/kiwano-imgui/src/ImGuiLayer.cpp b/src/kiwano-imgui/src/ImGuiLayer.cpp similarity index 100% rename from kiwano-imgui/src/ImGuiLayer.cpp rename to src/kiwano-imgui/src/ImGuiLayer.cpp diff --git a/kiwano-imgui/src/ImGuiLayer.h b/src/kiwano-imgui/src/ImGuiLayer.h similarity index 100% rename from kiwano-imgui/src/ImGuiLayer.h rename to src/kiwano-imgui/src/ImGuiLayer.h diff --git a/kiwano-imgui/src/ImGuiModule.cpp b/src/kiwano-imgui/src/ImGuiModule.cpp similarity index 100% rename from kiwano-imgui/src/ImGuiModule.cpp rename to src/kiwano-imgui/src/ImGuiModule.cpp diff --git a/kiwano-imgui/src/ImGuiModule.h b/src/kiwano-imgui/src/ImGuiModule.h similarity index 100% rename from kiwano-imgui/src/ImGuiModule.h rename to src/kiwano-imgui/src/ImGuiModule.h diff --git a/kiwano-imgui/src/imgui_impl.h b/src/kiwano-imgui/src/imgui_impl.h similarity index 100% rename from kiwano-imgui/src/imgui_impl.h rename to src/kiwano-imgui/src/imgui_impl.h diff --git a/kiwano-imgui/src/imgui_impl_dx10.cpp b/src/kiwano-imgui/src/imgui_impl_dx10.cpp similarity index 100% rename from kiwano-imgui/src/imgui_impl_dx10.cpp rename to src/kiwano-imgui/src/imgui_impl_dx10.cpp diff --git a/kiwano-imgui/src/imgui_impl_dx10.h b/src/kiwano-imgui/src/imgui_impl_dx10.h similarity index 100% rename from kiwano-imgui/src/imgui_impl_dx10.h rename to src/kiwano-imgui/src/imgui_impl_dx10.h diff --git a/kiwano-imgui/src/imgui_impl_dx11.cpp b/src/kiwano-imgui/src/imgui_impl_dx11.cpp similarity index 100% rename from kiwano-imgui/src/imgui_impl_dx11.cpp rename to src/kiwano-imgui/src/imgui_impl_dx11.cpp diff --git a/kiwano-imgui/src/imgui_impl_dx11.h b/src/kiwano-imgui/src/imgui_impl_dx11.h similarity index 100% rename from kiwano-imgui/src/imgui_impl_dx11.h rename to src/kiwano-imgui/src/imgui_impl_dx11.h diff --git a/kiwano-imgui/third-party/ImGui/LICENSE.txt b/src/kiwano-imgui/third-party/ImGui/LICENSE.txt similarity index 100% rename from kiwano-imgui/third-party/ImGui/LICENSE.txt rename to src/kiwano-imgui/third-party/ImGui/LICENSE.txt diff --git a/kiwano-imgui/third-party/ImGui/imconfig.h b/src/kiwano-imgui/third-party/ImGui/imconfig.h similarity index 100% rename from kiwano-imgui/third-party/ImGui/imconfig.h rename to src/kiwano-imgui/third-party/ImGui/imconfig.h diff --git a/kiwano-imgui/third-party/ImGui/imgui.cpp b/src/kiwano-imgui/third-party/ImGui/imgui.cpp similarity index 100% rename from kiwano-imgui/third-party/ImGui/imgui.cpp rename to src/kiwano-imgui/third-party/ImGui/imgui.cpp diff --git a/kiwano-imgui/third-party/ImGui/imgui.h b/src/kiwano-imgui/third-party/ImGui/imgui.h similarity index 100% rename from kiwano-imgui/third-party/ImGui/imgui.h rename to src/kiwano-imgui/third-party/ImGui/imgui.h diff --git a/kiwano-imgui/third-party/ImGui/imgui_demo.cpp b/src/kiwano-imgui/third-party/ImGui/imgui_demo.cpp similarity index 100% rename from kiwano-imgui/third-party/ImGui/imgui_demo.cpp rename to src/kiwano-imgui/third-party/ImGui/imgui_demo.cpp diff --git a/kiwano-imgui/third-party/ImGui/imgui_draw.cpp b/src/kiwano-imgui/third-party/ImGui/imgui_draw.cpp similarity index 100% rename from kiwano-imgui/third-party/ImGui/imgui_draw.cpp rename to src/kiwano-imgui/third-party/ImGui/imgui_draw.cpp diff --git a/kiwano-imgui/third-party/ImGui/imgui_internal.h b/src/kiwano-imgui/third-party/ImGui/imgui_internal.h similarity index 100% rename from kiwano-imgui/third-party/ImGui/imgui_internal.h rename to src/kiwano-imgui/third-party/ImGui/imgui_internal.h diff --git a/kiwano-imgui/third-party/ImGui/imgui_widgets.cpp b/src/kiwano-imgui/third-party/ImGui/imgui_widgets.cpp similarity index 100% rename from kiwano-imgui/third-party/ImGui/imgui_widgets.cpp rename to src/kiwano-imgui/third-party/ImGui/imgui_widgets.cpp diff --git a/kiwano-imgui/third-party/ImGui/imstb_rectpack.h b/src/kiwano-imgui/third-party/ImGui/imstb_rectpack.h similarity index 100% rename from kiwano-imgui/third-party/ImGui/imstb_rectpack.h rename to src/kiwano-imgui/third-party/ImGui/imstb_rectpack.h diff --git a/kiwano-imgui/third-party/ImGui/imstb_textedit.h b/src/kiwano-imgui/third-party/ImGui/imstb_textedit.h similarity index 100% rename from kiwano-imgui/third-party/ImGui/imstb_textedit.h rename to src/kiwano-imgui/third-party/ImGui/imstb_textedit.h diff --git a/kiwano-imgui/third-party/ImGui/imstb_truetype.h b/src/kiwano-imgui/third-party/ImGui/imstb_truetype.h similarity index 100% rename from kiwano-imgui/third-party/ImGui/imstb_truetype.h rename to src/kiwano-imgui/third-party/ImGui/imstb_truetype.h diff --git a/kiwano-network/dlls/libcrypto-1_1.dll b/src/kiwano-network/dlls/libcrypto-1_1.dll similarity index 100% rename from kiwano-network/dlls/libcrypto-1_1.dll rename to src/kiwano-network/dlls/libcrypto-1_1.dll diff --git a/kiwano-network/dlls/libcurl.dll b/src/kiwano-network/dlls/libcurl.dll similarity index 100% rename from kiwano-network/dlls/libcurl.dll rename to src/kiwano-network/dlls/libcurl.dll diff --git a/kiwano-network/dlls/libssl-1_1.dll b/src/kiwano-network/dlls/libssl-1_1.dll similarity index 100% rename from kiwano-network/dlls/libssl-1_1.dll rename to src/kiwano-network/dlls/libssl-1_1.dll diff --git a/kiwano-network/kiwano-network.h b/src/kiwano-network/kiwano-network.h similarity index 100% rename from kiwano-network/kiwano-network.h rename to src/kiwano-network/kiwano-network.h diff --git a/kiwano-network/src/HttpClient.cpp b/src/kiwano-network/src/HttpClient.cpp similarity index 100% rename from kiwano-network/src/HttpClient.cpp rename to src/kiwano-network/src/HttpClient.cpp diff --git a/kiwano-network/src/HttpClient.h b/src/kiwano-network/src/HttpClient.h similarity index 100% rename from kiwano-network/src/HttpClient.h rename to src/kiwano-network/src/HttpClient.h diff --git a/kiwano-network/src/HttpRequest.h b/src/kiwano-network/src/HttpRequest.h similarity index 100% rename from kiwano-network/src/HttpRequest.h rename to src/kiwano-network/src/HttpRequest.h diff --git a/kiwano-network/src/HttpResponse.h b/src/kiwano-network/src/HttpResponse.h similarity index 100% rename from kiwano-network/src/HttpResponse.h rename to src/kiwano-network/src/HttpResponse.h diff --git a/kiwano-network/src/helper.h b/src/kiwano-network/src/helper.h similarity index 100% rename from kiwano-network/src/helper.h rename to src/kiwano-network/src/helper.h diff --git a/kiwano-network/third-party/curl/curl.h b/src/kiwano-network/third-party/curl/curl.h similarity index 100% rename from kiwano-network/third-party/curl/curl.h rename to src/kiwano-network/third-party/curl/curl.h diff --git a/kiwano-network/third-party/curl/curlbuild.h b/src/kiwano-network/third-party/curl/curlbuild.h similarity index 100% rename from kiwano-network/third-party/curl/curlbuild.h rename to src/kiwano-network/third-party/curl/curlbuild.h diff --git a/kiwano-network/third-party/curl/curlrules.h b/src/kiwano-network/third-party/curl/curlrules.h similarity index 100% rename from kiwano-network/third-party/curl/curlrules.h rename to src/kiwano-network/third-party/curl/curlrules.h diff --git a/kiwano-network/third-party/curl/curlver.h b/src/kiwano-network/third-party/curl/curlver.h similarity index 100% rename from kiwano-network/third-party/curl/curlver.h rename to src/kiwano-network/third-party/curl/curlver.h diff --git a/kiwano-network/third-party/curl/easy.h b/src/kiwano-network/third-party/curl/easy.h similarity index 100% rename from kiwano-network/third-party/curl/easy.h rename to src/kiwano-network/third-party/curl/easy.h diff --git a/kiwano-network/third-party/curl/mprintf.h b/src/kiwano-network/third-party/curl/mprintf.h similarity index 100% rename from kiwano-network/third-party/curl/mprintf.h rename to src/kiwano-network/third-party/curl/mprintf.h diff --git a/kiwano-network/third-party/curl/multi.h b/src/kiwano-network/third-party/curl/multi.h similarity index 100% rename from kiwano-network/third-party/curl/multi.h rename to src/kiwano-network/third-party/curl/multi.h diff --git a/kiwano-network/third-party/curl/stdcheaders.h b/src/kiwano-network/third-party/curl/stdcheaders.h similarity index 100% rename from kiwano-network/third-party/curl/stdcheaders.h rename to src/kiwano-network/third-party/curl/stdcheaders.h diff --git a/kiwano-network/third-party/curl/typecheck-gcc.h b/src/kiwano-network/third-party/curl/typecheck-gcc.h similarity index 100% rename from kiwano-network/third-party/curl/typecheck-gcc.h rename to src/kiwano-network/third-party/curl/typecheck-gcc.h diff --git a/kiwano-network/third-party/libs/libcurl.lib b/src/kiwano-network/third-party/libs/libcurl.lib similarity index 100% rename from kiwano-network/third-party/libs/libcurl.lib rename to src/kiwano-network/third-party/libs/libcurl.lib diff --git a/kiwano/2d/Action.cpp b/src/kiwano/2d/Action.cpp similarity index 100% rename from kiwano/2d/Action.cpp rename to src/kiwano/2d/Action.cpp diff --git a/kiwano/2d/Action.h b/src/kiwano/2d/Action.h similarity index 100% rename from kiwano/2d/Action.h rename to src/kiwano/2d/Action.h diff --git a/kiwano/2d/ActionGroup.cpp b/src/kiwano/2d/ActionGroup.cpp similarity index 100% rename from kiwano/2d/ActionGroup.cpp rename to src/kiwano/2d/ActionGroup.cpp diff --git a/kiwano/2d/ActionGroup.h b/src/kiwano/2d/ActionGroup.h similarity index 100% rename from kiwano/2d/ActionGroup.h rename to src/kiwano/2d/ActionGroup.h diff --git a/kiwano/2d/ActionHelper.h b/src/kiwano/2d/ActionHelper.h similarity index 100% rename from kiwano/2d/ActionHelper.h rename to src/kiwano/2d/ActionHelper.h diff --git a/kiwano/2d/ActionManager.cpp b/src/kiwano/2d/ActionManager.cpp similarity index 100% rename from kiwano/2d/ActionManager.cpp rename to src/kiwano/2d/ActionManager.cpp diff --git a/kiwano/2d/ActionManager.h b/src/kiwano/2d/ActionManager.h similarity index 100% rename from kiwano/2d/ActionManager.h rename to src/kiwano/2d/ActionManager.h diff --git a/kiwano/2d/ActionTween.cpp b/src/kiwano/2d/ActionTween.cpp similarity index 99% rename from kiwano/2d/ActionTween.cpp rename to src/kiwano/2d/ActionTween.cpp index d01bc369..21f6ddef 100644 --- a/kiwano/2d/ActionTween.cpp +++ b/src/kiwano/2d/ActionTween.cpp @@ -35,7 +35,7 @@ namespace kiwano 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); } - 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::EaseOut = MakeEaseOut(2.f); KGE_API EaseFunc Ease::EaseInOut = MakeEaseInOut(2.f); diff --git a/kiwano/2d/ActionTween.h b/src/kiwano/2d/ActionTween.h similarity index 100% rename from kiwano/2d/ActionTween.h rename to src/kiwano/2d/ActionTween.h diff --git a/kiwano/2d/Animation.cpp b/src/kiwano/2d/Animation.cpp similarity index 100% rename from kiwano/2d/Animation.cpp rename to src/kiwano/2d/Animation.cpp diff --git a/kiwano/2d/Animation.h b/src/kiwano/2d/Animation.h similarity index 100% rename from kiwano/2d/Animation.h rename to src/kiwano/2d/Animation.h diff --git a/kiwano/2d/Canvas.cpp b/src/kiwano/2d/Canvas.cpp similarity index 100% rename from kiwano/2d/Canvas.cpp rename to src/kiwano/2d/Canvas.cpp diff --git a/kiwano/2d/Canvas.h b/src/kiwano/2d/Canvas.h similarity index 100% rename from kiwano/2d/Canvas.h rename to src/kiwano/2d/Canvas.h diff --git a/kiwano/2d/Color.cpp b/src/kiwano/2d/Color.cpp similarity index 100% rename from kiwano/2d/Color.cpp rename to src/kiwano/2d/Color.cpp diff --git a/kiwano/2d/Color.h b/src/kiwano/2d/Color.h similarity index 100% rename from kiwano/2d/Color.h rename to src/kiwano/2d/Color.h diff --git a/kiwano/2d/DebugNode.cpp b/src/kiwano/2d/DebugNode.cpp similarity index 100% rename from kiwano/2d/DebugNode.cpp rename to src/kiwano/2d/DebugNode.cpp diff --git a/kiwano/2d/DebugNode.h b/src/kiwano/2d/DebugNode.h similarity index 100% rename from kiwano/2d/DebugNode.h rename to src/kiwano/2d/DebugNode.h diff --git a/kiwano/2d/Font.hpp b/src/kiwano/2d/Font.hpp similarity index 100% rename from kiwano/2d/Font.hpp rename to src/kiwano/2d/Font.hpp diff --git a/kiwano/2d/Frames.cpp b/src/kiwano/2d/Frames.cpp similarity index 100% rename from kiwano/2d/Frames.cpp rename to src/kiwano/2d/Frames.cpp diff --git a/kiwano/2d/Frames.h b/src/kiwano/2d/Frames.h similarity index 100% rename from kiwano/2d/Frames.h rename to src/kiwano/2d/Frames.h diff --git a/kiwano/2d/Geometry.cpp b/src/kiwano/2d/Geometry.cpp similarity index 100% rename from kiwano/2d/Geometry.cpp rename to src/kiwano/2d/Geometry.cpp diff --git a/kiwano/2d/Geometry.h b/src/kiwano/2d/Geometry.h similarity index 100% rename from kiwano/2d/Geometry.h rename to src/kiwano/2d/Geometry.h diff --git a/kiwano/2d/GeometryNode.cpp b/src/kiwano/2d/GeometryNode.cpp similarity index 100% rename from kiwano/2d/GeometryNode.cpp rename to src/kiwano/2d/GeometryNode.cpp diff --git a/kiwano/2d/GeometryNode.h b/src/kiwano/2d/GeometryNode.h similarity index 100% rename from kiwano/2d/GeometryNode.h rename to src/kiwano/2d/GeometryNode.h diff --git a/kiwano/2d/GifImage.cpp b/src/kiwano/2d/GifImage.cpp similarity index 100% rename from kiwano/2d/GifImage.cpp rename to src/kiwano/2d/GifImage.cpp diff --git a/kiwano/2d/GifImage.h b/src/kiwano/2d/GifImage.h similarity index 100% rename from kiwano/2d/GifImage.h rename to src/kiwano/2d/GifImage.h diff --git a/kiwano/2d/GifSprite.cpp b/src/kiwano/2d/GifSprite.cpp similarity index 100% rename from kiwano/2d/GifSprite.cpp rename to src/kiwano/2d/GifSprite.cpp diff --git a/kiwano/2d/GifSprite.h b/src/kiwano/2d/GifSprite.h similarity index 100% rename from kiwano/2d/GifSprite.h rename to src/kiwano/2d/GifSprite.h diff --git a/kiwano/2d/Image.cpp b/src/kiwano/2d/Image.cpp similarity index 100% rename from kiwano/2d/Image.cpp rename to src/kiwano/2d/Image.cpp diff --git a/kiwano/2d/Image.h b/src/kiwano/2d/Image.h similarity index 100% rename from kiwano/2d/Image.h rename to src/kiwano/2d/Image.h diff --git a/kiwano/2d/Layer.cpp b/src/kiwano/2d/Layer.cpp similarity index 100% rename from kiwano/2d/Layer.cpp rename to src/kiwano/2d/Layer.cpp diff --git a/kiwano/2d/Layer.h b/src/kiwano/2d/Layer.h similarity index 100% rename from kiwano/2d/Layer.h rename to src/kiwano/2d/Layer.h diff --git a/kiwano/2d/Node.cpp b/src/kiwano/2d/Node.cpp similarity index 100% rename from kiwano/2d/Node.cpp rename to src/kiwano/2d/Node.cpp diff --git a/kiwano/2d/Node.h b/src/kiwano/2d/Node.h similarity index 100% rename from kiwano/2d/Node.h rename to src/kiwano/2d/Node.h diff --git a/kiwano/2d/Scene.cpp b/src/kiwano/2d/Scene.cpp similarity index 100% rename from kiwano/2d/Scene.cpp rename to src/kiwano/2d/Scene.cpp diff --git a/kiwano/2d/Scene.h b/src/kiwano/2d/Scene.h similarity index 100% rename from kiwano/2d/Scene.h rename to src/kiwano/2d/Scene.h diff --git a/kiwano/2d/Sprite.cpp b/src/kiwano/2d/Sprite.cpp similarity index 100% rename from kiwano/2d/Sprite.cpp rename to src/kiwano/2d/Sprite.cpp diff --git a/kiwano/2d/Sprite.h b/src/kiwano/2d/Sprite.h similarity index 100% rename from kiwano/2d/Sprite.h rename to src/kiwano/2d/Sprite.h diff --git a/kiwano/2d/Text.cpp b/src/kiwano/2d/Text.cpp similarity index 100% rename from kiwano/2d/Text.cpp rename to src/kiwano/2d/Text.cpp diff --git a/kiwano/2d/Text.h b/src/kiwano/2d/Text.h similarity index 100% rename from kiwano/2d/Text.h rename to src/kiwano/2d/Text.h diff --git a/kiwano/2d/TextStyle.hpp b/src/kiwano/2d/TextStyle.hpp similarity index 100% rename from kiwano/2d/TextStyle.hpp rename to src/kiwano/2d/TextStyle.hpp diff --git a/kiwano/2d/Transform.hpp b/src/kiwano/2d/Transform.hpp similarity index 100% rename from kiwano/2d/Transform.hpp rename to src/kiwano/2d/Transform.hpp diff --git a/kiwano/2d/Transition.cpp b/src/kiwano/2d/Transition.cpp similarity index 100% rename from kiwano/2d/Transition.cpp rename to src/kiwano/2d/Transition.cpp diff --git a/kiwano/2d/Transition.h b/src/kiwano/2d/Transition.h similarity index 100% rename from kiwano/2d/Transition.h rename to src/kiwano/2d/Transition.h diff --git a/kiwano/2d/include-forwards.h b/src/kiwano/2d/include-forwards.h similarity index 100% rename from kiwano/2d/include-forwards.h rename to src/kiwano/2d/include-forwards.h diff --git a/kiwano/base/AsyncTask.cpp b/src/kiwano/base/AsyncTask.cpp similarity index 100% rename from kiwano/base/AsyncTask.cpp rename to src/kiwano/base/AsyncTask.cpp diff --git a/kiwano/base/AsyncTask.h b/src/kiwano/base/AsyncTask.h similarity index 100% rename from kiwano/base/AsyncTask.h rename to src/kiwano/base/AsyncTask.h diff --git a/kiwano/base/Component.h b/src/kiwano/base/Component.h similarity index 100% rename from kiwano/base/Component.h rename to src/kiwano/base/Component.h diff --git a/kiwano/base/Event.hpp b/src/kiwano/base/Event.hpp similarity index 100% rename from kiwano/base/Event.hpp rename to src/kiwano/base/Event.hpp diff --git a/kiwano/base/EventDispatcher.cpp b/src/kiwano/base/EventDispatcher.cpp similarity index 100% rename from kiwano/base/EventDispatcher.cpp rename to src/kiwano/base/EventDispatcher.cpp diff --git a/kiwano/base/EventDispatcher.h b/src/kiwano/base/EventDispatcher.h similarity index 100% rename from kiwano/base/EventDispatcher.h rename to src/kiwano/base/EventDispatcher.h diff --git a/kiwano/base/EventListener.cpp b/src/kiwano/base/EventListener.cpp similarity index 100% rename from kiwano/base/EventListener.cpp rename to src/kiwano/base/EventListener.cpp diff --git a/kiwano/base/EventListener.h b/src/kiwano/base/EventListener.h similarity index 100% rename from kiwano/base/EventListener.h rename to src/kiwano/base/EventListener.h diff --git a/kiwano/base/Input.cpp b/src/kiwano/base/Input.cpp similarity index 100% rename from kiwano/base/Input.cpp rename to src/kiwano/base/Input.cpp diff --git a/kiwano/base/Input.h b/src/kiwano/base/Input.h similarity index 100% rename from kiwano/base/Input.h rename to src/kiwano/base/Input.h diff --git a/kiwano/base/Object.cpp b/src/kiwano/base/Object.cpp similarity index 100% rename from kiwano/base/Object.cpp rename to src/kiwano/base/Object.cpp diff --git a/kiwano/base/Object.h b/src/kiwano/base/Object.h similarity index 100% rename from kiwano/base/Object.h rename to src/kiwano/base/Object.h diff --git a/kiwano/base/RefCounter.hpp b/src/kiwano/base/RefCounter.hpp similarity index 100% rename from kiwano/base/RefCounter.hpp rename to src/kiwano/base/RefCounter.hpp diff --git a/kiwano/base/Resource.cpp b/src/kiwano/base/Resource.cpp similarity index 100% rename from kiwano/base/Resource.cpp rename to src/kiwano/base/Resource.cpp diff --git a/kiwano/base/Resource.h b/src/kiwano/base/Resource.h similarity index 100% rename from kiwano/base/Resource.h rename to src/kiwano/base/Resource.h diff --git a/kiwano/base/SmartPtr.hpp b/src/kiwano/base/SmartPtr.hpp similarity index 100% rename from kiwano/base/SmartPtr.hpp rename to src/kiwano/base/SmartPtr.hpp diff --git a/kiwano/base/Timer.cpp b/src/kiwano/base/Timer.cpp similarity index 100% rename from kiwano/base/Timer.cpp rename to src/kiwano/base/Timer.cpp diff --git a/kiwano/base/Timer.h b/src/kiwano/base/Timer.h similarity index 100% rename from kiwano/base/Timer.h rename to src/kiwano/base/Timer.h diff --git a/kiwano/base/TimerManager.cpp b/src/kiwano/base/TimerManager.cpp similarity index 100% rename from kiwano/base/TimerManager.cpp rename to src/kiwano/base/TimerManager.cpp diff --git a/kiwano/base/TimerManager.h b/src/kiwano/base/TimerManager.h similarity index 100% rename from kiwano/base/TimerManager.h rename to src/kiwano/base/TimerManager.h diff --git a/kiwano/base/keys.hpp b/src/kiwano/base/keys.hpp similarity index 100% rename from kiwano/base/keys.hpp rename to src/kiwano/base/keys.hpp diff --git a/kiwano/base/logs.cpp b/src/kiwano/base/logs.cpp similarity index 100% rename from kiwano/base/logs.cpp rename to src/kiwano/base/logs.cpp diff --git a/kiwano/base/logs.h b/src/kiwano/base/logs.h similarity index 100% rename from kiwano/base/logs.h rename to src/kiwano/base/logs.h diff --git a/kiwano/base/time.cpp b/src/kiwano/base/time.cpp similarity index 100% rename from kiwano/base/time.cpp rename to src/kiwano/base/time.cpp diff --git a/kiwano/base/time.h b/src/kiwano/base/time.h similarity index 99% rename from kiwano/base/time.h rename to src/kiwano/base/time.h index 67e19bdf..09a80b0f 100644 --- a/kiwano/base/time.h +++ b/src/kiwano/base/time.h @@ -190,7 +190,7 @@ namespace kiwano using namespace time; } -#if VS_VER >= VS_2015 +#if KGE_VS_VER > KGE_VS_2013 namespace kiwano { diff --git a/kiwano/base/types.h b/src/kiwano/base/types.h similarity index 100% rename from kiwano/base/types.h rename to src/kiwano/base/types.h diff --git a/kiwano/base/window.cpp b/src/kiwano/base/window.cpp similarity index 100% rename from kiwano/base/window.cpp rename to src/kiwano/base/window.cpp diff --git a/kiwano/base/window.h b/src/kiwano/base/window.h similarity index 100% rename from kiwano/base/window.h rename to src/kiwano/base/window.h diff --git a/kiwano/common/Array.hpp b/src/kiwano/common/Array.hpp similarity index 100% rename from kiwano/common/Array.hpp rename to src/kiwano/common/Array.hpp diff --git a/kiwano/common/ComPtr.hpp b/src/kiwano/common/ComPtr.hpp similarity index 100% rename from kiwano/common/ComPtr.hpp rename to src/kiwano/common/ComPtr.hpp diff --git a/kiwano/common/IntrusiveList.hpp b/src/kiwano/common/IntrusiveList.hpp similarity index 100% rename from kiwano/common/IntrusiveList.hpp rename to src/kiwano/common/IntrusiveList.hpp diff --git a/kiwano/common/IntrusivePtr.hpp b/src/kiwano/common/IntrusivePtr.hpp similarity index 100% rename from kiwano/common/IntrusivePtr.hpp rename to src/kiwano/common/IntrusivePtr.hpp diff --git a/kiwano/common/Json.hpp b/src/kiwano/common/Json.hpp similarity index 99% rename from kiwano/common/Json.hpp rename to src/kiwano/common/Json.hpp index e4df8339..76a892fe 100644 --- a/kiwano/common/Json.hpp +++ b/src/kiwano/common/Json.hpp @@ -22,6 +22,7 @@ #include "helper.h" #include #include +#include #include #include diff --git a/kiwano/common/Noncopyable.hpp b/src/kiwano/common/Noncopyable.hpp similarity index 100% rename from kiwano/common/Noncopyable.hpp rename to src/kiwano/common/Noncopyable.hpp diff --git a/kiwano/common/Singleton.hpp b/src/kiwano/common/Singleton.hpp similarity index 100% rename from kiwano/common/Singleton.hpp rename to src/kiwano/common/Singleton.hpp diff --git a/kiwano/common/String.hpp b/src/kiwano/common/String.hpp similarity index 100% rename from kiwano/common/String.hpp rename to src/kiwano/common/String.hpp diff --git a/kiwano/common/closure.hpp b/src/kiwano/common/closure.hpp similarity index 99% rename from kiwano/common/closure.hpp rename to src/kiwano/common/closure.hpp index 8890b20c..8feace6d 100644 --- a/kiwano/common/closure.hpp +++ b/src/kiwano/common/closure.hpp @@ -20,6 +20,7 @@ #pragma once #include +#include namespace kiwano { @@ -114,7 +115,7 @@ namespace kiwano virtual _Ret Invoke(_Args... args) const override { - return callee_(std::forward<_Args>(args)...); + return callee_(std::forward<_Args&&>(args)...); } static inline Callable<_Ret, _Args...>* Make(_Ty&& val) diff --git a/kiwano/common/helper.h b/src/kiwano/common/helper.h similarity index 100% rename from kiwano/common/helper.h rename to src/kiwano/common/helper.h diff --git a/kiwano/config.h b/src/kiwano/config.h similarity index 100% rename from kiwano/config.h rename to src/kiwano/config.h diff --git a/kiwano/kiwano.h b/src/kiwano/kiwano.h similarity index 100% rename from kiwano/kiwano.h rename to src/kiwano/kiwano.h diff --git a/kiwano/macros.h b/src/kiwano/macros.h similarity index 94% rename from kiwano/macros.h rename to src/kiwano/macros.h index b09ac76d..ea65e106 100644 --- a/kiwano/macros.h +++ b/src/kiwano/macros.h @@ -28,15 +28,15 @@ # error Kiwano only supports MSVC compiler #endif -#ifndef VS_VER -# define VS_VER _MSC_VER -# define VS_2013 1800 -# define VS_2015 1900 -# define VS_2017 1900 -# define VS_2019 1920 +#ifndef KGE_VS_VER +# define KGE_VS_VER _MSC_VER +# define KGE_VS_2013 1800 +# define KGE_VS_2015 1900 +# define KGE_VS_2017 1900 +# define KGE_VS_2019 1920 #endif -#if VS_VER < VS_2015 +#if KGE_VS_VER < KGE_VS_2015 # error Kiwano only supports Visual Studio 2015 and above #endif diff --git a/kiwano/math/Matrix.hpp b/src/kiwano/math/Matrix.hpp similarity index 100% rename from kiwano/math/Matrix.hpp rename to src/kiwano/math/Matrix.hpp diff --git a/kiwano/math/Rect.hpp b/src/kiwano/math/Rect.hpp similarity index 100% rename from kiwano/math/Rect.hpp rename to src/kiwano/math/Rect.hpp diff --git a/kiwano/math/Vec2.hpp b/src/kiwano/math/Vec2.hpp similarity index 100% rename from kiwano/math/Vec2.hpp rename to src/kiwano/math/Vec2.hpp diff --git a/kiwano/math/constants.hpp b/src/kiwano/math/constants.hpp similarity index 100% rename from kiwano/math/constants.hpp rename to src/kiwano/math/constants.hpp diff --git a/kiwano/math/ease.hpp b/src/kiwano/math/ease.hpp similarity index 100% rename from kiwano/math/ease.hpp rename to src/kiwano/math/ease.hpp diff --git a/kiwano/math/helper.h b/src/kiwano/math/helper.h similarity index 100% rename from kiwano/math/helper.h rename to src/kiwano/math/helper.h diff --git a/kiwano/math/rand.h b/src/kiwano/math/rand.h similarity index 100% rename from kiwano/math/rand.h rename to src/kiwano/math/rand.h diff --git a/kiwano/math/scalar.hpp b/src/kiwano/math/scalar.hpp similarity index 100% rename from kiwano/math/scalar.hpp rename to src/kiwano/math/scalar.hpp diff --git a/kiwano/platform/Application.cpp b/src/kiwano/platform/Application.cpp similarity index 100% rename from kiwano/platform/Application.cpp rename to src/kiwano/platform/Application.cpp diff --git a/kiwano/platform/Application.h b/src/kiwano/platform/Application.h similarity index 100% rename from kiwano/platform/Application.h rename to src/kiwano/platform/Application.h diff --git a/kiwano/platform/modules.cpp b/src/kiwano/platform/modules.cpp similarity index 100% rename from kiwano/platform/modules.cpp rename to src/kiwano/platform/modules.cpp diff --git a/kiwano/platform/modules.h b/src/kiwano/platform/modules.h similarity index 100% rename from kiwano/platform/modules.h rename to src/kiwano/platform/modules.h diff --git a/kiwano/renderer/D2DDeviceResources.cpp b/src/kiwano/renderer/D2DDeviceResources.cpp similarity index 100% rename from kiwano/renderer/D2DDeviceResources.cpp rename to src/kiwano/renderer/D2DDeviceResources.cpp diff --git a/kiwano/renderer/D2DDeviceResources.h b/src/kiwano/renderer/D2DDeviceResources.h similarity index 100% rename from kiwano/renderer/D2DDeviceResources.h rename to src/kiwano/renderer/D2DDeviceResources.h diff --git a/kiwano/renderer/D3D10DeviceResources.cpp b/src/kiwano/renderer/D3D10DeviceResources.cpp similarity index 100% rename from kiwano/renderer/D3D10DeviceResources.cpp rename to src/kiwano/renderer/D3D10DeviceResources.cpp diff --git a/kiwano/renderer/D3D10DeviceResources.h b/src/kiwano/renderer/D3D10DeviceResources.h similarity index 100% rename from kiwano/renderer/D3D10DeviceResources.h rename to src/kiwano/renderer/D3D10DeviceResources.h diff --git a/kiwano/renderer/D3D11DeviceResources.cpp b/src/kiwano/renderer/D3D11DeviceResources.cpp similarity index 100% rename from kiwano/renderer/D3D11DeviceResources.cpp rename to src/kiwano/renderer/D3D11DeviceResources.cpp diff --git a/kiwano/renderer/D3D11DeviceResources.h b/src/kiwano/renderer/D3D11DeviceResources.h similarity index 100% rename from kiwano/renderer/D3D11DeviceResources.h rename to src/kiwano/renderer/D3D11DeviceResources.h diff --git a/kiwano/renderer/D3DDeviceResourcesBase.h b/src/kiwano/renderer/D3DDeviceResourcesBase.h similarity index 100% rename from kiwano/renderer/D3DDeviceResourcesBase.h rename to src/kiwano/renderer/D3DDeviceResourcesBase.h diff --git a/kiwano/renderer/TextRenderer.cpp b/src/kiwano/renderer/TextRenderer.cpp similarity index 100% rename from kiwano/renderer/TextRenderer.cpp rename to src/kiwano/renderer/TextRenderer.cpp diff --git a/kiwano/renderer/TextRenderer.h b/src/kiwano/renderer/TextRenderer.h similarity index 100% rename from kiwano/renderer/TextRenderer.h rename to src/kiwano/renderer/TextRenderer.h diff --git a/kiwano/renderer/helper.hpp b/src/kiwano/renderer/helper.hpp similarity index 100% rename from kiwano/renderer/helper.hpp rename to src/kiwano/renderer/helper.hpp diff --git a/kiwano/renderer/render.cpp b/src/kiwano/renderer/render.cpp similarity index 100% rename from kiwano/renderer/render.cpp rename to src/kiwano/renderer/render.cpp diff --git a/kiwano/renderer/render.h b/src/kiwano/renderer/render.h similarity index 100% rename from kiwano/renderer/render.h rename to src/kiwano/renderer/render.h diff --git a/kiwano/third-party/StackWalker/StackWalker.cpp b/src/kiwano/third-party/StackWalker/StackWalker.cpp similarity index 100% rename from kiwano/third-party/StackWalker/StackWalker.cpp rename to src/kiwano/third-party/StackWalker/StackWalker.cpp diff --git a/kiwano/third-party/StackWalker/StackWalker.h b/src/kiwano/third-party/StackWalker/StackWalker.h similarity index 100% rename from kiwano/third-party/StackWalker/StackWalker.h rename to src/kiwano/third-party/StackWalker/StackWalker.h diff --git a/kiwano/third-party/tinyxml2/LICENSE.txt b/src/kiwano/third-party/tinyxml2/LICENSE.txt similarity index 100% rename from kiwano/third-party/tinyxml2/LICENSE.txt rename to src/kiwano/third-party/tinyxml2/LICENSE.txt diff --git a/kiwano/third-party/tinyxml2/tinyxml2.cpp b/src/kiwano/third-party/tinyxml2/tinyxml2.cpp similarity index 100% rename from kiwano/third-party/tinyxml2/tinyxml2.cpp rename to src/kiwano/third-party/tinyxml2/tinyxml2.cpp diff --git a/kiwano/third-party/tinyxml2/tinyxml2.h b/src/kiwano/third-party/tinyxml2/tinyxml2.h similarity index 100% rename from kiwano/third-party/tinyxml2/tinyxml2.h rename to src/kiwano/third-party/tinyxml2/tinyxml2.h diff --git a/kiwano/ui/Button.cpp b/src/kiwano/ui/Button.cpp similarity index 100% rename from kiwano/ui/Button.cpp rename to src/kiwano/ui/Button.cpp diff --git a/kiwano/ui/Button.h b/src/kiwano/ui/Button.h similarity index 100% rename from kiwano/ui/Button.h rename to src/kiwano/ui/Button.h diff --git a/kiwano/ui/Menu.cpp b/src/kiwano/ui/Menu.cpp similarity index 100% rename from kiwano/ui/Menu.cpp rename to src/kiwano/ui/Menu.cpp diff --git a/kiwano/ui/Menu.h b/src/kiwano/ui/Menu.h similarity index 100% rename from kiwano/ui/Menu.h rename to src/kiwano/ui/Menu.h diff --git a/kiwano/utils/DataUtil.cpp b/src/kiwano/utils/DataUtil.cpp similarity index 100% rename from kiwano/utils/DataUtil.cpp rename to src/kiwano/utils/DataUtil.cpp diff --git a/kiwano/utils/DataUtil.h b/src/kiwano/utils/DataUtil.h similarity index 100% rename from kiwano/utils/DataUtil.h rename to src/kiwano/utils/DataUtil.h diff --git a/kiwano/utils/FileUtil.cpp b/src/kiwano/utils/FileUtil.cpp similarity index 100% rename from kiwano/utils/FileUtil.cpp rename to src/kiwano/utils/FileUtil.cpp diff --git a/kiwano/utils/FileUtil.h b/src/kiwano/utils/FileUtil.h similarity index 100% rename from kiwano/utils/FileUtil.h rename to src/kiwano/utils/FileUtil.h diff --git a/kiwano/utils/Path.cpp b/src/kiwano/utils/Path.cpp similarity index 100% rename from kiwano/utils/Path.cpp rename to src/kiwano/utils/Path.cpp diff --git a/kiwano/utils/Path.h b/src/kiwano/utils/Path.h similarity index 100% rename from kiwano/utils/Path.h rename to src/kiwano/utils/Path.h diff --git a/kiwano/utils/ResLoader.cpp b/src/kiwano/utils/ResLoader.cpp similarity index 100% rename from kiwano/utils/ResLoader.cpp rename to src/kiwano/utils/ResLoader.cpp diff --git a/kiwano/utils/ResLoader.h b/src/kiwano/utils/ResLoader.h similarity index 100% rename from kiwano/utils/ResLoader.h rename to src/kiwano/utils/ResLoader.h