From d7a972a0f16da0fd7bf4c0b70913920216ff3113 Mon Sep 17 00:00:00 2001 From: chai Date: Sat, 8 Jun 2019 08:34:52 +0800 Subject: *misc --- build/Asura.sln | 24 ++-- build/BUILD/BUILD.vcxproj | 122 +++++++++++++++++++++ build/BUILD/BUILD.vcxproj.filters | 17 +++ build/BUILD/BUILD.vcxproj.user | 4 + build/modules/asura-base/asura-base.vcxproj | 13 ++- build/modules/asura-core/asura-core.vcxproj | 6 +- .../modules/asura-core/asura-core.vcxproj.filters | 6 + build/modules/asura-utils/asura-utils.vcxproj | 2 - .../asura-utils/asura-utils.vcxproj.filters | 9 -- .../bindingGen.csproj.CoreCompileInputs.cache | 2 +- 10 files changed, 175 insertions(+), 30 deletions(-) create mode 100644 build/BUILD/BUILD.vcxproj create mode 100644 build/BUILD/BUILD.vcxproj.filters create mode 100644 build/BUILD/BUILD.vcxproj.user (limited to 'build') diff --git a/build/Asura.sln b/build/Asura.sln index cafd6ab..a25b5d5 100644 --- a/build/Asura.sln +++ b/build/Asura.sln @@ -113,7 +113,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sqlite", "external\sqlite\s EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "asura-fmod", "modules\asura-fmod\asura-fmod.vcxproj", "{CC451230-39E1-403A-8E1F-C3E7982049E5}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "asura-base", "modules\asura-base\asura-base.vcxproj", "{4C2E4AA5-9AE7-461A-9C09-27D1ED516444}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "asura-base", "modules\asura-base\asura-base.vcxproj", "{E10B78AA-B90E-4BB7-BAAD-0E2E4C4B9BD1}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -627,16 +627,16 @@ Global {CC451230-39E1-403A-8E1F-C3E7982049E5}.Release|x64.Build.0 = Release|x64 {CC451230-39E1-403A-8E1F-C3E7982049E5}.Release|x86.ActiveCfg = Release|Win32 {CC451230-39E1-403A-8E1F-C3E7982049E5}.Release|x86.Build.0 = Release|Win32 - {4C2E4AA5-9AE7-461A-9C09-27D1ED516444}.Debug|Any CPU.ActiveCfg = Debug|Win32 - {4C2E4AA5-9AE7-461A-9C09-27D1ED516444}.Debug|x64.ActiveCfg = Debug|x64 - {4C2E4AA5-9AE7-461A-9C09-27D1ED516444}.Debug|x64.Build.0 = Debug|x64 - {4C2E4AA5-9AE7-461A-9C09-27D1ED516444}.Debug|x86.ActiveCfg = Debug|Win32 - {4C2E4AA5-9AE7-461A-9C09-27D1ED516444}.Debug|x86.Build.0 = Debug|Win32 - {4C2E4AA5-9AE7-461A-9C09-27D1ED516444}.Release|Any CPU.ActiveCfg = Release|Win32 - {4C2E4AA5-9AE7-461A-9C09-27D1ED516444}.Release|x64.ActiveCfg = Release|x64 - {4C2E4AA5-9AE7-461A-9C09-27D1ED516444}.Release|x64.Build.0 = Release|x64 - {4C2E4AA5-9AE7-461A-9C09-27D1ED516444}.Release|x86.ActiveCfg = Release|Win32 - {4C2E4AA5-9AE7-461A-9C09-27D1ED516444}.Release|x86.Build.0 = Release|Win32 + {E10B78AA-B90E-4BB7-BAAD-0E2E4C4B9BD1}.Debug|Any CPU.ActiveCfg = Debug|Win32 + {E10B78AA-B90E-4BB7-BAAD-0E2E4C4B9BD1}.Debug|x64.ActiveCfg = Debug|x64 + {E10B78AA-B90E-4BB7-BAAD-0E2E4C4B9BD1}.Debug|x64.Build.0 = Debug|x64 + {E10B78AA-B90E-4BB7-BAAD-0E2E4C4B9BD1}.Debug|x86.ActiveCfg = Debug|Win32 + {E10B78AA-B90E-4BB7-BAAD-0E2E4C4B9BD1}.Debug|x86.Build.0 = Debug|Win32 + {E10B78AA-B90E-4BB7-BAAD-0E2E4C4B9BD1}.Release|Any CPU.ActiveCfg = Release|Win32 + {E10B78AA-B90E-4BB7-BAAD-0E2E4C4B9BD1}.Release|x64.ActiveCfg = Release|x64 + {E10B78AA-B90E-4BB7-BAAD-0E2E4C4B9BD1}.Release|x64.Build.0 = Release|x64 + {E10B78AA-B90E-4BB7-BAAD-0E2E4C4B9BD1}.Release|x86.ActiveCfg = Release|Win32 + {E10B78AA-B90E-4BB7-BAAD-0E2E4C4B9BD1}.Release|x86.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -687,7 +687,7 @@ Global {11619483-427E-490F-9E82-4FED3591E93F} = {CD115016-E377-4AC1-8595-DB2836CEFE7E} {61BF82F8-2802-4852-BF70-21D6F9F44EBB} = {64D4E4B2-4A60-46F4-A500-370EFED4524F} {CC451230-39E1-403A-8E1F-C3E7982049E5} = {CD115016-E377-4AC1-8595-DB2836CEFE7E} - {4C2E4AA5-9AE7-461A-9C09-27D1ED516444} = {CD115016-E377-4AC1-8595-DB2836CEFE7E} + {E10B78AA-B90E-4BB7-BAAD-0E2E4C4B9BD1} = {CD115016-E377-4AC1-8595-DB2836CEFE7E} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {331032D8-F7CC-43E3-A03B-67108767F96B} diff --git a/build/BUILD/BUILD.vcxproj b/build/BUILD/BUILD.vcxproj new file mode 100644 index 0000000..8ee568f --- /dev/null +++ b/build/BUILD/BUILD.vcxproj @@ -0,0 +1,122 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + Debug + x64 + + + Release + x64 + + + + 15.0 + {28C17C22-8C61-439D-A8E0-3ECC2379BBD6} + BUILD + 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/BUILD/BUILD.vcxproj.filters b/build/BUILD/BUILD.vcxproj.filters new file mode 100644 index 0000000..3c6f4fd --- /dev/null +++ b/build/BUILD/BUILD.vcxproj.filters @@ -0,0 +1,17 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hh;hpp;hxx;hm;inl;inc;ipp;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + + \ No newline at end of file diff --git a/build/BUILD/BUILD.vcxproj.user b/build/BUILD/BUILD.vcxproj.user new file mode 100644 index 0000000..be25078 --- /dev/null +++ b/build/BUILD/BUILD.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 62a757e..970e6b1 100644 --- a/build/modules/asura-base/asura-base.vcxproj +++ b/build/modules/asura-base/asura-base.vcxproj @@ -20,7 +20,7 @@ 15.0 - {4C2E4AA5-9AE7-461A-9C09-27D1ED516444} + {E10B78AA-B90E-4BB7-BAAD-0E2E4C4B9BD1} asurabase 10.0.17134.0 @@ -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 diff --git a/build/modules/asura-core/asura-core.vcxproj b/build/modules/asura-core/asura-core.vcxproj index 672e007..ed820fa 100644 --- a/build/modules/asura-core/asura-core.vcxproj +++ b/build/modules/asura-core/asura-core.vcxproj @@ -142,8 +142,8 @@ - + @@ -172,6 +172,7 @@ + @@ -195,8 +196,8 @@ - + @@ -231,6 +232,7 @@ + diff --git a/build/modules/asura-core/asura-core.vcxproj.filters b/build/modules/asura-core/asura-core.vcxproj.filters index 51106c7..b5cda13 100644 --- a/build/modules/asura-core/asura-core.vcxproj.filters +++ b/build/modules/asura-core/asura-core.vcxproj.filters @@ -215,6 +215,9 @@ graphics\binding + + profiler + @@ -380,6 +383,9 @@ graphics + + profiler + diff --git a/build/modules/asura-utils/asura-utils.vcxproj b/build/modules/asura-utils/asura-utils.vcxproj index d4dd1b9..3517962 100644 --- a/build/modules/asura-utils/asura-utils.vcxproj +++ b/build/modules/asura-utils/asura-utils.vcxproj @@ -122,7 +122,6 @@ - @@ -159,7 +158,6 @@ - diff --git a/build/modules/asura-utils/asura-utils.vcxproj.filters b/build/modules/asura-utils/asura-utils.vcxproj.filters index fff909d..3c6d092 100644 --- a/build/modules/asura-utils/asura-utils.vcxproj.filters +++ b/build/modules/asura-utils/asura-utils.vcxproj.filters @@ -22,9 +22,6 @@ {e63982e2-a2ca-4aa2-be11-f98659586c1f} - - {be44a97c-e5d0-4262-8b13-a86f7df23590} - @@ -125,9 +122,6 @@ threading - - profiler - @@ -232,9 +226,6 @@ threading - - profiler - 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