From 8164adb15b76f537f8b6c78b9992786b61d61cc8 Mon Sep 17 00:00:00 2001 From: chai Date: Sat, 30 Mar 2019 21:49:29 +0800 Subject: *misc --- build/Asura.sln | 15 ++- build/modules/asura-box2d/asura-box2d.vcxproj | 28 +++++ .../asura-box2d/asura-box2d.vcxproj.filters | 40 ++++++- build/modules/asura-core/asura-core.vcxproj | 1 - .../modules/asura-core/asura-core.vcxproj.filters | 45 ++++---- .../asura-framework.vcxproj.filters | 17 +-- build/modules/asura-openal/asura-openal.vcxproj | 10 ++ .../asura-openal/asura-openal.vcxproj.filters | 15 +++ build/modules/asura-utils/asura-utils.vcxproj | 1 - .../asura-utils/asura-utils.vcxproj.filters | 3 - build/tests/07-image/07-image.vcxproj | 122 +++++++++++++++++++++ build/tests/07-image/07-image.vcxproj.filters | 17 +++ build/tests/07-image/07-image.vcxproj.user | 4 + 13 files changed, 271 insertions(+), 47 deletions(-) create mode 100644 build/tests/07-image/07-image.vcxproj create mode 100644 build/tests/07-image/07-image.vcxproj.filters create mode 100644 build/tests/07-image/07-image.vcxproj.user (limited to 'build') diff --git a/build/Asura.sln b/build/Asura.sln index 53e6d41..2e3f4f0 100644 --- a/build/Asura.sln +++ b/build/Asura.sln @@ -95,12 +95,14 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "asura-network", "modules\as EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LuaSocket", "3rd-party\LuaSocket\LuaSocket.vcxproj", "{E15D111A-9E02-4E0D-86FE-62BFCD3C211E}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Plotscript", "3rd-party\Plotscript\Plotscript.vcxproj", "{2822F737-EEFA-4C74-872C-1EE0793E2221}" +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 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "asura-plot", "modules\asura-plot\asura-plot.vcxproj", "{F248C936-2169-45DF-8FC4-60E56EA23ECC}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "07-image", "tests\07-image\07-image.vcxproj", "{72119950-3542-41AD-97EB-DC4856FC16AA}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -563,6 +565,16 @@ Global {F248C936-2169-45DF-8FC4-60E56EA23ECC}.Release|x64.Build.0 = Release|x64 {F248C936-2169-45DF-8FC4-60E56EA23ECC}.Release|x86.ActiveCfg = Release|Win32 {F248C936-2169-45DF-8FC4-60E56EA23ECC}.Release|x86.Build.0 = Release|Win32 + {72119950-3542-41AD-97EB-DC4856FC16AA}.Debug|Any CPU.ActiveCfg = Debug|Win32 + {72119950-3542-41AD-97EB-DC4856FC16AA}.Debug|x64.ActiveCfg = Debug|x64 + {72119950-3542-41AD-97EB-DC4856FC16AA}.Debug|x64.Build.0 = Debug|x64 + {72119950-3542-41AD-97EB-DC4856FC16AA}.Debug|x86.ActiveCfg = Debug|Win32 + {72119950-3542-41AD-97EB-DC4856FC16AA}.Debug|x86.Build.0 = Debug|Win32 + {72119950-3542-41AD-97EB-DC4856FC16AA}.Release|Any CPU.ActiveCfg = Release|Win32 + {72119950-3542-41AD-97EB-DC4856FC16AA}.Release|x64.ActiveCfg = Release|x64 + {72119950-3542-41AD-97EB-DC4856FC16AA}.Release|x64.Build.0 = Release|x64 + {72119950-3542-41AD-97EB-DC4856FC16AA}.Release|x86.ActiveCfg = Release|Win32 + {72119950-3542-41AD-97EB-DC4856FC16AA}.Release|x86.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -607,6 +619,7 @@ Global {2822F737-EEFA-4C74-872C-1EE0793E2221} = {64D4E4B2-4A60-46F4-A500-370EFED4524F} {49F7847E-219E-4A7B-8484-2A33DAC29DD0} = {64D4E4B2-4A60-46F4-A500-370EFED4524F} {F248C936-2169-45DF-8FC4-60E56EA23ECC} = {CD115016-E377-4AC1-8595-DB2836CEFE7E} + {72119950-3542-41AD-97EB-DC4856FC16AA} = {E068D138-C824-4365-B5A3-27C65E8FD0B5} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {331032D8-F7CC-43E3-A03B-67108767F96B} diff --git a/build/modules/asura-box2d/asura-box2d.vcxproj b/build/modules/asura-box2d/asura-box2d.vcxproj index 8ad3c71..9855a26 100644 --- a/build/modules/asura-box2d/asura-box2d.vcxproj +++ b/build/modules/asura-box2d/asura-box2d.vcxproj @@ -76,6 +76,7 @@ Disabled true true + $(SolutionDir)..\source\3rd-party;$(SolutionDir)..\source\modules;%(AdditionalIncludeDirectories) @@ -108,6 +109,7 @@ true true true + $(SolutionDir)..\source\3rd-party;$(SolutionDir)..\source\modules;%(AdditionalIncludeDirectories) true @@ -115,6 +117,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/build/modules/asura-box2d/asura-box2d.vcxproj.filters b/build/modules/asura-box2d/asura-box2d.vcxproj.filters index 9cd8510..4411d16 100644 --- a/build/modules/asura-box2d/asura-box2d.vcxproj.filters +++ b/build/modules/asura-box2d/asura-box2d.vcxproj.filters @@ -1,2 +1,40 @@  - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + binding + + + binding + + + + + {a446fe08-e138-456d-bbc0-4e8d4aa79989} + + + \ 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 07c9dd9..1ad07c2 100644 --- a/build/modules/asura-core/asura-core.vcxproj +++ b/build/modules/asura-core/asura-core.vcxproj @@ -185,7 +185,6 @@ - diff --git a/build/modules/asura-core/asura-core.vcxproj.filters b/build/modules/asura-core/asura-core.vcxproj.filters index 8c3f7e1..84a379f 100644 --- a/build/modules/asura-core/asura-core.vcxproj.filters +++ b/build/modules/asura-core/asura-core.vcxproj.filters @@ -40,12 +40,6 @@ graphics - - graphics - - - graphics - graphics @@ -110,9 +104,6 @@ input - - graphics - graphics\binding @@ -161,6 +152,15 @@ threading + + graphics + + + graphics + + + graphics + @@ -182,24 +182,12 @@ graphics - - graphics - - - graphics - - - graphics - graphics graphics - - graphics - graphics @@ -275,9 +263,6 @@ input - - graphics - window @@ -296,6 +281,18 @@ threading + + graphics + + + graphics + + + graphics + + + graphics + diff --git a/build/modules/asura-framework/asura-framework.vcxproj.filters b/build/modules/asura-framework/asura-framework.vcxproj.filters index 3c6f4fd..9cd8510 100644 --- a/build/modules/asura-framework/asura-framework.vcxproj.filters +++ b/build/modules/asura-framework/asura-framework.vcxproj.filters @@ -1,17 +1,2 @@  - - - - {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 + \ No newline at end of file diff --git a/build/modules/asura-openal/asura-openal.vcxproj b/build/modules/asura-openal/asura-openal.vcxproj index f29350e..04827fa 100644 --- a/build/modules/asura-openal/asura-openal.vcxproj +++ b/build/modules/asura-openal/asura-openal.vcxproj @@ -117,14 +117,24 @@ + + + + + + + + + + diff --git a/build/modules/asura-openal/asura-openal.vcxproj.filters b/build/modules/asura-openal/asura-openal.vcxproj.filters index 7af022e..ceb2b29 100644 --- a/build/modules/asura-openal/asura-openal.vcxproj.filters +++ b/build/modules/asura-openal/asura-openal.vcxproj.filters @@ -4,10 +4,25 @@ + + + + + + + + + + + + + + {006a5466-b1f4-4ab3-9f6c-eae54a78df37} + \ No newline at end of file diff --git a/build/modules/asura-utils/asura-utils.vcxproj b/build/modules/asura-utils/asura-utils.vcxproj index cc67004..ad005d9 100644 --- a/build/modules/asura-utils/asura-utils.vcxproj +++ b/build/modules/asura-utils/asura-utils.vcxproj @@ -131,7 +131,6 @@ - diff --git a/build/modules/asura-utils/asura-utils.vcxproj.filters b/build/modules/asura-utils/asura-utils.vcxproj.filters index 8534675..967881d 100644 --- a/build/modules/asura-utils/asura-utils.vcxproj.filters +++ b/build/modules/asura-utils/asura-utils.vcxproj.filters @@ -53,9 +53,6 @@ io - - io - io diff --git a/build/tests/07-image/07-image.vcxproj b/build/tests/07-image/07-image.vcxproj new file mode 100644 index 0000000..11012d8 --- /dev/null +++ b/build/tests/07-image/07-image.vcxproj @@ -0,0 +1,122 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + Debug + x64 + + + Release + x64 + + + + 15.0 + {72119950-3542-41AD-97EB-DC4856FC16AA} + My07image + 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/tests/07-image/07-image.vcxproj.filters b/build/tests/07-image/07-image.vcxproj.filters new file mode 100644 index 0000000..3c6f4fd --- /dev/null +++ b/build/tests/07-image/07-image.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/tests/07-image/07-image.vcxproj.user b/build/tests/07-image/07-image.vcxproj.user new file mode 100644 index 0000000..be25078 --- /dev/null +++ b/build/tests/07-image/07-image.vcxproj.user @@ -0,0 +1,4 @@ + + + + \ No newline at end of file -- cgit v1.1-26-g67d0