Merge pull request #23 from Nomango/configure_ci

enable AppVeyor to deploy .nupkg files to NuGet and Github releases

appveyor.yml

@@ -2,22 +2,42 @@ version: 0.9.{build}
 
 skip_tags: true
 
-image:
+# image:
-- Visual Studio 2019
+# - Visual Studio 2019
-- Visual Studio 2017
+# - Visual Studio 2017
-- Visual Studio 2015
+# - Visual Studio 2015
+
+environment:
+  time_out_mins: 5
+  job_to_deploy: 6 # 3(images) * 1(platform) * 2(configuration)
+  flag_to_deploy: false
+  APPVEYOR_API_TOKEN:
+    secure: UJFCbRNHMOqQg3e3Kv/ZnaIqqwXAt+5HDldetaZsZ5E=
+  matrix:
+    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
+      VS_PLATFORM_TOOLSET: v142
+    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
+      VS_PLATFORM_TOOLSET: v141
+    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
+      VS_PLATFORM_TOOLSET: v140
 
 skip_commits:
   message: /\[chore\]/
 
 only_commits:
   files:
-    - '**/*.h'
+    - '**/*.(h|hpp|cpp)'
-    - '**/*.hpp'
+    - '**/*.(sln|vcxproj|rc)'
-    - '**/*.cpp'
+    - 'scripts/**/*.ps1'
-    - '**/*.sln'
+    - 'appveyor.yml'
-    - '**/*.vcxproj'
+
-    - '**/*.rc'
+for:
+-
+  branches:
+    except:
+      - master
+  only_commits:
+    message: /\[build\]|\[deploy\]/
 
 configuration:
 - Debug
@@ -26,18 +46,52 @@ configuration:
 platform:
 - Win32
 
-before_build:
+# cache: packages/
-- ps: nuget restore projects/Kiwano.sln
+
+install:
+- ps: .\scripts\appveyor\install_coapp.ps1
+
+# before_build:
+# - ps: nuget restore projects/Kiwano.sln
 
 build:
   parallel: true
   project: projects/Kiwano.sln
-  verbosity: normal
+  verbosity: minimal
+
+after_build:
+- ps: .\scripts\appveyor\wait_for_other_jobs.ps1
 
 artifacts:
-- path: projects/output/
+- path: projects/output/**/*.lib
-  name: $(platform).$(configuration)
+  name: $(appveyor_project_name)-v$(appveyor_build_version)-$(VS_PLATFORM_TOOLSET).$(platform).$(configuration)
-  type: zip
+
+before_deploy:
+- ps: .\scripts\appveyor\coapp_make.ps1
+
+deploy:
+- provider: GitHub
+  tag: v$(appveyor_build_version)
+  release: v$(appveyor_build_version)
+  description: Kiwano-v$(appveyor_build_version) releases.
+  auth_token:
+    secure: pDsK6i03d4qRjtrNXcbhLpAquso/muJWgDSWJHnxP7b6p54kXEvptB67J+1kJOhq
+  artifact: /.*\.nupkg/
+  draft: true
+  on:
+    # branch: master
+    # APPVEYOR_REPO_TAG: true
+    flag_to_deploy: true
+
+- provider: NuGet
+  api_key:
+    secure: I8fmE32nASXVHph+lmAlTKafL0YXmf/S021DgkCxe4+Sjgk2L9SIgp0IFQs9qESG
+  skip_symbols: true
+  artifact: /.*\.nupkg/
+  on:
+    # branch: master
+    # APPVEYOR_REPO_TAG: true
+    flag_to_deploy: true
 
 notifications:
 - provider: Email

projects/kiwano-audio.vcxproj

@@ -39,24 +39,14 @@
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset Condition="'$(VisualStudioVersion)' == '10.0'">v100</PlatformToolset>
+    <PlatformToolset>$(DefaultPlatformToolset)</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>$(DefaultPlatformToolset)</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">
@@ -71,13 +61,13 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>$(SolutionDir)\output\$(Platform)\$(Configuration).$(PlatformToolset)\</OutDir>
+    <OutDir>$(SolutionDir)\output\$(PlatformToolset)\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)\build\$(Platform)\$(Configuration).$(PlatformToolset)\$(ProjectName)\</IntDir>
+    <IntDir>$(SolutionDir)\build\$(PlatformToolset)\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
     <LinkIncremental>true</LinkIncremental>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>$(SolutionDir)\output\$(Platform)\$(Configuration).$(PlatformToolset)\</OutDir>
+    <OutDir>$(SolutionDir)\output\$(PlatformToolset)\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)\build\$(Platform)\$(Configuration).$(PlatformToolset)\$(ProjectName)\</IntDir>
+    <IntDir>$(SolutionDir)\build\$(PlatformToolset)\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
     <LinkIncremental>false</LinkIncremental>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

projects/kiwano-imgui.vcxproj

@@ -48,24 +48,14 @@
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset Condition="'$(VisualStudioVersion)' == '10.0'">v100</PlatformToolset>
+    <PlatformToolset>$(DefaultPlatformToolset)</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>$(DefaultPlatformToolset)</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">
@@ -80,13 +70,13 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>$(SolutionDir)\output\$(Platform)\$(Configuration).$(PlatformToolset)\</OutDir>
+    <OutDir>$(SolutionDir)\output\$(PlatformToolset)\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)\build\$(Platform)\$(Configuration).$(PlatformToolset)\$(ProjectName)\</IntDir>
+    <IntDir>$(SolutionDir)\build\$(PlatformToolset)\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
     <LinkIncremental>false</LinkIncremental>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>$(SolutionDir)\output\$(Platform)\$(Configuration).$(PlatformToolset)\</OutDir>
+    <OutDir>$(SolutionDir)\output\$(PlatformToolset)\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)\build\$(Platform)\$(Configuration).$(PlatformToolset)\$(ProjectName)\</IntDir>
+    <IntDir>$(SolutionDir)\build\$(PlatformToolset)\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
     <LinkIncremental>true</LinkIncremental>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

projects/kiwano-network.vcxproj

@@ -4,8 +4,8 @@
     <ClInclude Include="..\src\kiwano-network\kiwano-network.h" />
     <ClInclude Include="..\src\kiwano-network\src\helper.h" />
     <ClInclude Include="..\src\kiwano-network\src\HttpClient.h" />
-    <ClInclude Include="..\src\kiwano-network\src\HttpRequest.h" />
+    <ClInclude Include="..\src\kiwano-network\src\HttpRequest.hpp" />
-    <ClInclude Include="..\src\kiwano-network\src\HttpResponse.h" />
+    <ClInclude Include="..\src\kiwano-network\src\HttpResponse.hpp" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\src\kiwano-network\src\HttpClient.cpp" />
@@ -37,24 +37,14 @@
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset Condition="'$(VisualStudioVersion)' == '10.0'">v100</PlatformToolset>
+    <PlatformToolset>$(DefaultPlatformToolset)</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>$(DefaultPlatformToolset)</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">
@@ -69,13 +59,13 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>$(SolutionDir)\output\$(Platform)\$(Configuration).$(PlatformToolset)\</OutDir>
+    <OutDir>$(SolutionDir)\output\$(PlatformToolset)\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)\build\$(Platform)\$(Configuration).$(PlatformToolset)\$(ProjectName)\</IntDir>
+    <IntDir>$(SolutionDir)\build\$(PlatformToolset)\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
     <LinkIncremental>true</LinkIncremental>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>$(SolutionDir)\output\$(Platform)\$(Configuration).$(PlatformToolset)\</OutDir>
+    <OutDir>$(SolutionDir)\output\$(PlatformToolset)\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)\build\$(Platform)\$(Configuration).$(PlatformToolset)\$(ProjectName)\</IntDir>
+    <IntDir>$(SolutionDir)\build\$(PlatformToolset)\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
     <LinkIncremental>false</LinkIncremental>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

projects/kiwano-network.vcxproj.filters

@@ -8,10 +8,10 @@
     <ClInclude Include="..\src\kiwano-network\src\HttpClient.h">
       <Filter>src</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\kiwano-network\src\HttpRequest.h">
+    <ClInclude Include="..\src\kiwano-network\src\HttpRequest.hpp">
       <Filter>src</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\kiwano-network\src\HttpResponse.h">
+    <ClInclude Include="..\src\kiwano-network\src\HttpResponse.hpp">
       <Filter>src</Filter>
     </ClInclude>
   </ItemGroup>

projects/kiwano.vcxproj

@@ -149,24 +149,14 @@
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset Condition="'$(VisualStudioVersion)' == '10.0'">v100</PlatformToolset>
+    <PlatformToolset>$(DefaultPlatformToolset)</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>$(DefaultPlatformToolset)</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">
@@ -179,13 +169,13 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>$(SolutionDir)\output\$(Platform)\$(Configuration).$(PlatformToolset)\</OutDir>
+    <OutDir>$(SolutionDir)\output\$(PlatformToolset)\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)\build\$(Platform)\$(Configuration).$(PlatformToolset)\$(ProjectName)\</IntDir>
+    <IntDir>$(SolutionDir)\build\$(PlatformToolset)\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
     <LinkIncremental>true</LinkIncremental>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>$(SolutionDir)\output\$(Platform)\$(Configuration).$(PlatformToolset)\</OutDir>
+    <OutDir>$(SolutionDir)\output\$(PlatformToolset)\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)\build\$(Platform)\$(Configuration).$(PlatformToolset)\$(ProjectName)\</IntDir>
+    <IntDir>$(SolutionDir)\build\$(PlatformToolset)\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
     <LinkIncremental>false</LinkIncremental>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

projects/kiwano.vcxproj.filters

@@ -36,379 +36,133 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="ui\Button.h">
+    <ClInclude Include="..\src\kiwano\2d\GifSprite.h" />
-      <Filter>ui</Filter>
+    <ClInclude Include="..\src\kiwano\base\types.h" />
-    </ClInclude>
+    <ClInclude Include="..\src\kiwano\kiwano.h" />
-    <ClInclude Include="ui\Menu.h">
+    <ClInclude Include="..\src\kiwano\config.h" />
-      <Filter>ui</Filter>
+    <ClInclude Include="..\src\kiwano\macros.h" />
-    </ClInclude>
+    <ClInclude Include="..\src\kiwano\2d\include-forwards.h" />
-    <ClInclude Include="2d\Action.h">
+    <ClInclude Include="..\src\kiwano\2d\Action.h" />
-      <Filter>2d</Filter>
+    <ClInclude Include="..\src\kiwano\2d\ActionGroup.h" />
-    </ClInclude>
+    <ClInclude Include="..\src\kiwano\2d\ActionHelper.h" />
-    <ClInclude Include="2d\ActionGroup.h">
+    <ClInclude Include="..\src\kiwano\2d\ActionManager.h" />
-      <Filter>2d</Filter>
+    <ClInclude Include="..\src\kiwano\2d\ActionTween.h" />
-    </ClInclude>
+    <ClInclude Include="..\src\kiwano\2d\Animation.h" />
-    <ClInclude Include="2d\ActionHelper.h">
+    <ClInclude Include="..\src\kiwano\2d\Canvas.h" />
-      <Filter>2d</Filter>
+    <ClInclude Include="..\src\kiwano\2d\Color.h" />
-    </ClInclude>
+    <ClInclude Include="..\src\kiwano\2d\DebugNode.h" />
-    <ClInclude Include="2d\ActionManager.h">
+    <ClInclude Include="..\src\kiwano\2d\Font.hpp" />
-      <Filter>2d</Filter>
+    <ClInclude Include="..\src\kiwano\2d\Frames.h" />
-    </ClInclude>
+    <ClInclude Include="..\src\kiwano\2d\Geometry.h" />
-    <ClInclude Include="2d\ActionTween.h">
+    <ClInclude Include="..\src\kiwano\2d\GeometryNode.h" />
-      <Filter>2d</Filter>
+    <ClInclude Include="..\src\kiwano\2d\GifImage.h" />
-    </ClInclude>
+    <ClInclude Include="..\src\kiwano\2d\Image.h" />
-    <ClInclude Include="2d\Animation.h">
+    <ClInclude Include="..\src\kiwano\2d\Layer.h" />
-      <Filter>2d</Filter>
+    <ClInclude Include="..\src\kiwano\2d\Node.h" />
-    </ClInclude>
+    <ClInclude Include="..\src\kiwano\2d\Scene.h" />
-    <ClInclude Include="2d\Canvas.h">
+    <ClInclude Include="..\src\kiwano\2d\Sprite.h" />
-      <Filter>2d</Filter>
+    <ClInclude Include="..\src\kiwano\2d\Text.h" />
-    </ClInclude>
+    <ClInclude Include="..\src\kiwano\2d\TextStyle.hpp" />
-    <ClInclude Include="2d\Color.h">
+    <ClInclude Include="..\src\kiwano\2d\Transform.hpp" />
-      <Filter>2d</Filter>
+    <ClInclude Include="..\src\kiwano\2d\Transition.h" />
-    </ClInclude>
+    <ClInclude Include="..\src\kiwano\base\AsyncTask.h" />
-    <ClInclude Include="2d\DebugNode.h">
+    <ClInclude Include="..\src\kiwano\base\Component.h" />
-      <Filter>2d</Filter>
+    <ClInclude Include="..\src\kiwano\base\Event.hpp" />
-    </ClInclude>
+    <ClInclude Include="..\src\kiwano\base\EventDispatcher.h" />
-    <ClInclude Include="2d\Font.hpp">
+    <ClInclude Include="..\src\kiwano\base\EventListener.h" />
-      <Filter>2d</Filter>
+    <ClInclude Include="..\src\kiwano\base\Input.h" />
-    </ClInclude>
+    <ClInclude Include="..\src\kiwano\base\keys.hpp" />
-    <ClInclude Include="2d\Frames.h">
+    <ClInclude Include="..\src\kiwano\base\logs.h" />
-      <Filter>2d</Filter>
+    <ClInclude Include="..\src\kiwano\base\Object.h" />
-    </ClInclude>
+    <ClInclude Include="..\src\kiwano\base\RefCounter.hpp" />
-    <ClInclude Include="2d\Geometry.h">
+    <ClInclude Include="..\src\kiwano\base\Resource.h" />
-      <Filter>2d</Filter>
+    <ClInclude Include="..\src\kiwano\base\SmartPtr.hpp" />
-    </ClInclude>
+    <ClInclude Include="..\src\kiwano\base\Timer.h" />
-    <ClInclude Include="2d\GeometryNode.h">
+    <ClInclude Include="..\src\kiwano\base\TimerManager.h" />
-      <Filter>2d</Filter>
+    <ClInclude Include="..\src\kiwano\base\time.h" />
-    </ClInclude>
+    <ClInclude Include="..\src\kiwano\base\window.h" />
-    <ClInclude Include="2d\Image.h">
+    <ClInclude Include="..\src\kiwano\common\Array.hpp" />
-      <Filter>2d</Filter>
+    <ClInclude Include="..\src\kiwano\common\Closure.hpp" />
-    </ClInclude>
+    <ClInclude Include="..\src\kiwano\common\ComPtr.hpp" />
-    <ClInclude Include="2d\include-forwards.h">
+    <ClInclude Include="..\src\kiwano\common\helper.h" />
-      <Filter>2d</Filter>
+    <ClInclude Include="..\src\kiwano\common\IntrusiveList.hpp" />
-    </ClInclude>
+    <ClInclude Include="..\src\kiwano\common\IntrusivePtr.hpp" />
-    <ClInclude Include="2d\Layer.h">
+    <ClInclude Include="..\src\kiwano\common\Json.hpp" />
-      <Filter>2d</Filter>
+    <ClInclude Include="..\src\kiwano\common\Noncopyable.hpp" />
-    </ClInclude>
+    <ClInclude Include="..\src\kiwano\common\Singleton.hpp" />
-    <ClInclude Include="2d\Node.h">
+    <ClInclude Include="..\src\kiwano\common\String.hpp" />
-      <Filter>2d</Filter>
+    <ClInclude Include="..\src\kiwano\math\constants.hpp" />
-    </ClInclude>
+    <ClInclude Include="..\src\kiwano\math\ease.hpp" />
-    <ClInclude Include="2d\Scene.h">
+    <ClInclude Include="..\src\kiwano\math\helper.h" />
-      <Filter>2d</Filter>
+    <ClInclude Include="..\src\kiwano\math\Matrix.hpp" />
-    </ClInclude>
+    <ClInclude Include="..\src\kiwano\math\rand.h" />
-    <ClInclude Include="2d\Sprite.h">
+    <ClInclude Include="..\src\kiwano\math\Rect.hpp" />
-      <Filter>2d</Filter>
+    <ClInclude Include="..\src\kiwano\math\scalar.hpp" />
-    </ClInclude>
+    <ClInclude Include="..\src\kiwano\math\Vec2.hpp" />
-    <ClInclude Include="2d\Text.h">
+    <ClInclude Include="..\src\kiwano\platform\Application.h" />
-      <Filter>2d</Filter>
+    <ClInclude Include="..\src\kiwano\platform\modules.h" />
-    </ClInclude>
+    <ClInclude Include="..\src\kiwano\renderer\D2DDeviceResources.h" />
-    <ClInclude Include="2d\TextStyle.hpp">
+    <ClInclude Include="..\src\kiwano\renderer\D3D10DeviceResources.h" />
-      <Filter>2d</Filter>
+    <ClInclude Include="..\src\kiwano\renderer\D3D11DeviceResources.h" />
-    </ClInclude>
+    <ClInclude Include="..\src\kiwano\renderer\D3DDeviceResourcesBase.h" />
-    <ClInclude Include="2d\Transform.hpp">
+    <ClInclude Include="..\src\kiwano\renderer\helper.hpp" />
-      <Filter>2d</Filter>
+    <ClInclude Include="..\src\kiwano\renderer\render.h" />
-    </ClInclude>
+    <ClInclude Include="..\src\kiwano\renderer\TextRenderer.h" />
-    <ClInclude Include="2d\Transition.h">
+    <ClInclude Include="..\src\kiwano\third-party\StackWalker\StackWalker.h" />
-      <Filter>2d</Filter>
+    <ClInclude Include="..\src\kiwano\third-party\tinyxml2\tinyxml2.h" />
-    </ClInclude>
+    <ClInclude Include="..\src\kiwano\ui\Button.h" />
-    <ClInclude Include="common\ComPtr.hpp">
+    <ClInclude Include="..\src\kiwano\ui\Menu.h" />
-      <Filter>common</Filter>
+    <ClInclude Include="..\src\kiwano\utils\DataUtil.h" />
-    </ClInclude>
+    <ClInclude Include="..\src\kiwano\utils\FileUtil.h" />
-    <ClInclude Include="common\helper.h">
+    <ClInclude Include="..\src\kiwano\utils\Path.h" />
-      <Filter>common</Filter>
+    <ClInclude Include="..\src\kiwano\utils\ResLoader.h" />
-    </ClInclude>
-    <ClInclude Include="common\IntrusiveList.hpp">
-      <Filter>common</Filter>
-    </ClInclude>
-    <ClInclude Include="common\IntrusivePtr.hpp">
-      <Filter>common</Filter>
-    </ClInclude>
-    <ClInclude Include="common\Singleton.hpp">
-      <Filter>common</Filter>
-    </ClInclude>
-    <ClInclude Include="base\Component.h">
-      <Filter>base</Filter>
-    </ClInclude>
-    <ClInclude Include="base\Event.hpp">
-      <Filter>base</Filter>
-    </ClInclude>
-    <ClInclude Include="base\EventDispatcher.h">
-      <Filter>base</Filter>
-    </ClInclude>
-    <ClInclude Include="base\EventListener.h">
-      <Filter>base</Filter>
-    </ClInclude>
-    <ClInclude Include="base\keys.hpp">
-      <Filter>base</Filter>
-    </ClInclude>
-    <ClInclude Include="base\logs.h">
-      <Filter>base</Filter>
-    </ClInclude>
-    <ClInclude Include="base\RefCounter.hpp">
-      <Filter>base</Filter>
-    </ClInclude>
-    <ClInclude Include="base\Resource.h">
-      <Filter>base</Filter>
-    </ClInclude>
-    <ClInclude Include="base\time.h">
-      <Filter>base</Filter>
-    </ClInclude>
-    <ClInclude Include="renderer\D2DDeviceResources.h">
-      <Filter>renderer</Filter>
-    </ClInclude>
-    <ClInclude Include="renderer\D3D10DeviceResources.h">
-      <Filter>renderer</Filter>
-    </ClInclude>
-    <ClInclude Include="renderer\D3D11DeviceResources.h">
-      <Filter>renderer</Filter>
-    </ClInclude>
-    <ClInclude Include="renderer\helper.hpp">
-      <Filter>renderer</Filter>
-    </ClInclude>
-    <ClInclude Include="renderer\render.h">
-      <Filter>renderer</Filter>
-    </ClInclude>
-    <ClInclude Include="renderer\TextRenderer.h">
-      <Filter>renderer</Filter>
-    </ClInclude>
-    <ClInclude Include="math\constants.hpp">
-      <Filter>math</Filter>
-    </ClInclude>
-    <ClInclude Include="math\ease.hpp">
-      <Filter>math</Filter>
-    </ClInclude>
-    <ClInclude Include="math\Matrix.hpp">
-      <Filter>math</Filter>
-    </ClInclude>
-    <ClInclude Include="math\rand.h">
-      <Filter>math</Filter>
-    </ClInclude>
-    <ClInclude Include="math\Rect.hpp">
-      <Filter>math</Filter>
-    </ClInclude>
-    <ClInclude Include="math\scalar.hpp">
-      <Filter>math</Filter>
-    </ClInclude>
-    <ClInclude Include="platform\Application.h">
-      <Filter>platform</Filter>
-    </ClInclude>
-    <ClInclude Include="platform\modules.h">
-      <Filter>platform</Filter>
-    </ClInclude>
-    <ClInclude Include="utils\Path.h">
-      <Filter>utils</Filter>
-    </ClInclude>
-    <ClInclude Include="utils\ResLoader.h">
-      <Filter>utils</Filter>
-    </ClInclude>
-    <ClInclude Include="config.h" />
-    <ClInclude Include="macros.h" />
-    <ClInclude Include="math\helper.h">
-      <Filter>math</Filter>
-    </ClInclude>
-    <ClInclude Include="math\Vec2.hpp">
-      <Filter>math</Filter>
-    </ClInclude>
-    <ClInclude Include="base\Input.h">
-      <Filter>base</Filter>
-    </ClInclude>
-    <ClInclude Include="base\window.h">
-      <Filter>base</Filter>
-    </ClInclude>
-    <ClInclude Include="base\SmartPtr.hpp">
-      <Filter>base</Filter>
-    </ClInclude>
-    <ClInclude Include="base\Object.h">
-      <Filter>base</Filter>
-    </ClInclude>
-    <ClInclude Include="kiwano.h" />
-    <ClInclude Include="utils\DataUtil.h">
-      <Filter>utils</Filter>
-    </ClInclude>
-    <ClInclude Include="base\Timer.h">
-      <Filter>base</Filter>
-    </ClInclude>
-    <ClInclude Include="base\TimerManager.h">
-      <Filter>base</Filter>
-    </ClInclude>
-    <ClInclude Include="base\AsyncTask.h">
-      <Filter>base</Filter>
-    </ClInclude>
-    <ClInclude Include="2d\GifImage.h">
-      <Filter>2d</Filter>
-    </ClInclude>
-    <ClInclude Include="third-party\StackWalker\StackWalker.h">
-      <Filter>third-party\StackWalker</Filter>
-    </ClInclude>
-    <ClInclude Include="utils\FileUtil.h">
-      <Filter>utils</Filter>
-    </ClInclude>
-    <ClInclude Include="renderer\D3DDeviceResourcesBase.h">
-      <Filter>renderer</Filter>
-    </ClInclude>
-    <ClInclude Include="base\types.h">
-      <Filter>base</Filter>
-    </ClInclude>
-    <ClInclude Include="2d\GifSprite.h">
-      <Filter>2d</Filter>
-    </ClInclude>
-    <ClInclude Include="common\Closure.hpp">
-      <Filter>common</Filter>
-    </ClInclude>
-    <ClInclude Include="common\Noncopyable.hpp">
-      <Filter>common</Filter>
-    </ClInclude>
-    <ClInclude Include="common\String.hpp">
-      <Filter>common</Filter>
-    </ClInclude>
-    <ClInclude Include="common\Json.hpp">
-      <Filter>common</Filter>
-    </ClInclude>
-    <ClInclude Include="common\Array.hpp">
-      <Filter>common</Filter>
-    </ClInclude>
-    <ClInclude Include="third-party\tinyxml2\tinyxml2.h">
-      <Filter>third-party\tinyxml2</Filter>
-    </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="ui\Button.cpp">
+    <ClCompile Include="..\src\kiwano\2d\Action.cpp" />
-      <Filter>ui</Filter>
+    <ClCompile Include="..\src\kiwano\2d\ActionGroup.cpp" />
-    </ClCompile>
+    <ClCompile Include="..\src\kiwano\2d\ActionManager.cpp" />
-    <ClCompile Include="ui\Menu.cpp">
+    <ClCompile Include="..\src\kiwano\2d\ActionTween.cpp" />
-      <Filter>ui</Filter>
+    <ClCompile Include="..\src\kiwano\2d\Animation.cpp" />
-    </ClCompile>
+    <ClCompile Include="..\src\kiwano\2d\Canvas.cpp" />
-    <ClCompile Include="2d\Action.cpp">
+    <ClCompile Include="..\src\kiwano\2d\Color.cpp" />
-      <Filter>2d</Filter>
+    <ClCompile Include="..\src\kiwano\2d\DebugNode.cpp" />
-    </ClCompile>
+    <ClCompile Include="..\src\kiwano\2d\Frames.cpp" />
-    <ClCompile Include="2d\ActionGroup.cpp">
+    <ClCompile Include="..\src\kiwano\2d\Geometry.cpp" />
-      <Filter>2d</Filter>
+    <ClCompile Include="..\src\kiwano\2d\GeometryNode.cpp" />
-    </ClCompile>
+    <ClCompile Include="..\src\kiwano\2d\GifImage.cpp" />
-    <ClCompile Include="2d\ActionManager.cpp">
+    <ClCompile Include="..\src\kiwano\2d\GifSprite.cpp" />
-      <Filter>2d</Filter>
+    <ClCompile Include="..\src\kiwano\2d\Image.cpp" />
-    </ClCompile>
+    <ClCompile Include="..\src\kiwano\2d\Layer.cpp" />
-    <ClCompile Include="2d\ActionTween.cpp">
+    <ClCompile Include="..\src\kiwano\2d\Node.cpp" />
-      <Filter>2d</Filter>
+    <ClCompile Include="..\src\kiwano\2d\Scene.cpp" />
-    </ClCompile>
+    <ClCompile Include="..\src\kiwano\2d\Sprite.cpp" />
-    <ClCompile Include="2d\Animation.cpp">
+    <ClCompile Include="..\src\kiwano\2d\Text.cpp" />
-      <Filter>2d</Filter>
+    <ClCompile Include="..\src\kiwano\2d\Transition.cpp" />
-    </ClCompile>
+    <ClCompile Include="..\src\kiwano\base\AsyncTask.cpp" />
-    <ClCompile Include="2d\Canvas.cpp">
+    <ClCompile Include="..\src\kiwano\base\EventDispatcher.cpp" />
-      <Filter>2d</Filter>
+    <ClCompile Include="..\src\kiwano\base\EventListener.cpp" />
-    </ClCompile>
+    <ClCompile Include="..\src\kiwano\base\Input.cpp" />
-    <ClCompile Include="2d\Color.cpp">
+    <ClCompile Include="..\src\kiwano\base\logs.cpp" />
-      <Filter>2d</Filter>
+    <ClCompile Include="..\src\kiwano\base\Object.cpp" />
-    </ClCompile>
+    <ClCompile Include="..\src\kiwano\base\Resource.cpp" />
-    <ClCompile Include="2d\DebugNode.cpp">
+    <ClCompile Include="..\src\kiwano\base\Timer.cpp" />
-      <Filter>2d</Filter>
+    <ClCompile Include="..\src\kiwano\base\TimerManager.cpp" />
-    </ClCompile>
+    <ClCompile Include="..\src\kiwano\base\time.cpp" />
-    <ClCompile Include="2d\Frames.cpp">
+    <ClCompile Include="..\src\kiwano\base\window.cpp" />
-      <Filter>2d</Filter>
+    <ClCompile Include="..\src\kiwano\platform\Application.cpp" />
-    </ClCompile>
+    <ClCompile Include="..\src\kiwano\platform\modules.cpp" />
-    <ClCompile Include="2d\Geometry.cpp">
+    <ClCompile Include="..\src\kiwano\renderer\D2DDeviceResources.cpp" />
-      <Filter>2d</Filter>
+    <ClCompile Include="..\src\kiwano\renderer\D3D10DeviceResources.cpp" />
-    </ClCompile>
+    <ClCompile Include="..\src\kiwano\renderer\D3D11DeviceResources.cpp" />
-    <ClCompile Include="2d\GeometryNode.cpp">
+    <ClCompile Include="..\src\kiwano\renderer\render.cpp" />
-      <Filter>2d</Filter>
+    <ClCompile Include="..\src\kiwano\renderer\TextRenderer.cpp" />
-    </ClCompile>
+    <ClCompile Include="..\src\kiwano\third-party\StackWalker\StackWalker.cpp" />
-    <ClCompile Include="2d\Image.cpp">
+    <ClCompile Include="..\src\kiwano\third-party\tinyxml2\tinyxml2.cpp" />
-      <Filter>2d</Filter>
+    <ClCompile Include="..\src\kiwano\ui\Button.cpp" />
-    </ClCompile>
+    <ClCompile Include="..\src\kiwano\ui\Menu.cpp" />
-    <ClCompile Include="2d\Layer.cpp">
+    <ClCompile Include="..\src\kiwano\utils\DataUtil.cpp" />
-      <Filter>2d</Filter>
+    <ClCompile Include="..\src\kiwano\utils\FileUtil.cpp" />
-    </ClCompile>
+    <ClCompile Include="..\src\kiwano\utils\Path.cpp" />
-    <ClCompile Include="2d\Node.cpp">
+    <ClCompile Include="..\src\kiwano\utils\ResLoader.cpp" />
-      <Filter>2d</Filter>
-    </ClCompile>
-    <ClCompile Include="2d\Scene.cpp">
-      <Filter>2d</Filter>
-    </ClCompile>
-    <ClCompile Include="2d\Sprite.cpp">
-      <Filter>2d</Filter>
-    </ClCompile>
-    <ClCompile Include="2d\Text.cpp">
-      <Filter>2d</Filter>
-    </ClCompile>
-    <ClCompile Include="2d\Transition.cpp">
-      <Filter>2d</Filter>
-    </ClCompile>
-    <ClCompile Include="base\EventDispatcher.cpp">
-      <Filter>base</Filter>
-    </ClCompile>
-    <ClCompile Include="base\EventListener.cpp">
-      <Filter>base</Filter>
-    </ClCompile>
-    <ClCompile Include="base\logs.cpp">
-      <Filter>base</Filter>
-    </ClCompile>
-    <ClCompile Include="base\Resource.cpp">
-      <Filter>base</Filter>
-    </ClCompile>
-    <ClCompile Include="base\time.cpp">
-      <Filter>base</Filter>
-    </ClCompile>
-    <ClCompile Include="renderer\D2DDeviceResources.cpp">
-      <Filter>renderer</Filter>
-    </ClCompile>
-    <ClCompile Include="renderer\D3D10DeviceResources.cpp">
-      <Filter>renderer</Filter>
-    </ClCompile>
-    <ClCompile Include="renderer\D3D11DeviceResources.cpp">
-      <Filter>renderer</Filter>
-    </ClCompile>
-    <ClCompile Include="renderer\render.cpp">
-      <Filter>renderer</Filter>
-    </ClCompile>
-    <ClCompile Include="renderer\TextRenderer.cpp">
-      <Filter>renderer</Filter>
-    </ClCompile>
-    <ClCompile Include="platform\Application.cpp">
-      <Filter>platform</Filter>
-    </ClCompile>
-    <ClCompile Include="platform\modules.cpp">
-      <Filter>platform</Filter>
-    </ClCompile>
-    <ClCompile Include="utils\Path.cpp">
-      <Filter>utils</Filter>
-    </ClCompile>
-    <ClCompile Include="utils\ResLoader.cpp">
-      <Filter>utils</Filter>
-    </ClCompile>
-    <ClCompile Include="base\Input.cpp">
-      <Filter>base</Filter>
-    </ClCompile>
-    <ClCompile Include="base\window.cpp">
-      <Filter>base</Filter>
-    </ClCompile>
-    <ClCompile Include="base\Object.cpp">
-      <Filter>base</Filter>
-    </ClCompile>
-    <ClCompile Include="utils\DataUtil.cpp">
-      <Filter>utils</Filter>
-    </ClCompile>
-    <ClCompile Include="base\Timer.cpp">
-      <Filter>base</Filter>
-    </ClCompile>
-    <ClCompile Include="base\TimerManager.cpp">
-      <Filter>base</Filter>
-    </ClCompile>
-    <ClCompile Include="base\AsyncTask.cpp">
-      <Filter>base</Filter>
-    </ClCompile>
-    <ClCompile Include="2d\GifImage.cpp">
-      <Filter>2d</Filter>
-    </ClCompile>
-    <ClCompile Include="third-party\StackWalker\StackWalker.cpp">
-      <Filter>third-party\StackWalker</Filter>
-    </ClCompile>
-    <ClCompile Include="utils\FileUtil.cpp">
-      <Filter>utils</Filter>
-    </ClCompile>
-    <ClCompile Include="2d\GifSprite.cpp">
-      <Filter>2d</Filter>
-    </ClCompile>
-    <ClCompile Include="third-party\tinyxml2\tinyxml2.cpp">
-      <Filter>third-party\tinyxml2</Filter>
-    </ClCompile>
   </ItemGroup>
 </Project>

samples/Box2DSample/Box2DSample.vcxproj

@@ -19,24 +19,14 @@
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset Condition="'$(VisualStudioVersion)' == '10.0'">v100</PlatformToolset>
+    <PlatformToolset>$(DefaultPlatformToolset)</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>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>false</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset Condition="'$(VisualStudioVersion)' == '10.0'">v100</PlatformToolset>
+    <PlatformToolset>$(DefaultPlatformToolset)</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">
@@ -51,13 +41,13 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>$(SolutionDir)\output\$(Platform)\$(Configuration).$(PlatformToolset)\</OutDir>
+    <OutDir>$(SolutionDir)\output\$(PlatformToolset)\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)\build\$(Platform)\$(Configuration).$(PlatformToolset)\$(ProjectName)\</IntDir>
+    <IntDir>$(SolutionDir)\build\$(PlatformToolset)\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
     <LinkIncremental>true</LinkIncremental>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>$(SolutionDir)\output\$(Platform)\$(Configuration).$(PlatformToolset)\</OutDir>
+    <OutDir>$(SolutionDir)\output\$(PlatformToolset)\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)\build\$(Platform)\$(Configuration).$(PlatformToolset)\$(ProjectName)\</IntDir>
+    <IntDir>$(SolutionDir)\build\$(PlatformToolset)\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
     <LinkIncremental>false</LinkIncremental>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

samples/HelloWorld/HelloWorld.vcxproj

@@ -19,24 +19,14 @@
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset Condition="'$(VisualStudioVersion)' == '10.0'">v100</PlatformToolset>
+    <PlatformToolset>$(DefaultPlatformToolset)</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>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>false</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset Condition="'$(VisualStudioVersion)' == '10.0'">v100</PlatformToolset>
+    <PlatformToolset>$(DefaultPlatformToolset)</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">
@@ -51,13 +41,13 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>$(SolutionDir)\output\$(Platform)\$(Configuration).$(PlatformToolset)\</OutDir>
+    <OutDir>$(SolutionDir)\output\$(PlatformToolset)\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)\build\$(Platform)\$(Configuration).$(PlatformToolset)\$(ProjectName)\</IntDir>
+    <IntDir>$(SolutionDir)\build\$(PlatformToolset)\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
     <LinkIncremental>true</LinkIncremental>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>$(SolutionDir)\output\$(Platform)\$(Configuration).$(PlatformToolset)\</OutDir>
+    <OutDir>$(SolutionDir)\output\$(PlatformToolset)\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)\build\$(Platform)\$(Configuration).$(PlatformToolset)\$(ProjectName)\</IntDir>
+    <IntDir>$(SolutionDir)\build\$(PlatformToolset)\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
     <LinkIncremental>false</LinkIncremental>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

samples/ImGuiSample/ImGuiSample.vcxproj

@@ -19,24 +19,14 @@
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset Condition="'$(VisualStudioVersion)' == '10.0'">v100</PlatformToolset>
+    <PlatformToolset>$(DefaultPlatformToolset)</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>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>false</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset Condition="'$(VisualStudioVersion)' == '10.0'">v100</PlatformToolset>
+    <PlatformToolset>$(DefaultPlatformToolset)</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">
@@ -51,13 +41,13 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>$(SolutionDir)\output\$(Platform)\$(Configuration).$(PlatformToolset)\</OutDir>
+    <OutDir>$(SolutionDir)\output\$(PlatformToolset)\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)\build\$(Platform)\$(Configuration).$(PlatformToolset)\$(ProjectName)\</IntDir>
+    <IntDir>$(SolutionDir)\build\$(PlatformToolset)\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
     <LinkIncremental>true</LinkIncremental>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>$(SolutionDir)\output\$(Platform)\$(Configuration).$(PlatformToolset)\</OutDir>
+    <OutDir>$(SolutionDir)\output\$(PlatformToolset)\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)\build\$(Platform)\$(Configuration).$(PlatformToolset)\$(ProjectName)\</IntDir>
+    <IntDir>$(SolutionDir)\build\$(PlatformToolset)\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
     <LinkIncremental>false</LinkIncremental>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

samples/Samples/Samples.vcxproj

@@ -19,24 +19,14 @@
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset Condition="'$(VisualStudioVersion)' == '10.0'">v100</PlatformToolset>
+    <PlatformToolset>$(DefaultPlatformToolset)</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>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>false</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset Condition="'$(VisualStudioVersion)' == '10.0'">v100</PlatformToolset>
+    <PlatformToolset>$(DefaultPlatformToolset)</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">
@@ -51,13 +41,13 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>$(SolutionDir)\output\$(Platform)\$(Configuration).$(PlatformToolset)\</OutDir>
+    <OutDir>$(SolutionDir)\output\$(PlatformToolset)\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)\build\$(Platform)\$(Configuration).$(PlatformToolset)\$(ProjectName)\</IntDir>
+    <IntDir>$(SolutionDir)\build\$(PlatformToolset)\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
     <LinkIncremental>true</LinkIncremental>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>$(SolutionDir)\output\$(Platform)\$(Configuration).$(PlatformToolset)\</OutDir>
+    <OutDir>$(SolutionDir)\output\$(PlatformToolset)\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)\build\$(Platform)\$(Configuration).$(PlatformToolset)\$(ProjectName)\</IntDir>
+    <IntDir>$(SolutionDir)\build\$(PlatformToolset)\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
     <LinkIncremental>false</LinkIncremental>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

scripts/appveyor/appveyor_get_artifacts.ps1

@@ -0,0 +1,17 @@
+function Get-AppVeyorArtifacts {
+    param(
+        [string]$Job
+    )
+
+    if (-not ($env:APPVEYOR_API_TOKEN)) {
+        throw "missing api token for AppVeyor."
+    }
+    if (-not ($env:APPVEYOR_ACCOUNT_NAME)) {
+        throw "not an appveyor build."
+    }
+
+    return Invoke-RestMethod -Method GET -Uri "https://ci.appveyor.com/api/buildjobs/$Job/artifacts" -Headers @{
+        "Authorization" = "Bearer $env:APPVEYOR_API_TOKEN"
+        "Content-type"  = "application/json"
+    }
+}

scripts/appveyor/appveyor_get_build.ps1

@@ -0,0 +1,15 @@
+function Get-AppVeyorBuild {
+    param()
+
+    if (-not ($env:APPVEYOR_API_TOKEN)) {
+        throw "missing api token for AppVeyor."
+    }
+    if (-not ($env:APPVEYOR_ACCOUNT_NAME)) {
+        throw "not an appveyor build."
+    }
+
+    return Invoke-RestMethod -Method GET -Uri "https://ci.appveyor.com/api/projects/$env:APPVEYOR_ACCOUNT_NAME/$env:APPVEYOR_PROJECT_SLUG" -Headers @{
+        "Authorization" = "Bearer $env:APPVEYOR_API_TOKEN"
+        "Content-type"  = "application/json"
+    }
+}

scripts/appveyor/coapp_make.ps1

@@ -0,0 +1,13 @@
+Write-Host "Start to build nupkg files"
+
+# This is the CoApp .autopkg file to create.
+$autopkgFile = "scripts\coapp\kiwano.autopkg"
+
+# Get the ".autopkg.template" file, replace "@appveyor_version" with the Appveyor version number, then save to the ".autopkg" file.
+Get-Content ($autopkgFile + ".template") | ForEach-Object { $_ -replace "@appveyor_version", $env:appveyor_build_version } > $autopkgFile
+
+# Use the CoApp tools to create NuGet native packages from the .autopkg.
+Write-NuGetPackage $autopkgFile
+
+# Push all newly created .nupkg files as Appveyor artifacts for later deployment.
+Get-ChildItem .\*.nupkg | ForEach-Object { Push-AppveyorArtifact $_.FullName -FileName $_.Name }

scripts/appveyor/install_coapp.ps1

@@ -0,0 +1,10 @@
+# Download the CoApp tools.
+$msiPath = "$($env:USERPROFILE)\CoApp.Tools.Powershell.msi"
+(New-Object Net.WebClient).DownloadFile('http://coapp.org/files/CoApp.Tools.Powershell.msi', $msiPath)
+
+# Install the CoApp tools from the downloaded .msi.
+Start-Process -FilePath msiexec -ArgumentList /i, $msiPath, /quiet -Wait
+
+# Make the tools available for later PS scripts to use.
+$env:PSModulePath = $env:PSModulePath + ';C:\Program Files (x86)\Outercurve Foundation\Modules'
+Import-Module CoApp

scripts/appveyor/wait_for_other_jobs.ps1

@@ -0,0 +1,49 @@
+. .\scripts\appveyor\appveyor_get_build.ps1
+. .\scripts\appveyor\appveyor_get_artifacts.ps1
+
+# Only deploy when commit message contains "[deploy]"
+if (!(Get-AppVeyorBuild).build.message.Contains('[deploy]')) { return }
+
+# Deploy once on last job
+if ($env:APPVEYOR_JOB_NUMBER -ne $env:job_to_deploy) { return }
+
+# Wait for other jobs complete
+Write-Host "Waiting for other jobs to complete"
+
+[datetime]$stop = ([datetime]::Now).AddMinutes($env:time_out_mins)
+[bool]$success = $false
+
+while(!$success -and ([datetime]::Now) -lt $stop) {
+    $success = $true
+    (Get-AppVeyorBuild).build.jobs | foreach-object {
+        if (($_.jobId -ne $env:APPVEYOR_JOB_ID) -and ($_.status -ne "success")) {
+            $success = $false
+        }
+        Write-Host "Job `"$($_.jobId)`" $($_.status)";
+    }
+    if (!$success) { Start-sleep 5 }
+}
+
+if (!$success) {
+    throw "Test jobs were not finished in $env:time_out_mins minutes"
+}
+
+# get job artifacts
+(Get-AppVeyorBuild).build.jobs | foreach-object {
+    $jobId = $_.jobId
+    if ($jobId -ne $env:APPVEYOR_JOB_ID) {
+        # Get job artifacts information
+        (Get-AppVeyorArtifacts -Job $jobId) | foreach-object {
+            # Create directory if not exists
+            $filePath = $_.fileName.Substring(0, $_.fileName.LastIndexOf('/'))
+            if (!(Test-Path -Path $filePath)) {
+                New-Item -ItemType "directory" -Path $filePath
+            }
+            # Download artifact from other job
+            Start-FileDownload "https://ci.appveyor.com/api/buildjobs/$jobId/artifacts/$($_.fileName)" -FileName $_.fileName
+        }
+    };
+}
+
+# Set flag to deploy
+$env:flag_to_deploy = $success

scripts/coapp/kiwano.autopkg.template

@@ -0,0 +1,140 @@
+#defines {
+    // Global variables may be added here.
+    // Variables on the "value" side of each definition will be processed at access time.
+    // GlobalVar1 = "";
+}
+
+configurations {
+    // This node contains pivot information.
+    // These are discussed in detail in the Pivots section.
+    Toolset { 
+        key : "PlatformToolset"; 
+        choices: { v142, v141, v140 };
+    };
+
+    Platform {
+        key : "Platform"; 
+        choices: { Win32 };
+        Win32.aliases : { x86, win32, 386 };
+    };
+
+    Configuration {
+        key : "Configuration"; 
+        choices: { Release, Debug };
+    };
+
+    Linkage {
+        choices : { dynamic, static };
+        description = "Which version of the .lib file to link to this library";
+
+        dynamic.description = "Dynamic Library (DLL)";
+        static.description = "Static";
+    };
+
+    // Only really applicable to x86
+    CallingConvention {
+        choices : { cdecl };
+        description = "Calling convention model to use (for x86 only)";
+        cdecl.description = "cdecl";
+    };
+}
+
+nuget {
+
+    #defines {
+        // Variable definitions specific to this node (ie. "nuget").
+        // Only available while inside this scope.
+        // This metadata is not needed for most packages and is typically omitted.
+    };
+
+
+    // The nuspec file metadata.
+    nuspec {
+        id = Kiwano;
+        // "@appveyor_version" is replaced by the current Appveyor build number in the
+        // pre-deployment script.
+        version: @appveyor_version;
+        title: Kiwano Game Framework;
+        authors: Nomango;
+        owners: Nomango;
+        licenseUrl: "https://github.com/Nomango/Kiwano/blob/master/LICENSE";
+        projectUrl: "https://github.com/Nomango/Kiwano";
+        iconUrl: "https://github.com/Nomango/Kiwano/raw/master/logo/logo_square.png";
+        description: A simple game framework for C++;
+        releaseNotes: "Initial release of a Nuget package for Kiwano Game Engine";
+        copyright: Copyright 2019;
+        tags: { C++, GameFramework, Kiwano };
+    };
+
+
+    #output-packages {
+        // Output file definitions.  These are covered in detail in Output Files.
+        // This metadata is not needed for most packages and is typically omitted.
+    }
+
+
+    dependencies {
+        // This node defines any outside items which may be needed to consume this package.
+        packages : {
+            // This is a list of other NuGet packages required to use this package.
+            // Each item follows the format "<pkg_name>/<version>"
+            // my_pkg/1.0.0,
+            // my_other_pkg/2.1.5.33
+        };
+    }
+
+
+    files {
+        include: {
+            ..\..\src\**\*.h,
+            ..\..\src\**\*.hpp
+        };
+
+        [Win32, v140, Debug] {
+            lib += ..\..\projects\output\v140\Win32\Debug\*.lib;
+        }
+        [Win32, v140, Release] {
+            lib += ..\..\projects\output\v140\Win32\Release\*.lib;
+        }
+
+        [Win32, v141, Debug] {
+            lib += ..\..\projects\output\v141\Win32\Debug\*.lib;
+        }
+        [Win32, v141, Release] {
+            lib += ..\..\projects\output\v141\Win32\Release\*.lib;
+        }
+
+        [Win32, v142, Debug] {
+            lib += ..\..\projects\output\v142\Win32\Debug\*.lib;
+        }
+        [Win32, v142, Release] {
+            lib += ..\..\projects\output\v142\Win32\Release\*.lib;
+        }
+
+        bin += ..\..\src\**\*.dll;
+
+    };
+
+
+    props {
+        // Additional declarations to insert into consuming projects before most of the
+        // project settings. (These may be modified in visual studio by a developer
+        // consuming this package.)
+        // This node is typically not needed for most packages and may be omitted.
+    }
+
+
+    targets {
+        // Additional declarations to insert into consuming projects after most of the
+        // project settings. (These may NOT be modified in visual studio by a developer
+        // consuming this package.)
+        // This node is often used to set defines that are required that must be set by
+        // the consuming project in order to correctly link to the libraries in this
+        // package.  Such defines may be set either globally or only set under specific
+        // conditions.
+        //Defines += HAS_MyLib;
+        //[dynamic]
+        //    Defines += HAS_MyLib;
+    }
+
+}

src/kiwano-network/kiwano-network.h

@@ -21,8 +21,8 @@
 #pragma once
 
 #include "src/helper.h"
-#include "src/HttpRequest.h"
+#include "src/HttpRequest.hpp"
-#include "src/HttpResponse.h"
+#include "src/HttpResponse.hpp"
 #include "src/HttpClient.h"
 
 // CURL