From a077eb38b01292611f4f6031b75e3e2c1c20f06e Mon Sep 17 00:00:00 2001 From: chai Date: Fri, 16 Aug 2019 08:54:08 +0800 Subject: *misc --- Build/.vs/Asura/v15/Server/sqlite3/storage.ide-shm | Bin 32768 -> 32768 bytes Build/.vs/Asura/v15/Server/sqlite3/storage.ide-wal | Bin 539752 -> 552112 bytes Build/Asura.Editor/Asura.Editor.vcxproj | 21 ++-- Build/Asura.Editor/Asura.Editor.vcxproj.filters | 69 ++++++----- Build/Asura.sln | 13 +++ Build/external/Json/Json.vcxproj | 122 ++++++++++++++++++++ Build/external/Json/Json.vcxproj.filters | 2 + Build/external/Json/Json.vcxproj.user | 4 + Build/modules/asura-base/asura-base.vcxproj | 6 +- .../modules/asura-base/asura-base.vcxproj.filters | 21 +++- Build/modules/asura-box2d/asura-box2d.vcxproj | 48 ++++---- .../asura-box2d/asura-box2d.vcxproj.filters | 104 ++++++++--------- Build/modules/asura-core/asura-core.vcxproj | 44 ++++--- .../modules/asura-core/asura-core.vcxproj.filters | 128 ++++++++++----------- Build/modules/asura-json/asura-json.vcxproj | 4 +- .../modules/asura-json/asura-json.vcxproj.filters | 8 +- .../bindingGen.csproj.CoreCompileInputs.cache | 2 +- 17 files changed, 376 insertions(+), 220 deletions(-) create mode 100644 Build/external/Json/Json.vcxproj create mode 100644 Build/external/Json/Json.vcxproj.filters create mode 100644 Build/external/Json/Json.vcxproj.user (limited to 'Build') diff --git a/Build/.vs/Asura/v15/Server/sqlite3/storage.ide-shm b/Build/.vs/Asura/v15/Server/sqlite3/storage.ide-shm index baa828a..4522c57 100644 Binary files a/Build/.vs/Asura/v15/Server/sqlite3/storage.ide-shm and b/Build/.vs/Asura/v15/Server/sqlite3/storage.ide-shm differ diff --git a/Build/.vs/Asura/v15/Server/sqlite3/storage.ide-wal b/Build/.vs/Asura/v15/Server/sqlite3/storage.ide-wal index a2c8fca..2561822 100644 Binary files a/Build/.vs/Asura/v15/Server/sqlite3/storage.ide-wal and b/Build/.vs/Asura/v15/Server/sqlite3/storage.ide-wal differ diff --git a/Build/Asura.Editor/Asura.Editor.vcxproj b/Build/Asura.Editor/Asura.Editor.vcxproj index d214c2e..542fcf2 100644 --- a/Build/Asura.Editor/Asura.Editor.vcxproj +++ b/Build/Asura.Editor/Asura.Editor.vcxproj @@ -129,7 +129,7 @@ - + @@ -137,13 +137,14 @@ - - + + + @@ -153,7 +154,7 @@ - + @@ -162,15 +163,17 @@ - - - - - + + + + + + + diff --git a/Build/Asura.Editor/Asura.Editor.vcxproj.filters b/Build/Asura.Editor/Asura.Editor.vcxproj.filters index bc89328..27c5a7e 100644 --- a/Build/Asura.Editor/Asura.Editor.vcxproj.filters +++ b/Build/Asura.Editor/Asura.Editor.vcxproj.filters @@ -10,9 +10,6 @@ {4be8ce5c-0921-4341-a976-92d31aa84c8c} - - {b4c26f9c-9f4e-4332-a6e2-33456b4abecb} - {7654ef3d-54c4-490f-bb24-e6a67bd63e1e} @@ -25,6 +22,9 @@ {799e7ea2-8870-4d1e-b278-b3a0dd912632} + + {b4c26f9c-9f4e-4332-a6e2-33456b4abecb} + @@ -36,9 +36,6 @@ Controls - - Controls - Controls @@ -51,12 +48,6 @@ Graphics - - Graphics - - - Graphics - Layout @@ -86,14 +77,20 @@ Controls + + System + + + Controls + + + Graphics + + + Graphics + - - Graphics\shaders - - - Graphics\shaders - Controls @@ -103,9 +100,6 @@ Controls - - Controls - Controls @@ -118,15 +112,6 @@ Graphics - - Graphics - - - Graphics - - - Graphics - Layout @@ -162,5 +147,29 @@ Controls + + System + + + Controls + + + Graphics + + + Graphics + + + Graphics\Shaders + + + Graphics\Shaders + + + Graphics\Shaders + + + Graphics + \ No newline at end of file diff --git a/Build/Asura.sln b/Build/Asura.sln index 5332a4a..938b621 100644 --- a/Build/Asura.sln +++ b/Build/Asura.sln @@ -119,6 +119,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RunnerConfigure", "configur EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "asura-base", "modules\asura-base\asura-base.vcxproj", "{7D41093F-E356-4C5B-A25F-41779BF86E54}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Json", "external\Json\Json.vcxproj", "{01B74F57-CC11-466C-B8F8-3AE4DB2EB44C}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -651,6 +653,16 @@ Global {7D41093F-E356-4C5B-A25F-41779BF86E54}.Release|x64.Build.0 = Release|x64 {7D41093F-E356-4C5B-A25F-41779BF86E54}.Release|x86.ActiveCfg = Release|Win32 {7D41093F-E356-4C5B-A25F-41779BF86E54}.Release|x86.Build.0 = Release|Win32 + {01B74F57-CC11-466C-B8F8-3AE4DB2EB44C}.Debug|Any CPU.ActiveCfg = Debug|Win32 + {01B74F57-CC11-466C-B8F8-3AE4DB2EB44C}.Debug|x64.ActiveCfg = Debug|x64 + {01B74F57-CC11-466C-B8F8-3AE4DB2EB44C}.Debug|x64.Build.0 = Debug|x64 + {01B74F57-CC11-466C-B8F8-3AE4DB2EB44C}.Debug|x86.ActiveCfg = Debug|Win32 + {01B74F57-CC11-466C-B8F8-3AE4DB2EB44C}.Debug|x86.Build.0 = Debug|Win32 + {01B74F57-CC11-466C-B8F8-3AE4DB2EB44C}.Release|Any CPU.ActiveCfg = Release|Win32 + {01B74F57-CC11-466C-B8F8-3AE4DB2EB44C}.Release|x64.ActiveCfg = Release|x64 + {01B74F57-CC11-466C-B8F8-3AE4DB2EB44C}.Release|x64.Build.0 = Release|x64 + {01B74F57-CC11-466C-B8F8-3AE4DB2EB44C}.Release|x86.ActiveCfg = Release|Win32 + {01B74F57-CC11-466C-B8F8-3AE4DB2EB44C}.Release|x86.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -703,6 +715,7 @@ Global {93CFEFAB-3922-4D81-91FD-8A80E9785FC6} = {1C5D0C23-C0A9-4200-BD67-B5B8F6DDE41C} {9DD2D23B-BE70-4453-88C7-D904E024CB68} = {1C5D0C23-C0A9-4200-BD67-B5B8F6DDE41C} {7D41093F-E356-4C5B-A25F-41779BF86E54} = {CD115016-E377-4AC1-8595-DB2836CEFE7E} + {01B74F57-CC11-466C-B8F8-3AE4DB2EB44C} = {64D4E4B2-4A60-46F4-A500-370EFED4524F} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {331032D8-F7CC-43E3-A03B-67108767F96B} diff --git a/Build/external/Json/Json.vcxproj b/Build/external/Json/Json.vcxproj new file mode 100644 index 0000000..dcb86ec --- /dev/null +++ b/Build/external/Json/Json.vcxproj @@ -0,0 +1,122 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + Debug + x64 + + + Release + x64 + + + + 15.0 + {01B74F57-CC11-466C-B8F8-3AE4DB2EB44C} + Json + 10.0.17134.0 + + + + Application + true + v141 + MultiByte + + + Application + false + v141 + true + MultiByte + + + Application + true + v141 + MultiByte + + + Application + false + v141 + true + MultiByte + + + + + + + + + + + + + + + + + + + + + + + Level3 + Disabled + true + true + + + + + Level3 + Disabled + true + true + + + + + Level3 + MaxSpeed + true + true + true + true + + + true + true + + + + + Level3 + MaxSpeed + true + true + true + true + + + true + true + + + + + + + + \ No newline at end of file diff --git a/Build/external/Json/Json.vcxproj.filters b/Build/external/Json/Json.vcxproj.filters new file mode 100644 index 0000000..9cd8510 --- /dev/null +++ b/Build/external/Json/Json.vcxproj.filters @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/Build/external/Json/Json.vcxproj.user b/Build/external/Json/Json.vcxproj.user new file mode 100644 index 0000000..be25078 --- /dev/null +++ b/Build/external/Json/Json.vcxproj.user @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/Build/modules/asura-base/asura-base.vcxproj b/Build/modules/asura-base/asura-base.vcxproj index 89ba183..e8ecc4a 100644 --- a/Build/modules/asura-base/asura-base.vcxproj +++ b/Build/modules/asura-base/asura-base.vcxproj @@ -142,6 +142,8 @@ + + @@ -155,7 +157,6 @@ - @@ -185,6 +186,8 @@ + + @@ -200,6 +203,7 @@ + diff --git a/Build/modules/asura-base/asura-base.vcxproj.filters b/Build/modules/asura-base/asura-base.vcxproj.filters index 5f639bc..2aa1840 100644 --- a/Build/modules/asura-base/asura-base.vcxproj.filters +++ b/Build/modules/asura-base/asura-base.vcxproj.filters @@ -22,6 +22,9 @@ {b4b078e1-bb8d-4cb3-84b9-963e851be123} + + {9bfbea59-2b66-4aad-add2-ac9c737a1dc1} + @@ -82,9 +85,6 @@ Utilities - - Utilities - Utilities @@ -128,6 +128,12 @@ FileSystem\Binding + + Misc + + + Misc + @@ -249,6 +255,15 @@ Math + + Misc + + + Utilities + + + Misc + diff --git a/Build/modules/asura-box2d/asura-box2d.vcxproj b/Build/modules/asura-box2d/asura-box2d.vcxproj index b41df12..2a3c00b 100644 --- a/Build/modules/asura-box2d/asura-box2d.vcxproj +++ b/Build/modules/asura-box2d/asura-box2d.vcxproj @@ -118,33 +118,33 @@ - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - - + + diff --git a/Build/modules/asura-box2d/asura-box2d.vcxproj.filters b/Build/modules/asura-box2d/asura-box2d.vcxproj.filters index 5415a04..b169c1a 100644 --- a/Build/modules/asura-box2d/asura-box2d.vcxproj.filters +++ b/Build/modules/asura-box2d/asura-box2d.vcxproj.filters @@ -2,88 +2,88 @@ - - Physics + + Physics2D - - Physics + + Physics2D - - Physics + + Physics2D - - Physics + + Physics2D - - Physics + + Physics2D - - Physics + + Physics2D - - Physics + + Physics2D - - Physics + + Physics2D - - Physics + + Physics2D - - Physics + + Physics2D - - Physics + + Physics2D - - Physics + + Physics2D - - Physics + + Physics2D - - Physics + + Physics2D - - Physics + + Physics2D - - Physics + + Physics2D - - Physics + + Physics2D - - Physics + + Physics2D - - Physics + + Physics2D - - Physics + + Physics2D - - Physics + + Physics2D - - Physics + + Physics2D - + {c01b5c57-f3a7-445f-aed3-e0a27dbe74c2} - - {3fb6587c-0c9d-4f6e-9e72-653032d9b238} + + {76f8cfef-3ffe-47a2-9e7c-b90f1d252bce} - - Physics\binding + + + Physics2D\Binding - - Physics\binding + + Physics2D\Binding - \ 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 f548922..5b2dd32 100644 --- a/Build/modules/asura-core/asura-core.vcxproj +++ b/Build/modules/asura-core/asura-core.vcxproj @@ -128,19 +128,19 @@ - - - - - - - - - - - - - + + + + + + + + + + + + + @@ -149,18 +149,17 @@ - - + - + - + @@ -194,8 +193,7 @@ - - + @@ -206,19 +204,18 @@ - - + - + - + @@ -264,7 +261,6 @@ - diff --git a/Build/modules/asura-core/asura-core.vcxproj.filters b/Build/modules/asura-core/asura-core.vcxproj.filters index cf39389..5ffc385 100644 --- a/Build/modules/asura-core/asura-core.vcxproj.filters +++ b/Build/modules/asura-core/asura-core.vcxproj.filters @@ -42,27 +42,6 @@ - - Graphics\Binding - - - Graphics\Binding - - - Graphics\Binding - - - Graphics\Binding - - - Graphics\Binding - - - Graphics\Binding - - - Graphics\Binding - Window\binding @@ -72,27 +51,12 @@ Image\binding - - Graphics\Binding - - - Graphics\Binding - - - Graphics\Binding - - - Graphics\Binding - Font Font - - Font - Graphics @@ -108,24 +72,15 @@ Graphics - - Graphics - Graphics Graphics - - Graphics - Graphics - - Graphics - Graphics @@ -215,18 +170,60 @@ Graphics - - Graphics - Input Input - + + Graphics + + + Font + + + Graphics + + + Graphics\Binding + + + Graphics\Binding + + Graphics\Binding + + Graphics\Binding + + + Graphics\Binding + + + Graphics\Binding + + + Graphics\Binding + + + Graphics\Binding + + + Graphics\Binding + + + Graphics\Binding + + + Graphics\Binding + + + Graphics\Binding + + + Graphics + @@ -235,9 +232,6 @@ Font - - Font - Graphics @@ -259,27 +253,18 @@ Graphics - - Graphics - Graphics Graphics - - Graphics - Graphics Graphics - - Graphics - Graphics @@ -373,9 +358,6 @@ Threads - - Font - Graphics @@ -388,22 +370,28 @@ Graphics - - Graphics - Input Input + + Graphics + + + Font + + + Graphics + + + Graphics + Font - - Font - \ No newline at end of file diff --git a/Build/modules/asura-json/asura-json.vcxproj b/Build/modules/asura-json/asura-json.vcxproj index 64af220..bde2695 100644 --- a/Build/modules/asura-json/asura-json.vcxproj +++ b/Build/modules/asura-json/asura-json.vcxproj @@ -20,11 +20,11 @@ - + - + 15.0 diff --git a/Build/modules/asura-json/asura-json.vcxproj.filters b/Build/modules/asura-json/asura-json.vcxproj.filters index 7f255cb..86218ef 100644 --- a/Build/modules/asura-json/asura-json.vcxproj.filters +++ b/Build/modules/asura-json/asura-json.vcxproj.filters @@ -6,15 +6,15 @@ - + + Json - - + + Json - \ No newline at end of file diff --git a/Build/tools/bindingGen/obj/Debug/bindingGen.csproj.CoreCompileInputs.cache b/Build/tools/bindingGen/obj/Debug/bindingGen.csproj.CoreCompileInputs.cache index 93b7e43..c1e0407 100644 --- a/Build/tools/bindingGen/obj/Debug/bindingGen.csproj.CoreCompileInputs.cache +++ b/Build/tools/bindingGen/obj/Debug/bindingGen.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -76869cb9eeaafde93fc35e764d87dc7f1f272b2f +534362588ad2d4462c430a54eb5dee7ab94c0164 -- cgit v1.1-26-g67d0