From 70b82d1981c0de3c7b77670ff8abcfeb26815142 Mon Sep 17 00:00:00 2001 From: chai Date: Tue, 12 Mar 2019 00:39:26 +0800 Subject: *misc --- Build/3rdParty/Luax/Luax.vcxproj | 23 +++- Build/3rdParty/Luax/Luax.vcxproj.filters | 5 + Build/3rdParty/Luax/Luax.vcxproj.user | 4 +- Build/3rdParty/lua51/lua51.vcxproj | 13 ++- Build/Asura.Engine/Asura.Engine.vcxproj | 39 +++++-- Build/Asura.Engine/Asura.Engine.vcxproj.filters | 134 ++++++++++++++++------- Build/Asura.Runner/Asura.Runner.vcxproj | 6 +- Build/Asura.Runner/Asura.Runner.vcxproj.filters | 2 +- Build/Asura.sln | 11 ++ Build/Samples/LuaxTest/LuaxTest.vcxproj | 140 ++++++++++++++++++++++++ Build/Samples/LuaxTest/LuaxTest.vcxproj.filters | 9 ++ Build/Samples/LuaxTest/LuaxTest.vcxproj.user | 4 + 12 files changed, 329 insertions(+), 61 deletions(-) create mode 100644 Build/Samples/LuaxTest/LuaxTest.vcxproj create mode 100644 Build/Samples/LuaxTest/LuaxTest.vcxproj.filters create mode 100644 Build/Samples/LuaxTest/LuaxTest.vcxproj.user (limited to 'Build') diff --git a/Build/3rdParty/Luax/Luax.vcxproj b/Build/3rdParty/Luax/Luax.vcxproj index 9a875b2..92e4686 100644 --- a/Build/3rdParty/Luax/Luax.vcxproj +++ b/Build/3rdParty/Luax/Luax.vcxproj @@ -39,13 +39,13 @@ MultiByte - Application + StaticLibrary true v141 MultiByte - Application + StaticLibrary false v141 true @@ -69,7 +69,12 @@ - + + $(SolutionDir)..\Bin\win64 + + + $(SolutionDir)..\Bin\win64 + Level3 @@ -84,6 +89,7 @@ Disabled true true + $(SolutionDir)..\Source\3rdParty;%(AdditionalIncludeDirectories) @@ -108,6 +114,7 @@ true true true + $(SolutionDir)..\Source\3rdParty;%(AdditionalIncludeDirectories) true @@ -118,6 +125,7 @@ + @@ -135,6 +143,15 @@ + + + {8b8fca14-fc8a-45b4-bf3c-9340cb586076} + + + + + + diff --git a/Build/3rdParty/Luax/Luax.vcxproj.filters b/Build/3rdParty/Luax/Luax.vcxproj.filters index 13acadc..54bfbc2 100644 --- a/Build/3rdParty/Luax/Luax.vcxproj.filters +++ b/Build/3rdParty/Luax/Luax.vcxproj.filters @@ -10,6 +10,7 @@ + @@ -21,4 +22,8 @@ + + + + \ No newline at end of file diff --git a/Build/3rdParty/Luax/Luax.vcxproj.user b/Build/3rdParty/Luax/Luax.vcxproj.user index be25078..0b0f24d 100644 --- a/Build/3rdParty/Luax/Luax.vcxproj.user +++ b/Build/3rdParty/Luax/Luax.vcxproj.user @@ -1,4 +1,6 @@  - + + true + \ No newline at end of file diff --git a/Build/3rdParty/lua51/lua51.vcxproj b/Build/3rdParty/lua51/lua51.vcxproj index 460b971..db1825c 100644 --- a/Build/3rdParty/lua51/lua51.vcxproj +++ b/Build/3rdParty/lua51/lua51.vcxproj @@ -39,13 +39,13 @@ MultiByte - Application + StaticLibrary true v141 MultiByte - Application + StaticLibrary false v141 true @@ -69,7 +69,12 @@ - + + $(SolutionDir)..\Bin\win64 + + + $(SolutionDir)..\Bin\win64 + Level3 @@ -84,6 +89,7 @@ Disabled true true + _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) @@ -108,6 +114,7 @@ true true true + _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true diff --git a/Build/Asura.Engine/Asura.Engine.vcxproj b/Build/Asura.Engine/Asura.Engine.vcxproj index 49f20fd..bb736dc 100644 --- a/Build/Asura.Engine/Asura.Engine.vcxproj +++ b/Build/Asura.Engine/Asura.Engine.vcxproj @@ -135,12 +135,10 @@ - - @@ -151,26 +149,36 @@ + + + + + + + - + + - + + + + - @@ -180,14 +188,12 @@ - - @@ -204,19 +210,23 @@ + + + + + + - - @@ -225,9 +235,12 @@ + + + + - @@ -237,6 +250,12 @@ {208b9cb8-2101-42a9-9502-0cf54912bc57} + + + + + + diff --git a/Build/Asura.Engine/Asura.Engine.vcxproj.filters b/Build/Asura.Engine/Asura.Engine.vcxproj.filters index 79bf9a3..f1c72a7 100644 --- a/Build/Asura.Engine/Asura.Engine.vcxproj.filters +++ b/Build/Asura.Engine/Asura.Engine.vcxproj.filters @@ -13,12 +13,6 @@ {75252759-f76f-44dc-85d4-28028a7d60eb} - - {16e89584-708f-4a2f-9dc4-8e01ba938e88} - - - {426b5d06-f2e9-4879-b0a0-0cde9130d0bc} - {d65172dc-f855-4dd0-9d70-f90034a01144} @@ -34,12 +28,15 @@ {f94a816c-f744-4d8b-aa3b-0d1c32e388ba} - - {e1003406-ebaa-4987-9a0f-18f9e14a96b3} - {2054bf79-a609-44fc-aa13-cef6e16a117f} + + {426b5d06-f2e9-4879-b0a0-0cde9130d0bc} + + + {16e89584-708f-4a2f-9dc4-8e01ba938e88} + @@ -48,9 +45,6 @@ Exceptions - - Font - Graphics @@ -73,8 +67,6 @@ Time - - Graphics @@ -106,17 +98,10 @@ Graphics - Graphics - - Window - - - Font - Graphics @@ -175,6 +160,41 @@ FileSystem + + + Graphics + + + Input + + + Input + + + Input + + + + Input + + + Text + + + Text + + + Text + + + Text + + + Graphics + + + Scripting + @@ -183,9 +203,6 @@ Exceptions - - Font - Graphics @@ -204,7 +221,6 @@ Time - Graphics @@ -233,24 +249,9 @@ Graphics - - Window - - - Font - Graphics - - Graphics\Port - - - Graphics\Port - - - Graphics\Port - Graphics\Port @@ -306,5 +307,58 @@ Graphics + + Scripting + + + Graphics\Port + + + Graphics\Port + + + Graphics\Port + + + Graphics + + + Graphics\Port + + + Input + + + Input + + + Input + + + Text + + + Text + + + Text + + + Graphics + + + + + Input + + + Input + + + Text + + + Text + \ No newline at end of file diff --git a/Build/Asura.Runner/Asura.Runner.vcxproj b/Build/Asura.Runner/Asura.Runner.vcxproj index e58ca6b..9dadfe8 100644 --- a/Build/Asura.Runner/Asura.Runner.vcxproj +++ b/Build/Asura.Runner/Asura.Runner.vcxproj @@ -86,7 +86,7 @@ Level3 Disabled true - $(SolutionDir)..\Source\3rdParty;%(AdditionalIncludeDirectories) + $(SolutionDir)..\Source\3rdParty;$(SolutionDir)..\Source\Asura.Engine;%(AdditionalIncludeDirectories) @@ -109,7 +109,7 @@ true true true - $(SolutionDir)..\Source\3rdParty;%(AdditionalIncludeDirectories) + $(SolutionDir)..\Source\3rdParty;$(SolutionDir)..\Source\Asura.Engine;%(AdditionalIncludeDirectories) true @@ -117,7 +117,7 @@ - + diff --git a/Build/Asura.Runner/Asura.Runner.vcxproj.filters b/Build/Asura.Runner/Asura.Runner.vcxproj.filters index e9b240a..7bd5566 100644 --- a/Build/Asura.Runner/Asura.Runner.vcxproj.filters +++ b/Build/Asura.Runner/Asura.Runner.vcxproj.filters @@ -1,7 +1,7 @@  - + diff --git a/Build/Asura.sln b/Build/Asura.sln index 7b3830e..0b0c07e 100644 --- a/Build/Asura.sln +++ b/Build/Asura.sln @@ -59,6 +59,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Wuff", "3rdParty\Wuff\Wuff. EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "physfs", "3rdParty\physfs\physfs.vcxproj", "{AEE37589-DE0D-4139-8BDB-8179FDEFB835}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LuaxTest", "Samples\LuaxTest\LuaxTest.vcxproj", "{87A4F855-66F2-4DBF-B86C-416E88DAC88A}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|x64 = Debug|x64 @@ -275,6 +277,14 @@ Global {AEE37589-DE0D-4139-8BDB-8179FDEFB835}.Release|x64.Build.0 = Release|x64 {AEE37589-DE0D-4139-8BDB-8179FDEFB835}.Release|x86.ActiveCfg = Release|Win32 {AEE37589-DE0D-4139-8BDB-8179FDEFB835}.Release|x86.Build.0 = Release|Win32 + {87A4F855-66F2-4DBF-B86C-416E88DAC88A}.Debug|x64.ActiveCfg = Debug|x64 + {87A4F855-66F2-4DBF-B86C-416E88DAC88A}.Debug|x64.Build.0 = Debug|x64 + {87A4F855-66F2-4DBF-B86C-416E88DAC88A}.Debug|x86.ActiveCfg = Debug|Win32 + {87A4F855-66F2-4DBF-B86C-416E88DAC88A}.Debug|x86.Build.0 = Debug|Win32 + {87A4F855-66F2-4DBF-B86C-416E88DAC88A}.Release|x64.ActiveCfg = Release|x64 + {87A4F855-66F2-4DBF-B86C-416E88DAC88A}.Release|x64.Build.0 = Release|x64 + {87A4F855-66F2-4DBF-B86C-416E88DAC88A}.Release|x86.ActiveCfg = Release|Win32 + {87A4F855-66F2-4DBF-B86C-416E88DAC88A}.Release|x86.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -298,6 +308,7 @@ Global {6BA52BBB-8DA5-4F51-BE3F-1E49F5089498} = {64D4E4B2-4A60-46F4-A500-370EFED4524F} {294889EA-93DE-4580-BF9D-87F605B229AA} = {64D4E4B2-4A60-46F4-A500-370EFED4524F} {AEE37589-DE0D-4139-8BDB-8179FDEFB835} = {64D4E4B2-4A60-46F4-A500-370EFED4524F} + {87A4F855-66F2-4DBF-B86C-416E88DAC88A} = {E068D138-C824-4365-B5A3-27C65E8FD0B5} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {331032D8-F7CC-43E3-A03B-67108767F96B} diff --git a/Build/Samples/LuaxTest/LuaxTest.vcxproj b/Build/Samples/LuaxTest/LuaxTest.vcxproj new file mode 100644 index 0000000..0ab395d --- /dev/null +++ b/Build/Samples/LuaxTest/LuaxTest.vcxproj @@ -0,0 +1,140 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + Debug + x64 + + + Release + x64 + + + + 15.0 + {87A4F855-66F2-4DBF-B86C-416E88DAC88A} + LuaxTest + 10.0.17134.0 + + + + Application + true + v141 + MultiByte + + + Application + false + v141 + true + MultiByte + + + Application + true + v141 + MultiByte + + + Application + false + v141 + true + MultiByte + + + + + + + + + + + + + + + + + + + + + $(SolutionDir)..\Bin\win64 + + + $(SolutionDir)..\Bin\win64 + + + + Level3 + Disabled + true + true + $(SolutionDir)..\Source\3rdParty;%(AdditionalIncludeDirectories) + _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + + + + + Level3 + Disabled + true + true + + + + + Level3 + MaxSpeed + true + true + true + true + + + true + true + + + + + Level3 + MaxSpeed + true + true + true + true + $(SolutionDir)..\Source\3rdParty;%(AdditionalIncludeDirectories) + _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + + + true + true + + + + + {1350cee9-b2c2-426a-af4e-f651d51dd592} + + + + + + + + + + + + \ No newline at end of file diff --git a/Build/Samples/LuaxTest/LuaxTest.vcxproj.filters b/Build/Samples/LuaxTest/LuaxTest.vcxproj.filters new file mode 100644 index 0000000..0dc8d61 --- /dev/null +++ b/Build/Samples/LuaxTest/LuaxTest.vcxproj.filters @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/Build/Samples/LuaxTest/LuaxTest.vcxproj.user b/Build/Samples/LuaxTest/LuaxTest.vcxproj.user new file mode 100644 index 0000000..be25078 --- /dev/null +++ b/Build/Samples/LuaxTest/LuaxTest.vcxproj.user @@ -0,0 +1,4 @@ + + + + \ No newline at end of file -- cgit v1.1-26-g67d0