From 82956beb1fe17e1226327638c8ab22b5f5adfc1d Mon Sep 17 00:00:00 2001 From: chai Date: Wed, 20 Mar 2019 22:43:25 +0800 Subject: *misc --- build/3rd-party/tinyxml2/tinyxml2.vcxproj | 122 +++++++++++++++++++++ build/3rd-party/tinyxml2/tinyxml2.vcxproj.filters | 17 +++ build/3rd-party/tinyxml2/tinyxml2.vcxproj.user | 4 + build/Asura.Editor/Asura.Editor.vcxproj | 34 ++++++ build/Asura.Editor/Asura.Editor.vcxproj.filters | 99 +++++++++++++++-- build/Asura.sln | 33 ++++++ build/libs/asura-lib-core/asura-lib-core.vcxproj | 5 +- .../asura-lib-core/asura-lib-core.vcxproj.filters | 9 +- build/libs/asura-lib-json/asura-lib-json.vcxproj | 2 + build/libs/asura-lib-log/asura-lib-log.vcxproj | 122 +++++++++++++++++++++ .../asura-lib-log/asura-lib-log.vcxproj.filters | 17 +++ .../libs/asura-lib-log/asura-lib-log.vcxproj.user | 4 + build/libs/asura-lib-utils/asura-lib-utils.vcxproj | 1 - .../asura-lib-utils.vcxproj.filters | 5 +- build/libs/asura-lib-xml/asura-lib-xml.vcxproj | 122 +++++++++++++++++++++ .../asura-lib-xml/asura-lib-xml.vcxproj.filters | 17 +++ .../libs/asura-lib-xml/asura-lib-xml.vcxproj.user | 4 + build/tests/02-luax/02-luax.vcxproj | 24 +++- build/tests/02-luax/02-luax.vcxproj.filters | 19 ++-- ...14\205\345\220\253\347\233\256\345\275\225.txt" | 4 - 20 files changed, 629 insertions(+), 35 deletions(-) create mode 100644 build/3rd-party/tinyxml2/tinyxml2.vcxproj create mode 100644 build/3rd-party/tinyxml2/tinyxml2.vcxproj.filters create mode 100644 build/3rd-party/tinyxml2/tinyxml2.vcxproj.user create mode 100644 build/libs/asura-lib-log/asura-lib-log.vcxproj create mode 100644 build/libs/asura-lib-log/asura-lib-log.vcxproj.filters create mode 100644 build/libs/asura-lib-log/asura-lib-log.vcxproj.user create mode 100644 build/libs/asura-lib-xml/asura-lib-xml.vcxproj create mode 100644 build/libs/asura-lib-xml/asura-lib-xml.vcxproj.filters create mode 100644 build/libs/asura-lib-xml/asura-lib-xml.vcxproj.user delete mode 100644 "build/\345\214\205\345\220\253\347\233\256\345\275\225.txt" (limited to 'build') diff --git a/build/3rd-party/tinyxml2/tinyxml2.vcxproj b/build/3rd-party/tinyxml2/tinyxml2.vcxproj new file mode 100644 index 0000000..a662caf --- /dev/null +++ b/build/3rd-party/tinyxml2/tinyxml2.vcxproj @@ -0,0 +1,122 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + Debug + x64 + + + Release + x64 + + + + 15.0 + {883BC26A-4C9E-44B3-B5C0-7F3E4EDC0226} + tinyxml2 + 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/tinyxml2/tinyxml2.vcxproj.filters b/build/3rd-party/tinyxml2/tinyxml2.vcxproj.filters new file mode 100644 index 0000000..3c6f4fd --- /dev/null +++ b/build/3rd-party/tinyxml2/tinyxml2.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/3rd-party/tinyxml2/tinyxml2.vcxproj.user b/build/3rd-party/tinyxml2/tinyxml2.vcxproj.user new file mode 100644 index 0000000..be25078 --- /dev/null +++ b/build/3rd-party/tinyxml2/tinyxml2.vcxproj.user @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/build/Asura.Editor/Asura.Editor.vcxproj b/build/Asura.Editor/Asura.Editor.vcxproj index c16be0a..cc38c61 100644 --- a/build/Asura.Editor/Asura.Editor.vcxproj +++ b/build/Asura.Editor/Asura.Editor.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,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/build/Asura.Editor/Asura.Editor.vcxproj.filters b/build/Asura.Editor/Asura.Editor.vcxproj.filters index 3c6f4fd..53931f0 100644 --- a/build/Asura.Editor/Asura.Editor.vcxproj.filters +++ b/build/Asura.Editor/Asura.Editor.vcxproj.filters @@ -1,17 +1,98 @@  - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + {a4345092-d09c-424c-8d7c-c076914fb6a2} - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hh;hpp;hxx;hm;inl;inc;ipp;xsd + + {7654ef3d-54c4-490f-bb24-e6a67bd63e1e} - - {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 + + {f67906bd-4f7c-4ac6-bca1-019617435a8b} + + + widgets + + + widgets + + + widgets + + + widgets + + + widgets + + + widgets + + + widgets + + + widgets + + + widgets + + + layout + + + layout + + + widgets + + + + + + + + widgets + + + widgets + + + widgets + + + widgets + + + widgets + + + widgets + + + widgets + + + widgets + + + widgets + + + widgets + + + layout + + + layout + + + widgets + + + + \ No newline at end of file diff --git a/build/Asura.sln b/build/Asura.sln index f7ee2f4..fa2e5ca 100644 --- a/build/Asura.sln +++ b/build/Asura.sln @@ -75,6 +75,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Asura", "Asura\Asura.vcxpro EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "asura-lib-json", "libs\asura-lib-json\asura-lib-json.vcxproj", "{1B83A353-9694-42E0-997E-79E150E1C2E5}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "asura-lib-xml", "libs\asura-lib-xml\asura-lib-xml.vcxproj", "{AB4F8F4A-73B5-4EFF-BD5D-448A3E39C60A}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tinyxml2", "3rd-party\tinyxml2\tinyxml2.vcxproj", "{883BC26A-4C9E-44B3-B5C0-7F3E4EDC0226}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "asura-lib-log", "libs\asura-lib-log\asura-lib-log.vcxproj", "{73B0F8AB-EF5A-412A-9E34-0FD2574766B7}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|x64 = Debug|x64 @@ -347,6 +353,30 @@ Global {1B83A353-9694-42E0-997E-79E150E1C2E5}.Release|x64.Build.0 = Release|x64 {1B83A353-9694-42E0-997E-79E150E1C2E5}.Release|x86.ActiveCfg = Release|Win32 {1B83A353-9694-42E0-997E-79E150E1C2E5}.Release|x86.Build.0 = Release|Win32 + {AB4F8F4A-73B5-4EFF-BD5D-448A3E39C60A}.Debug|x64.ActiveCfg = Debug|x64 + {AB4F8F4A-73B5-4EFF-BD5D-448A3E39C60A}.Debug|x64.Build.0 = Debug|x64 + {AB4F8F4A-73B5-4EFF-BD5D-448A3E39C60A}.Debug|x86.ActiveCfg = Debug|Win32 + {AB4F8F4A-73B5-4EFF-BD5D-448A3E39C60A}.Debug|x86.Build.0 = Debug|Win32 + {AB4F8F4A-73B5-4EFF-BD5D-448A3E39C60A}.Release|x64.ActiveCfg = Release|x64 + {AB4F8F4A-73B5-4EFF-BD5D-448A3E39C60A}.Release|x64.Build.0 = Release|x64 + {AB4F8F4A-73B5-4EFF-BD5D-448A3E39C60A}.Release|x86.ActiveCfg = Release|Win32 + {AB4F8F4A-73B5-4EFF-BD5D-448A3E39C60A}.Release|x86.Build.0 = Release|Win32 + {883BC26A-4C9E-44B3-B5C0-7F3E4EDC0226}.Debug|x64.ActiveCfg = Debug|x64 + {883BC26A-4C9E-44B3-B5C0-7F3E4EDC0226}.Debug|x64.Build.0 = Debug|x64 + {883BC26A-4C9E-44B3-B5C0-7F3E4EDC0226}.Debug|x86.ActiveCfg = Debug|Win32 + {883BC26A-4C9E-44B3-B5C0-7F3E4EDC0226}.Debug|x86.Build.0 = Debug|Win32 + {883BC26A-4C9E-44B3-B5C0-7F3E4EDC0226}.Release|x64.ActiveCfg = Release|x64 + {883BC26A-4C9E-44B3-B5C0-7F3E4EDC0226}.Release|x64.Build.0 = Release|x64 + {883BC26A-4C9E-44B3-B5C0-7F3E4EDC0226}.Release|x86.ActiveCfg = Release|Win32 + {883BC26A-4C9E-44B3-B5C0-7F3E4EDC0226}.Release|x86.Build.0 = Release|Win32 + {73B0F8AB-EF5A-412A-9E34-0FD2574766B7}.Debug|x64.ActiveCfg = Debug|x64 + {73B0F8AB-EF5A-412A-9E34-0FD2574766B7}.Debug|x64.Build.0 = Debug|x64 + {73B0F8AB-EF5A-412A-9E34-0FD2574766B7}.Debug|x86.ActiveCfg = Debug|Win32 + {73B0F8AB-EF5A-412A-9E34-0FD2574766B7}.Debug|x86.Build.0 = Debug|Win32 + {73B0F8AB-EF5A-412A-9E34-0FD2574766B7}.Release|x64.ActiveCfg = Release|x64 + {73B0F8AB-EF5A-412A-9E34-0FD2574766B7}.Release|x64.Build.0 = Release|x64 + {73B0F8AB-EF5A-412A-9E34-0FD2574766B7}.Release|x86.ActiveCfg = Release|Win32 + {73B0F8AB-EF5A-412A-9E34-0FD2574766B7}.Release|x86.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -380,6 +410,9 @@ Global {41599A7C-B1F2-4D95-90CF-DB74AC4C7FA5} = {E068D138-C824-4365-B5A3-27C65E8FD0B5} {38090AEB-3AA9-489B-BBEC-0CEDF9EAC0DE} = {E068D138-C824-4365-B5A3-27C65E8FD0B5} {1B83A353-9694-42E0-997E-79E150E1C2E5} = {CD115016-E377-4AC1-8595-DB2836CEFE7E} + {AB4F8F4A-73B5-4EFF-BD5D-448A3E39C60A} = {CD115016-E377-4AC1-8595-DB2836CEFE7E} + {883BC26A-4C9E-44B3-B5C0-7F3E4EDC0226} = {64D4E4B2-4A60-46F4-A500-370EFED4524F} + {73B0F8AB-EF5A-412A-9E34-0FD2574766B7} = {CD115016-E377-4AC1-8595-DB2836CEFE7E} 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 62d3815..a5dd696 100644 --- a/build/libs/asura-lib-core/asura-lib-core.vcxproj +++ b/build/libs/asura-lib-core/asura-lib-core.vcxproj @@ -120,6 +120,7 @@ + @@ -162,12 +163,12 @@ - + - + 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 2948753..ae0aace 100644 --- a/build/libs/asura-lib-core/asura-lib-core.vcxproj.filters +++ b/build/libs/asura-lib-core/asura-lib-core.vcxproj.filters @@ -150,10 +150,12 @@ client\sdl + + client\sdl + - @@ -268,9 +270,12 @@ client\sdl - + + client\sdl + + diff --git a/build/libs/asura-lib-json/asura-lib-json.vcxproj b/build/libs/asura-lib-json/asura-lib-json.vcxproj index 7a2d92d..168ea89 100644 --- a/build/libs/asura-lib-json/asura-lib-json.vcxproj +++ b/build/libs/asura-lib-json/asura-lib-json.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 diff --git a/build/libs/asura-lib-log/asura-lib-log.vcxproj b/build/libs/asura-lib-log/asura-lib-log.vcxproj new file mode 100644 index 0000000..3f891f1 --- /dev/null +++ b/build/libs/asura-lib-log/asura-lib-log.vcxproj @@ -0,0 +1,122 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + Debug + x64 + + + Release + x64 + + + + 15.0 + {73B0F8AB-EF5A-412A-9E34-0FD2574766B7} + asuraliblog + 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/libs/asura-lib-log/asura-lib-log.vcxproj.filters b/build/libs/asura-lib-log/asura-lib-log.vcxproj.filters new file mode 100644 index 0000000..3c6f4fd --- /dev/null +++ b/build/libs/asura-lib-log/asura-lib-log.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/libs/asura-lib-log/asura-lib-log.vcxproj.user b/build/libs/asura-lib-log/asura-lib-log.vcxproj.user new file mode 100644 index 0000000..be25078 --- /dev/null +++ b/build/libs/asura-lib-log/asura-lib-log.vcxproj.user @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/build/libs/asura-lib-utils/asura-lib-utils.vcxproj b/build/libs/asura-lib-utils/asura-lib-utils.vcxproj index 7e3d4a4..094fcb8 100644 --- a/build/libs/asura-lib-utils/asura-lib-utils.vcxproj +++ b/build/libs/asura-lib-utils/asura-lib-utils.vcxproj @@ -145,7 +145,6 @@ - diff --git a/build/libs/asura-lib-utils/asura-lib-utils.vcxproj.filters b/build/libs/asura-lib-utils/asura-lib-utils.vcxproj.filters index 94c9497..86bd1ff 100644 --- a/build/libs/asura-lib-utils/asura-lib-utils.vcxproj.filters +++ b/build/libs/asura-lib-utils/asura-lib-utils.vcxproj.filters @@ -93,16 +93,13 @@ math - - scripting - scripting - + diff --git a/build/libs/asura-lib-xml/asura-lib-xml.vcxproj b/build/libs/asura-lib-xml/asura-lib-xml.vcxproj new file mode 100644 index 0000000..112bc8f --- /dev/null +++ b/build/libs/asura-lib-xml/asura-lib-xml.vcxproj @@ -0,0 +1,122 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + Debug + x64 + + + Release + x64 + + + + 15.0 + {AB4F8F4A-73B5-4EFF-BD5D-448A3E39C60A} + asuralibxml + 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/libs/asura-lib-xml/asura-lib-xml.vcxproj.filters b/build/libs/asura-lib-xml/asura-lib-xml.vcxproj.filters new file mode 100644 index 0000000..3c6f4fd --- /dev/null +++ b/build/libs/asura-lib-xml/asura-lib-xml.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/libs/asura-lib-xml/asura-lib-xml.vcxproj.user b/build/libs/asura-lib-xml/asura-lib-xml.vcxproj.user new file mode 100644 index 0000000..be25078 --- /dev/null +++ b/build/libs/asura-lib-xml/asura-lib-xml.vcxproj.user @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/build/tests/02-luax/02-luax.vcxproj b/build/tests/02-luax/02-luax.vcxproj index aa14357..5a79408 100644 --- a/build/tests/02-luax/02-luax.vcxproj +++ b/build/tests/02-luax/02-luax.vcxproj @@ -69,13 +69,19 @@ - + + $(SolutionDir)..\Bin\win64 + + + $(SolutionDir)..\Bin\win64 + Level3 Disabled true true + $(SolutionDir)..\source\3rd-party;$(SolutionDir)..\source\libs;%(AdditionalIncludeDirectories) @@ -108,6 +114,7 @@ true true true + $(SolutionDir)..\source\3rd-party;$(SolutionDir)..\source\libs;%(AdditionalIncludeDirectories) true @@ -115,6 +122,21 @@ + + + + + + + + + + + {8b8fca14-fc8a-45b4-bf3c-9340cb586076} + + + {1350cee9-b2c2-426a-af4e-f651d51dd592} + diff --git a/build/tests/02-luax/02-luax.vcxproj.filters b/build/tests/02-luax/02-luax.vcxproj.filters index 3c6f4fd..67f1e4d 100644 --- a/build/tests/02-luax/02-luax.vcxproj.filters +++ b/build/tests/02-luax/02-luax.vcxproj.filters @@ -1,17 +1,12 @@  - - {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/\345\214\205\345\220\253\347\233\256\345\275\225.txt" "b/build/\345\214\205\345\220\253\347\233\256\345\275\225.txt" deleted file mode 100644 index 6b2716e..0000000 --- "a/build/\345\214\205\345\220\253\347\233\256\345\275\225.txt" +++ /dev/null @@ -1,4 +0,0 @@ -$(SolutionDir)..\source\3rd-party - -$(SolutionDir)..\source\libs - -- cgit v1.1-26-g67d0