From ecd7883521cbde02f4f1a6b23a7b3b601c32dbef Mon Sep 17 00:00:00 2001
From: chai <chaifix@163.com>
Date: Mon, 29 Jul 2019 09:06:09 +0800
Subject: *misc

---
 build/Asura.Runner/Asura.Runner.vcxproj            | 11 ++-
 build/Asura.Runner/Asura.Runner.vcxproj.filters    | 17 ++---
 build/external/Luax/Luax.vcxproj                   |  1 +
 build/external/Luax/Luax.vcxproj.filters           |  1 +
 build/modules/asura-core/asura-core.vcxproj        | 26 +++-----
 .../modules/asura-core/asura-core.vcxproj.filters  | 78 +++++++---------------
 6 files changed, 48 insertions(+), 86 deletions(-)

(limited to 'build')

diff --git a/build/Asura.Runner/Asura.Runner.vcxproj b/build/Asura.Runner/Asura.Runner.vcxproj
index 0c18dc5..ecf025b 100644
--- a/build/Asura.Runner/Asura.Runner.vcxproj
+++ b/build/Asura.Runner/Asura.Runner.vcxproj
@@ -18,6 +18,13 @@
       <Platform>x64</Platform>
     </ProjectConfiguration>
   </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\source\Asura.Runner\main.cpp" />
+    <ClCompile Include="..\..\source\Asura.Runner\runner.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\source\Asura.Runner\runner.h" />
+  </ItemGroup>
   <PropertyGroup Label="Globals">
     <VCProjectVersion>15.0</VCProjectVersion>
     <ProjectGuid>{E21A839A-C7C6-4B83-89FB-C921AEBEA9CD}</ProjectGuid>
@@ -76,6 +83,7 @@
       <Optimization>Disabled</Optimization>
       <SDLCheck>true</SDLCheck>
       <ConformanceMode>true</ConformanceMode>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\source\external;$(SolutionDir)..\source\modules;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -108,14 +116,13 @@
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <SDLCheck>true</SDLCheck>
       <ConformanceMode>true</ConformanceMode>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\source\external;$(SolutionDir)..\source\modules;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
     </Link>
   </ItemDefinitionGroup>
-  <ItemGroup>
-  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
diff --git a/build/Asura.Runner/Asura.Runner.vcxproj.filters b/build/Asura.Runner/Asura.Runner.vcxproj.filters
index 3c6f4fd..1819f86 100644
--- a/build/Asura.Runner/Asura.Runner.vcxproj.filters
+++ b/build/Asura.Runner/Asura.Runner.vcxproj.filters
@@ -1,17 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <Filter Include="源文件">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="头文件">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hh;hpp;hxx;hm;inl;inc;ipp;xsd</Extensions>
-    </Filter>
-    <Filter Include="资源文件">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
-    </Filter>
+    <ClCompile Include="..\..\source\Asura.Runner\main.cpp" />
+    <ClCompile Include="..\..\source\Asura.Runner\runner.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\source\Asura.Runner\runner.h" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/build/external/Luax/Luax.vcxproj b/build/external/Luax/Luax.vcxproj
index 638a1a4..b9b130d 100644
--- a/build/external/Luax/Luax.vcxproj
+++ b/build/external/Luax/Luax.vcxproj
@@ -128,6 +128,7 @@
     <ClInclude Include="..\..\..\Source\external\Luax\luax_config.h" />
     <ClInclude Include="..\..\..\source\external\Luax\luax_globalstate.h" />
     <ClInclude Include="..\..\..\source\external\Luax\luax_internal.h" />
+    <ClInclude Include="..\..\..\source\external\Luax\luax_utility.h" />
     <ClInclude Include="..\..\..\Source\external\Luax\luax_vm.h" />
     <ClInclude Include="..\..\..\Source\external\Luax\luax_enum.h" />
     <ClInclude Include="..\..\..\Source\external\Luax\luax_memberref.h" />
diff --git a/build/external/Luax/Luax.vcxproj.filters b/build/external/Luax/Luax.vcxproj.filters
index 9d690cf..afb32e8 100644
--- a/build/external/Luax/Luax.vcxproj.filters
+++ b/build/external/Luax/Luax.vcxproj.filters
@@ -14,6 +14,7 @@
     <ClInclude Include="..\..\..\source\external\Luax\luax_internal.h" />
     <ClInclude Include="..\..\..\source\external\Luax\luax_globalstate.h" />
     <ClInclude Include="..\..\..\source\external\Luax\luax_watchdog.h" />
+    <ClInclude Include="..\..\..\source\external\Luax\luax_utility.h" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\..\Source\external\Luax\luax_ref.cpp" />
diff --git a/build/modules/asura-core/asura-core.vcxproj b/build/modules/asura-core/asura-core.vcxproj
index ed820fa..fcb37c4 100644
--- a/build/modules/asura-core/asura-core.vcxproj
+++ b/build/modules/asura-core/asura-core.vcxproj
@@ -142,7 +142,6 @@
     <ClCompile Include="..\..\..\source\modules\asura-core\graphics\canvas.cpp" />
     <ClCompile Include="..\..\..\source\modules\asura-core\graphics\color.cpp" />
     <ClCompile Include="..\..\..\source\modules\asura-core\graphics\color32.cpp" />
-    <ClCompile Include="..\..\..\source\modules\asura-core\graphics\gif.cpp" />
     <ClCompile Include="..\..\..\source\modules\asura-core\graphics\gfx_device.cpp" />
     <ClCompile Include="..\..\..\source\modules\asura-core\graphics\image.cpp" />
     <ClCompile Include="..\..\..\source\modules\asura-core\graphics\index_buffer.cpp" />
@@ -163,11 +162,8 @@
     <ClCompile Include="..\..\..\source\modules\asura-core\image\png_decoder.cpp" />
     <ClCompile Include="..\..\..\source\modules\asura-core\image\stb_decoder.cpp" />
     <ClCompile Include="..\..\..\source\modules\asura-core\input\clipboard.cpp" />
-    <ClCompile Include="..\..\..\source\modules\asura-core\input\cursor.cpp" />
-    <ClCompile Include="..\..\..\source\modules\asura-core\input\cursor_impl_sdl.cpp" />
-    <ClCompile Include="..\..\..\source\modules\asura-core\input\equeue.cpp" />
-    <ClCompile Include="..\..\..\source\modules\asura-core\input\keyboard.cpp" />
-    <ClCompile Include="..\..\..\source\modules\asura-core\input\mouse.cpp" />
+    <ClCompile Include="..\..\..\source\modules\asura-core\input\input_device.cpp" />
+    <ClCompile Include="..\..\..\source\modules\asura-core\input\input_manager.cpp" />
     <ClCompile Include="..\..\..\source\modules\asura-core\mesh\am2_handler.cpp" />
     <ClCompile Include="..\..\..\source\modules\asura-core\mesh\mesh2d_data.cpp" />
     <ClCompile Include="..\..\..\source\modules\asura-core\mesh\mesh2d_handler.cpp" />
@@ -196,7 +192,6 @@
     <ClInclude Include="..\..\..\source\modules\asura-core\graphics\color.h" />
     <ClInclude Include="..\..\..\source\modules\asura-core\graphics\color32.h" />
     <ClInclude Include="..\..\..\source\modules\asura-core\graphics\color_palette.h" />
-    <ClInclude Include="..\..\..\source\modules\asura-core\graphics\gif.h" />
     <ClInclude Include="..\..\..\source\modules\asura-core\graphics\gfx_device.h" />
     <ClInclude Include="..\..\..\source\modules\asura-core\graphics\image.h" />
     <ClInclude Include="..\..\..\source\modules\asura-core\graphics\index_buffer.h" />
@@ -216,18 +211,13 @@
     <ClInclude Include="..\..\..\source\modules\asura-core\image\image_decode_task.h" />
     <ClInclude Include="..\..\..\source\modules\asura-core\image\png_decoder.h" />
     <ClInclude Include="..\..\..\source\modules\asura-core\image\stb_decoder.h" />
+    <ClInclude Include="..\..\..\source\modules\asura-core\input\button.h" />
     <ClInclude Include="..\..\..\source\modules\asura-core\input\clipboard.h" />
-    <ClInclude Include="..\..\..\source\modules\asura-core\input\cursor.h" />
-    <ClInclude Include="..\..\..\source\modules\asura-core\input\cursor_impl_sdl.h" />
-    <ClInclude Include="..\..\..\source\modules\asura-core\input\equeue.h" />
-    <ClInclude Include="..\..\..\source\modules\asura-core\input\equeue_impl_sdl.h" />
-    <ClInclude Include="..\..\..\source\modules\asura-core\input\equeue_impl_win32.h" />
-    <ClInclude Include="..\..\..\source\modules\asura-core\input\event.h" />
-    <ClInclude Include="..\..\..\source\modules\asura-core\input\input_device.hpp" />
-    <ClInclude Include="..\..\..\source\modules\asura-core\input\joypad.h" />
-    <ClInclude Include="..\..\..\source\modules\asura-core\input\keyboard.h" />
-    <ClInclude Include="..\..\..\source\modules\asura-core\input\mouse.h" />
-    <ClInclude Include="..\..\..\source\modules\asura-core\input\event_manager.h" />
+    <ClInclude Include="..\..\..\source\modules\asura-core\input\input_device.h" />
+    <ClInclude Include="..\..\..\source\modules\asura-core\input\input_manager.h" />
+    <ClInclude Include="..\..\..\source\modules\asura-core\input\joystick_state.h" />
+    <ClInclude Include="..\..\..\source\modules\asura-core\input\keyboard_state.h" />
+    <ClInclude Include="..\..\..\source\modules\asura-core\input\mouse_state.h" />
     <ClInclude Include="..\..\..\source\modules\asura-core\mesh\am2_handler.h" />
     <ClInclude Include="..\..\..\source\modules\asura-core\mesh\mesh2d_data.h" />
     <ClInclude Include="..\..\..\source\modules\asura-core\mesh\mesh2d_handler.h" />
diff --git a/build/modules/asura-core/asura-core.vcxproj.filters b/build/modules/asura-core/asura-core.vcxproj.filters
index b5cda13..c7b664b 100644
--- a/build/modules/asura-core/asura-core.vcxproj.filters
+++ b/build/modules/asura-core/asura-core.vcxproj.filters
@@ -49,9 +49,6 @@
     <ClCompile Include="..\..\..\source\modules\asura-core\graphics\color.cpp">
       <Filter>graphics</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\source\modules\asura-core\graphics\gif.cpp">
-      <Filter>graphics</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\source\modules\asura-core\graphics\mesh2d.cpp">
       <Filter>graphics</Filter>
     </ClCompile>
@@ -128,21 +125,6 @@
     <ClCompile Include="..\..\..\source\modules\asura-core\input\clipboard.cpp">
       <Filter>input</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\source\modules\asura-core\input\cursor.cpp">
-      <Filter>input</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\source\modules\asura-core\input\cursor_impl_sdl.cpp">
-      <Filter>input</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\source\modules\asura-core\input\keyboard.cpp">
-      <Filter>input</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\source\modules\asura-core\input\mouse.cpp">
-      <Filter>input</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\source\modules\asura-core\input\equeue.cpp">
-      <Filter>input</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\source\modules\asura-core\image\image_data.cpp">
       <Filter>image</Filter>
     </ClCompile>
@@ -218,6 +200,12 @@
     <ClCompile Include="..\..\..\source\modules\asura-core\profiler\gpu_profiler.cpp">
       <Filter>profiler</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\source\modules\asura-core\input\input_device.cpp">
+      <Filter>input</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\modules\asura-core\input\input_manager.cpp">
+      <Filter>input</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\..\source\modules\asura-core\application.h" />
@@ -233,9 +221,6 @@
     <ClInclude Include="..\..\..\source\modules\asura-core\graphics\color_palette.h">
       <Filter>graphics</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\source\modules\asura-core\graphics\gif.h">
-      <Filter>graphics</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\source\modules\asura-core\graphics\mesh2d.h">
       <Filter>graphics</Filter>
     </ClInclude>
@@ -296,39 +281,6 @@
     <ClInclude Include="..\..\..\source\modules\asura-core\input\clipboard.h">
       <Filter>input</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\source\modules\asura-core\input\cursor.h">
-      <Filter>input</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\source\modules\asura-core\input\cursor_impl_sdl.h">
-      <Filter>input</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\source\modules\asura-core\input\equeue.h">
-      <Filter>input</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\source\modules\asura-core\input\equeue_impl_sdl.h">
-      <Filter>input</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\source\modules\asura-core\input\equeue_impl_win32.h">
-      <Filter>input</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\source\modules\asura-core\input\event.h">
-      <Filter>input</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\source\modules\asura-core\input\input_device.hpp">
-      <Filter>input</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\source\modules\asura-core\input\joypad.h">
-      <Filter>input</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\source\modules\asura-core\input\keyboard.h">
-      <Filter>input</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\source\modules\asura-core\input\mouse.h">
-      <Filter>input</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\source\modules\asura-core\input\event_manager.h">
-      <Filter>input</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\source\modules\asura-core\image\image_decoder.h">
       <Filter>image</Filter>
     </ClInclude>
@@ -386,6 +338,24 @@
     <ClInclude Include="..\..\..\source\modules\asura-core\profiler\gpu_profiler.h">
       <Filter>profiler</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\source\modules\asura-core\input\input_manager.h">
+      <Filter>input</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\modules\asura-core\input\input_device.h">
+      <Filter>input</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\modules\asura-core\input\joystick_state.h">
+      <Filter>input</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\modules\asura-core\input\keyboard_state.h">
+      <Filter>input</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\modules\asura-core\input\mouse_state.h">
+      <Filter>input</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\modules\asura-core\input\button.h">
+      <Filter>input</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\..\source\modules\asura-core\font\string.inl">
-- 
cgit v1.1-26-g67d0