From f4c338c63f3456a8eccd56c35e233843687d55be Mon Sep 17 00:00:00 2001 From: chai Date: Fri, 29 Mar 2019 00:43:25 +0800 Subject: *thread --- build/3rd-party/Luax/Luax.vcxproj | 4 +- build/3rd-party/Luax/Luax.vcxproj.filters | 4 +- build/3rd-party/uuid4/uuid4.vcxproj | 126 +++++++++++++++++++++ build/3rd-party/uuid4/uuid4.vcxproj.filters | 9 ++ build/3rd-party/uuid4/uuid4.vcxproj.user | 4 + build/Asura.sln | 13 +++ build/libs/asura-lib-core/asura-lib-core.vcxproj | 16 +-- .../asura-lib-core/asura-lib-core.vcxproj.filters | 47 ++++---- .../libs/asura-lib-openal/asura-lib-openal.vcxproj | 10 ++ .../asura-lib-openal.vcxproj.filters | 13 ++- build/tests/05-physfs/05-physfs.vcxproj.user | 9 +- build/tools/bindingGen/main.cs | 4 +- .../Debug/bindingGen.csproj.FileListAbsolute.txt | 2 - build/tools/bindingGen/obj/Debug/bindingGen.exe | Bin 9216 -> 9728 bytes 14 files changed, 221 insertions(+), 40 deletions(-) create mode 100644 build/3rd-party/uuid4/uuid4.vcxproj create mode 100644 build/3rd-party/uuid4/uuid4.vcxproj.filters create mode 100644 build/3rd-party/uuid4/uuid4.vcxproj.user (limited to 'build') diff --git a/build/3rd-party/Luax/Luax.vcxproj b/build/3rd-party/Luax/Luax.vcxproj index a24c972..b5730c6 100644 --- a/build/3rd-party/Luax/Luax.vcxproj +++ b/build/3rd-party/Luax/Luax.vcxproj @@ -126,7 +126,7 @@ - + @@ -137,7 +137,7 @@ - + diff --git a/build/3rd-party/Luax/Luax.vcxproj.filters b/build/3rd-party/Luax/Luax.vcxproj.filters index 705dcd9..7f385fc 100644 --- a/build/3rd-party/Luax/Luax.vcxproj.filters +++ b/build/3rd-party/Luax/Luax.vcxproj.filters @@ -9,9 +9,9 @@ - + @@ -19,10 +19,10 @@ - + diff --git a/build/3rd-party/uuid4/uuid4.vcxproj b/build/3rd-party/uuid4/uuid4.vcxproj new file mode 100644 index 0000000..e552199 --- /dev/null +++ b/build/3rd-party/uuid4/uuid4.vcxproj @@ -0,0 +1,126 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + Debug + x64 + + + Release + x64 + + + + 15.0 + {49F7847E-219E-4A7B-8484-2A33DAC29DD0} + uuid4 + 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/3rd-party/uuid4/uuid4.vcxproj.filters b/build/3rd-party/uuid4/uuid4.vcxproj.filters new file mode 100644 index 0000000..6f984b1 --- /dev/null +++ b/build/3rd-party/uuid4/uuid4.vcxproj.filters @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/build/3rd-party/uuid4/uuid4.vcxproj.user b/build/3rd-party/uuid4/uuid4.vcxproj.user new file mode 100644 index 0000000..be25078 --- /dev/null +++ b/build/3rd-party/uuid4/uuid4.vcxproj.user @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/build/Asura.sln b/build/Asura.sln index 9c0e875..66cb6d4 100644 --- a/build/Asura.sln +++ b/build/Asura.sln @@ -99,6 +99,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LuaSocket", "3rd-party\LuaS EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Plotscript", "3rd-party\Plotscript\Plotscript.vcxproj", "{2822F737-EEFA-4C74-872C-1EE0793E2221}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "uuid4", "3rd-party\uuid4\uuid4.vcxproj", "{49F7847E-219E-4A7B-8484-2A33DAC29DD0}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -551,6 +553,16 @@ Global {2822F737-EEFA-4C74-872C-1EE0793E2221}.Release|x64.Build.0 = Release|x64 {2822F737-EEFA-4C74-872C-1EE0793E2221}.Release|x86.ActiveCfg = Release|Win32 {2822F737-EEFA-4C74-872C-1EE0793E2221}.Release|x86.Build.0 = Release|Win32 + {49F7847E-219E-4A7B-8484-2A33DAC29DD0}.Debug|Any CPU.ActiveCfg = Debug|Win32 + {49F7847E-219E-4A7B-8484-2A33DAC29DD0}.Debug|x64.ActiveCfg = Debug|x64 + {49F7847E-219E-4A7B-8484-2A33DAC29DD0}.Debug|x64.Build.0 = Debug|x64 + {49F7847E-219E-4A7B-8484-2A33DAC29DD0}.Debug|x86.ActiveCfg = Debug|Win32 + {49F7847E-219E-4A7B-8484-2A33DAC29DD0}.Debug|x86.Build.0 = Debug|Win32 + {49F7847E-219E-4A7B-8484-2A33DAC29DD0}.Release|Any CPU.ActiveCfg = Release|Win32 + {49F7847E-219E-4A7B-8484-2A33DAC29DD0}.Release|x64.ActiveCfg = Release|x64 + {49F7847E-219E-4A7B-8484-2A33DAC29DD0}.Release|x64.Build.0 = Release|x64 + {49F7847E-219E-4A7B-8484-2A33DAC29DD0}.Release|x86.ActiveCfg = Release|Win32 + {49F7847E-219E-4A7B-8484-2A33DAC29DD0}.Release|x86.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -594,6 +606,7 @@ Global {6361701E-BD43-4AE9-8AE2-5C8F87D436BA} = {CD115016-E377-4AC1-8595-DB2836CEFE7E} {E15D111A-9E02-4E0D-86FE-62BFCD3C211E} = {64D4E4B2-4A60-46F4-A500-370EFED4524F} {2822F737-EEFA-4C74-872C-1EE0793E2221} = {64D4E4B2-4A60-46F4-A500-370EFED4524F} + {49F7847E-219E-4A7B-8484-2A33DAC29DD0} = {64D4E4B2-4A60-46F4-A500-370EFED4524F} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {331032D8-F7CC-43E3-A03B-67108767F96B} diff --git a/build/libs/asura-lib-core/asura-lib-core.vcxproj b/build/libs/asura-lib-core/asura-lib-core.vcxproj index 5530000..cebc42a 100644 --- a/build/libs/asura-lib-core/asura-lib-core.vcxproj +++ b/build/libs/asura-lib-core/asura-lib-core.vcxproj @@ -150,10 +150,6 @@ - - - - @@ -161,6 +157,10 @@ + + + + @@ -193,10 +193,6 @@ - - - - @@ -208,6 +204,10 @@ + + + + diff --git a/build/libs/asura-lib-core/asura-lib-core.vcxproj.filters b/build/libs/asura-lib-core/asura-lib-core.vcxproj.filters index a118d6a..8ef99f7 100644 --- a/build/libs/asura-lib-core/asura-lib-core.vcxproj.filters +++ b/build/libs/asura-lib-core/asura-lib-core.vcxproj.filters @@ -19,6 +19,9 @@ {4f6b2c19-1a06-48c9-b89d-52fa27bec5c1} + + {7a73607c-8da6-4865-a992-5c7c8764bd5a} + @@ -70,9 +73,6 @@ graphics - - graphics - input @@ -104,21 +104,12 @@ graphics - - graphics - input graphics - - graphics - - - graphics - graphics\binding @@ -149,6 +140,18 @@ graphics\binding + + window + + + window + + + window + + + window + @@ -215,9 +218,6 @@ graphics - - graphics - input @@ -263,20 +263,23 @@ graphics - - graphics - input graphics - - graphics + + window - - graphics + + window + + + window + + + window diff --git a/build/libs/asura-lib-openal/asura-lib-openal.vcxproj b/build/libs/asura-lib-openal/asura-lib-openal.vcxproj index dd05ef3..6ea6e0e 100644 --- a/build/libs/asura-lib-openal/asura-lib-openal.vcxproj +++ b/build/libs/asura-lib-openal/asura-lib-openal.vcxproj @@ -76,6 +76,7 @@ Disabled true true + $(SolutionDir)..\source\3rd-party;$(SolutionDir)..\source\libs;%(AdditionalIncludeDirectories) @@ -108,6 +109,7 @@ true true true + $(SolutionDir)..\source\3rd-party;$(SolutionDir)..\source\libs;%(AdditionalIncludeDirectories) true @@ -115,6 +117,14 @@ + + + + + + + + diff --git a/build/libs/asura-lib-openal/asura-lib-openal.vcxproj.filters b/build/libs/asura-lib-openal/asura-lib-openal.vcxproj.filters index 9cd8510..19278c7 100644 --- a/build/libs/asura-lib-openal/asura-lib-openal.vcxproj.filters +++ b/build/libs/asura-lib-openal/asura-lib-openal.vcxproj.filters @@ -1,2 +1,13 @@  - \ No newline at end of file + + + + + + + + + + + + \ No newline at end of file diff --git a/build/tests/05-physfs/05-physfs.vcxproj.user b/build/tests/05-physfs/05-physfs.vcxproj.user index be25078..0858e0c 100644 --- a/build/tests/05-physfs/05-physfs.vcxproj.user +++ b/build/tests/05-physfs/05-physfs.vcxproj.user @@ -1,4 +1,11 @@  - + + $(SolutionDir)..\Bin\win64 + WindowsLocalDebugger + + + $(SolutionDir)..\Bin\win64 + WindowsLocalDebugger + \ No newline at end of file diff --git a/build/tools/bindingGen/main.cs b/build/tools/bindingGen/main.cs index c9290b8..7f99da4 100644 --- a/build/tools/bindingGen/main.cs +++ b/build/tools/bindingGen/main.cs @@ -130,8 +130,8 @@ namespace {1} if (mc.Count == 0) return ""; - string reg_enum_l = @"(?<=enum\s"; - string reg_enum_r = @"[\s\n]*\{((?!\{)[\s\S])*)[A-Z_]+(?=\s*)"; + string reg_enum_l = @"(?<=enum\s*"; + string reg_enum_r = @"[\s\n]*\{((?!\})[\s\S])*)[A-Z_]+(?=\s*)"; string enums = ""; foreach(var m in mc) diff --git a/build/tools/bindingGen/obj/Debug/bindingGen.csproj.FileListAbsolute.txt b/build/tools/bindingGen/obj/Debug/bindingGen.csproj.FileListAbsolute.txt index 442f839..3656c65 100644 --- a/build/tools/bindingGen/obj/Debug/bindingGen.csproj.FileListAbsolute.txt +++ b/build/tools/bindingGen/obj/Debug/bindingGen.csproj.FileListAbsolute.txt @@ -8,5 +8,3 @@ D:\Asura\build\tools\bindingGen\obj\Debug\bindingGen.pdb D:\Asura\bin\win64\bindingGen.exe.config D:\Asura\bin\win64\bindingGen.exe D:\Asura\bin\win64\bindingGen.pdb -D:\Asura\bin\win64\bindingGen.exe.CodeAnalysisLog.xml -D:\Asura\bin\win64\bindingGen.exe.lastcodeanalysissucceeded diff --git a/build/tools/bindingGen/obj/Debug/bindingGen.exe b/build/tools/bindingGen/obj/Debug/bindingGen.exe index 19029df..b196836 100644 Binary files a/build/tools/bindingGen/obj/Debug/bindingGen.exe and b/build/tools/bindingGen/obj/Debug/bindingGen.exe differ -- cgit v1.1-26-g67d0