From e47baca4f23db43ec91fbf64d5d06d7c0dbee495 Mon Sep 17 00:00:00 2001
From: chai <chaifix@163.com>
Date: Sat, 6 Apr 2019 07:39:49 +0800
Subject: *misc

---
 build/3rd-party/Luax/Luax.vcxproj                        |   4 ++--
 build/3rd-party/Luax/Luax.vcxproj.filters                |   4 ++--
 build/Asura.Editor/Asura.Editor.vcxproj                  |   6 ++++--
 build/Asura.Editor/Asura.Editor.vcxproj.filters          |  10 ++++++++--
 build/modules/asura-core/asura-core.vcxproj              |   3 ++-
 build/modules/asura-core/asura-core.vcxproj.filters      |   9 ++++++---
 build/modules/asura-utils/asura-utils.vcxproj            |   2 ++
 build/modules/asura-utils/asura-utils.vcxproj.filters    |   9 +++++++++
 .../Release/bindingGen.csproj.CoreCompileInputs.cache    |   2 +-
 .../obj/Release/bindingGen.csproj.FileListAbsolute.txt   |   3 ---
 .../obj/Release/bindingGen.csprojAssemblyReference.cache | Bin 0 -> 8077 bytes
 11 files changed, 36 insertions(+), 16 deletions(-)
 create mode 100644 build/tools/bindingGen/obj/Release/bindingGen.csprojAssemblyReference.cache

(limited to 'build')

diff --git a/build/3rd-party/Luax/Luax.vcxproj b/build/3rd-party/Luax/Luax.vcxproj
index 9b7b0dd..8b611c6 100644
--- a/build/3rd-party/Luax/Luax.vcxproj
+++ b/build/3rd-party/Luax/Luax.vcxproj
@@ -134,7 +134,7 @@
     <ClInclude Include="..\..\..\Source\3rd-party\Luax\luax_ref.h" />
     <ClInclude Include="..\..\..\Source\3rd-party\Luax\luax_reftable.h" />
     <ClInclude Include="..\..\..\Source\3rd-party\Luax\luax_state.h" />
-    <ClInclude Include="..\..\..\source\3rd-party\Luax\luax_dog.h" />
+    <ClInclude Include="..\..\..\source\3rd-party\Luax\luax_watchdog.h" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\..\Source\3rd-party\Luax\luax_cfunctions.cpp" />
@@ -145,7 +145,7 @@
     <ClCompile Include="..\..\..\Source\3rd-party\Luax\luax_ref.cpp" />
     <ClCompile Include="..\..\..\Source\3rd-party\Luax\luax_reftable.cpp" />
     <ClCompile Include="..\..\..\Source\3rd-party\Luax\luax_state.cpp" />
-    <ClCompile Include="..\..\..\source\3rd-party\Luax\luax_dog.cpp" />
+    <ClCompile Include="..\..\..\source\3rd-party\Luax\luax_watchdog.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\lua51\lua51.vcxproj">
diff --git a/build/3rd-party/Luax/Luax.vcxproj.filters b/build/3rd-party/Luax/Luax.vcxproj.filters
index d1eb369..7327933 100644
--- a/build/3rd-party/Luax/Luax.vcxproj.filters
+++ b/build/3rd-party/Luax/Luax.vcxproj.filters
@@ -13,7 +13,7 @@
     <ClInclude Include="..\..\..\Source\3rd-party\Luax\luax_vm.h" />
     <ClInclude Include="..\..\..\source\3rd-party\Luax\luax_internal.h" />
     <ClInclude Include="..\..\..\source\3rd-party\Luax\luax_globalstate.h" />
-    <ClInclude Include="..\..\..\source\3rd-party\Luax\luax_dog.h" />
+    <ClInclude Include="..\..\..\source\3rd-party\Luax\luax_watchdog.h" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\..\Source\3rd-party\Luax\luax_ref.cpp" />
@@ -24,7 +24,7 @@
     <ClCompile Include="..\..\..\Source\3rd-party\Luax\luax_memberref.cpp" />
     <ClCompile Include="..\..\..\Source\3rd-party\Luax\luax_class.cpp" />
     <ClCompile Include="..\..\..\Source\3rd-party\Luax\luax_vm.cpp" />
-    <ClCompile Include="..\..\..\source\3rd-party\Luax\luax_dog.cpp" />
+    <ClCompile Include="..\..\..\source\3rd-party\Luax\luax_watchdog.cpp" />
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\..\Source\3rd-party\Luax\luax_state.inl" />
diff --git a/build/Asura.Editor/Asura.Editor.vcxproj b/build/Asura.Editor/Asura.Editor.vcxproj
index 82a4133..9721b76 100644
--- a/build/Asura.Editor/Asura.Editor.vcxproj
+++ b/build/Asura.Editor/Asura.Editor.vcxproj
@@ -129,14 +129,15 @@
     <ClCompile Include="..\..\source\Asura.Editor\controls\radio_button.cpp" />
     <ClCompile Include="..\..\source\Asura.Editor\controls\textbox.cpp" />
     <ClCompile Include="..\..\source\Asura.Editor\controls\vslider.cpp" />
-    <ClCompile Include="..\..\source\Asura.Editor\dui_module.cpp" />
     <ClCompile Include="..\..\source\Asura.Editor\editor.cpp" />
     <ClCompile Include="..\..\source\Asura.Editor\layout\horizontal_layout.cpp" />
     <ClCompile Include="..\..\source\Asura.Editor\layout\vertical_layout.cpp" />
     <ClCompile Include="..\..\source\Asura.Editor\main.cpp" />
     <ClCompile Include="..\..\source\Asura.Editor\system\file_watcher.cpp" />
+    <ClCompile Include="..\..\source\Asura.Editor\system\window.cpp" />
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="..\..\source\Asura.Editor\config.h" />
     <ClInclude Include="..\..\source\Asura.Editor\controls\button.h" />
     <ClInclude Include="..\..\source\Asura.Editor\controls\checkbox.h" />
     <ClInclude Include="..\..\source\Asura.Editor\controls\hslider.h" />
@@ -152,11 +153,12 @@
     <ClInclude Include="..\..\source\Asura.Editor\core\shaders.h" />
     <ClInclude Include="..\..\source\Asura.Editor\core\slot.h" />
     <ClInclude Include="..\..\source\Asura.Editor\core\signal.h" />
-    <ClInclude Include="..\..\source\Asura.Editor\dui_module.h" />
     <ClInclude Include="..\..\source\Asura.Editor\editor.h" />
     <ClInclude Include="..\..\source\Asura.Editor\layout\horizontal_layout.h" />
     <ClInclude Include="..\..\source\Asura.Editor\layout\vertical_layout.h" />
     <ClInclude Include="..\..\source\Asura.Editor\system\file_watcher.h" />
+    <ClInclude Include="..\..\source\Asura.Editor\system\window.h" />
+    <ClInclude Include="..\..\source\Asura.Editor\type.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/build/Asura.Editor/Asura.Editor.vcxproj.filters b/build/Asura.Editor/Asura.Editor.vcxproj.filters
index 8bb459d..457aa19 100644
--- a/build/Asura.Editor/Asura.Editor.vcxproj.filters
+++ b/build/Asura.Editor/Asura.Editor.vcxproj.filters
@@ -26,7 +26,6 @@
     </ClCompile>
     <ClCompile Include="..\..\source\Asura.Editor\editor.cpp" />
     <ClCompile Include="..\..\source\Asura.Editor\main.cpp" />
-    <ClCompile Include="..\..\source\Asura.Editor\dui_module.cpp" />
     <ClCompile Include="..\..\source\Asura.Editor\system\file_watcher.cpp">
       <Filter>system</Filter>
     </ClCompile>
@@ -66,6 +65,9 @@
     <ClCompile Include="..\..\source\Asura.Editor\controls\menu_item.cpp">
       <Filter>controls</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\source\Asura.Editor\system\window.cpp">
+      <Filter>system</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\source\Asura.Editor\layout\horizontal_layout.h">
@@ -75,7 +77,6 @@
       <Filter>layout</Filter>
     </ClInclude>
     <ClInclude Include="..\..\source\Asura.Editor\editor.h" />
-    <ClInclude Include="..\..\source\Asura.Editor\dui_module.h" />
     <ClInclude Include="..\..\source\Asura.Editor\core\signal.h">
       <Filter>core</Filter>
     </ClInclude>
@@ -124,5 +125,10 @@
     <ClInclude Include="..\..\source\Asura.Editor\core\shaders.h">
       <Filter>core</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\source\Asura.Editor\system\window.h">
+      <Filter>system</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\source\Asura.Editor\config.h" />
+    <ClInclude Include="..\..\source\Asura.Editor\type.h" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/build/modules/asura-core/asura-core.vcxproj b/build/modules/asura-core/asura-core.vcxproj
index 34169b8..81492cc 100644
--- a/build/modules/asura-core/asura-core.vcxproj
+++ b/build/modules/asura-core/asura-core.vcxproj
@@ -150,6 +150,7 @@
     <ClCompile Include="..\..\..\source\modules\asura-core\graphics\shape.cpp" />
     <ClCompile Include="..\..\..\source\modules\asura-core\graphics\sprite_batch.cpp" />
     <ClCompile Include="..\..\..\source\modules\asura-core\graphics\texture.cpp" />
+    <ClCompile Include="..\..\..\source\modules\asura-core\graphics\gpu_buffer.cpp" />
     <ClCompile Include="..\..\..\source\modules\asura-core\image\binding\_image_data.cpp" />
     <ClCompile Include="..\..\..\source\modules\asura-core\image\binding\_image_decode_task.cpp" />
     <ClCompile Include="..\..\..\source\modules\asura-core\image\image_data.cpp" />
@@ -195,10 +196,10 @@
     <ClInclude Include="..\..\..\source\modules\asura-core\graphics\render_state.h" />
     <ClInclude Include="..\..\..\source\modules\asura-core\graphics\render_target.h" />
     <ClInclude Include="..\..\..\source\modules\asura-core\graphics\shader.h" />
-    <ClInclude Include="..\..\..\source\modules\asura-core\graphics\shader_source.h" />
     <ClInclude Include="..\..\..\source\modules\asura-core\graphics\shape.h" />
     <ClInclude Include="..\..\..\source\modules\asura-core\graphics\sprite_batch.h" />
     <ClInclude Include="..\..\..\source\modules\asura-core\graphics\texture.h" />
+    <ClInclude Include="..\..\..\source\modules\asura-core\graphics\gpu_buffer.h" />
     <ClInclude Include="..\..\..\source\modules\asura-core\image\image_data.h" />
     <ClInclude Include="..\..\..\source\modules\asura-core\image\image_decoder.h" />
     <ClInclude Include="..\..\..\source\modules\asura-core\image\image_decode_task.h" />
diff --git a/build/modules/asura-core/asura-core.vcxproj.filters b/build/modules/asura-core/asura-core.vcxproj.filters
index 3f126e8..86d2113 100644
--- a/build/modules/asura-core/asura-core.vcxproj.filters
+++ b/build/modules/asura-core/asura-core.vcxproj.filters
@@ -188,6 +188,9 @@
     <ClCompile Include="..\..\..\source\modules\asura-core\graphics\binding\_gl.cpp">
       <Filter>graphics\binding</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\source\modules\asura-core\graphics\gpu_buffer.cpp">
+      <Filter>graphics</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\..\source\modules\asura-core\application.h" />
@@ -302,9 +305,6 @@
     <ClInclude Include="..\..\..\source\modules\asura-core\input\event_manager.h">
       <Filter>input</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\source\modules\asura-core\graphics\shader_source.h">
-      <Filter>graphics</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\source\modules\asura-core\image\image_decoder.h">
       <Filter>image</Filter>
     </ClInclude>
@@ -338,6 +338,9 @@
     <ClInclude Include="..\..\..\source\modules\asura-core\graphics\matrix_stack.h">
       <Filter>graphics</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\source\modules\asura-core\graphics\gpu_buffer.h">
+      <Filter>graphics</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\..\source\modules\asura-core\font\string.inl">
diff --git a/build/modules/asura-utils/asura-utils.vcxproj b/build/modules/asura-utils/asura-utils.vcxproj
index 442e223..04dd95d 100644
--- a/build/modules/asura-utils/asura-utils.vcxproj
+++ b/build/modules/asura-utils/asura-utils.vcxproj
@@ -122,6 +122,7 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClCompile Include="..\..\..\source\libs\asura-lib-utils\profiler\memory_leak.cpp" />
     <ClCompile Include="..\..\..\source\modules\asura-utils\exceptions\exception.cpp" />
     <ClCompile Include="..\..\..\source\modules\asura-utils\io\binding\_compressor.cpp" />
     <ClCompile Include="..\..\..\source\modules\asura-utils\io\binding\_data_buffer.cpp" />
@@ -158,6 +159,7 @@
     <ClCompile Include="..\..\..\source\modules\asura-utils\utils_module.cpp" />
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="..\..\..\source\libs\asura-lib-utils\profiler\memory_leak.h" />
     <ClInclude Include="..\..\..\source\modules\asura-utils\exceptions\exception.h" />
     <ClInclude Include="..\..\..\source\modules\asura-utils\io\compressor.h" />
     <ClInclude Include="..\..\..\source\modules\asura-utils\io\data_buffer.h" />
diff --git a/build/modules/asura-utils/asura-utils.vcxproj.filters b/build/modules/asura-utils/asura-utils.vcxproj.filters
index 3c6d092..fff909d 100644
--- a/build/modules/asura-utils/asura-utils.vcxproj.filters
+++ b/build/modules/asura-utils/asura-utils.vcxproj.filters
@@ -22,6 +22,9 @@
     <Filter Include="threading\binding">
       <UniqueIdentifier>{e63982e2-a2ca-4aa2-be11-f98659586c1f}</UniqueIdentifier>
     </Filter>
+    <Filter Include="profiler">
+      <UniqueIdentifier>{be44a97c-e5d0-4262-8b13-a86f7df23590}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\..\source\modules\asura-utils\exceptions\exception.cpp">
@@ -122,6 +125,9 @@
     <ClCompile Include="..\..\..\source\modules\asura-utils\threading\conditional.cpp">
       <Filter>threading</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\source\libs\asura-lib-utils\profiler\memory_leak.cpp">
+      <Filter>profiler</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\..\source\modules\asura-utils\exceptions\exception.h">
@@ -226,6 +232,9 @@
       <Filter>threading</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\source\modules\asura-utils\io\renewable.h" />
+    <ClInclude Include="..\..\..\source\libs\asura-lib-utils\profiler\memory_leak.h">
+      <Filter>profiler</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\..\source\modules\asura-utils\math\rect.inl">
diff --git a/build/tools/bindingGen/obj/Release/bindingGen.csproj.CoreCompileInputs.cache b/build/tools/bindingGen/obj/Release/bindingGen.csproj.CoreCompileInputs.cache
index 1808cd2..93b7e43 100644
--- a/build/tools/bindingGen/obj/Release/bindingGen.csproj.CoreCompileInputs.cache
+++ b/build/tools/bindingGen/obj/Release/bindingGen.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-164e0e4adeed5117be7ac06ca088f3bfb8ccc730
+76869cb9eeaafde93fc35e764d87dc7f1f272b2f
diff --git a/build/tools/bindingGen/obj/Release/bindingGen.csproj.FileListAbsolute.txt b/build/tools/bindingGen/obj/Release/bindingGen.csproj.FileListAbsolute.txt
index a9c80ba..eb453d0 100644
--- a/build/tools/bindingGen/obj/Release/bindingGen.csproj.FileListAbsolute.txt
+++ b/build/tools/bindingGen/obj/Release/bindingGen.csproj.FileListAbsolute.txt
@@ -1,6 +1,3 @@
 D:\Asura\build\tools\bindingGen\bin\Release\bindingGen.exe.config
 D:\Asura\build\tools\bindingGen\bin\Release\bindingGen.exe
 D:\Asura\build\tools\bindingGen\bin\Release\bindingGen.pdb
-D:\Asura\build\tools\bindingGen\obj\Release\bindingGen.csproj.CoreCompileInputs.cache
-D:\Asura\build\tools\bindingGen\obj\Release\bindingGen.exe
-D:\Asura\build\tools\bindingGen\obj\Release\bindingGen.pdb
diff --git a/build/tools/bindingGen/obj/Release/bindingGen.csprojAssemblyReference.cache b/build/tools/bindingGen/obj/Release/bindingGen.csprojAssemblyReference.cache
new file mode 100644
index 0000000..d31b6fe
Binary files /dev/null and b/build/tools/bindingGen/obj/Release/bindingGen.csprojAssemblyReference.cache differ
-- 
cgit v1.1-26-g67d0