From 49cd32a7c139490294ea952bde9f0b121301627a Mon Sep 17 00:00:00 2001 From: chai Date: Mon, 28 Jan 2019 13:28:13 +0800 Subject: +Box2D --- Build/3rdParty/Box2D/Box2D.vcxproj | 221 +++++++++++++++++++++ Build/3rdParty/Box2D/Box2D.vcxproj.filters | 307 ++++++++++++++++++++++++++++ Build/3rdParty/Box2D/Box2D.vcxproj.user | 4 + Build/3rdParty/box2d/box2d.vcxproj | 103 +++++++++- Build/3rdParty/box2d/box2d.vcxproj.filters | 308 ++++++++++++++++++++++++++++- Build/Asura.sln | 22 +-- 6 files changed, 943 insertions(+), 22 deletions(-) create mode 100644 Build/3rdParty/Box2D/Box2D.vcxproj create mode 100644 Build/3rdParty/Box2D/Box2D.vcxproj.filters create mode 100644 Build/3rdParty/Box2D/Box2D.vcxproj.user (limited to 'Build') diff --git a/Build/3rdParty/Box2D/Box2D.vcxproj b/Build/3rdParty/Box2D/Box2D.vcxproj new file mode 100644 index 0000000..2eef062 --- /dev/null +++ b/Build/3rdParty/Box2D/Box2D.vcxproj @@ -0,0 +1,221 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + Debug + x64 + + + Release + x64 + + + + 15.0 + {4122CC44-1E4C-4A08-B16F-1A650585EBD4} + Box2D + 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 + $(SolutionDir)..\Source\3rdparty\;%(AdditionalIncludeDirectories) + + + + + Level3 + Disabled + true + true + $(SolutionDir)..\Source\3rdparty\;%(AdditionalIncludeDirectories) + + + + + Level3 + MaxSpeed + true + true + true + true + $(SolutionDir)..\Source\3rdparty\;%(AdditionalIncludeDirectories) + + + true + true + + + + + Level3 + MaxSpeed + true + true + true + true + $(SolutionDir)..\Source\3rdparty\;%(AdditionalIncludeDirectories) + + + true + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Build/3rdParty/Box2D/Box2D.vcxproj.filters b/Build/3rdParty/Box2D/Box2D.vcxproj.filters new file mode 100644 index 0000000..bad924b --- /dev/null +++ b/Build/3rdParty/Box2D/Box2D.vcxproj.filters @@ -0,0 +1,307 @@ + + + + + {54962725-7c7b-450f-83e8-9e47db0acd9d} + + + {0e29a4d3-8d20-4856-80fa-e76df88b4b7c} + + + {15794cf3-b31e-4a81-8e15-d4dfd1d17e4d} + + + {cf0b3c53-c1c7-4fcf-8796-ff872c83d53e} + + + {ea9586f4-ee8c-4416-b1a4-184ba3dfafc4} + + + {ffd86797-9317-40cf-92d2-e1dab63ad857} + + + {aee7169a-a4bd-4889-8d5b-7292f7a5ecbe} + + + + + + Collision + + + Collision + + + Collision + + + Collision + + + Collision + + + Collision\Shapes + + + Collision\Shapes + + + Collision\Shapes + + + Collision\Shapes + + + Collision\Shapes + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Dynamics + + + Dynamics + + + Dynamics + + + Dynamics + + + Dynamics + + + Dynamics + + + Dynamics + + + Dynamics\Joints + + + Dynamics\Joints + + + Dynamics\Joints + + + Dynamics\Joints + + + Dynamics\Joints + + + Dynamics\Joints + + + Dynamics\Joints + + + Dynamics\Joints + + + Dynamics\Joints + + + Dynamics\Joints + + + Dynamics\Joints + + + Dynamics\Joints + + + Dynamics\Contacts + + + Dynamics\Contacts + + + Dynamics\Contacts + + + Dynamics\Contacts + + + Dynamics\Contacts + + + Dynamics\Contacts + + + Dynamics\Contacts + + + Dynamics\Contacts + + + Dynamics\Contacts + + + Rope + + + + + Collision + + + Collision + + + Collision + + + Collision + + + Collision + + + Collision + + + Collision + + + Collision + + + Collision\Shapes + + + Collision\Shapes + + + Collision\Shapes + + + Collision\Shapes + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Dynamics + + + Dynamics + + + Dynamics + + + Dynamics + + + Dynamics + + + Dynamics + + + Dynamics\Joints + + + Dynamics\Joints + + + Dynamics\Joints + + + Dynamics\Joints + + + Dynamics\Joints + + + Dynamics\Joints + + + Dynamics\Joints + + + Dynamics\Joints + + + Dynamics\Joints + + + Dynamics\Joints + + + Dynamics\Joints + + + Dynamics\Joints + + + Dynamics\Contacts + + + Dynamics\Contacts + + + Dynamics\Contacts + + + Dynamics\Contacts + + + Dynamics\Contacts + + + Dynamics\Contacts + + + Dynamics\Contacts + + + Dynamics\Contacts + + + Dynamics\Contacts + + + Rope + + + \ No newline at end of file diff --git a/Build/3rdParty/Box2D/Box2D.vcxproj.user b/Build/3rdParty/Box2D/Box2D.vcxproj.user new file mode 100644 index 0000000..be25078 --- /dev/null +++ b/Build/3rdParty/Box2D/Box2D.vcxproj.user @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/Build/3rdParty/box2d/box2d.vcxproj b/Build/3rdParty/box2d/box2d.vcxproj index 94b9b8d..2eef062 100644 --- a/Build/3rdParty/box2d/box2d.vcxproj +++ b/Build/3rdParty/box2d/box2d.vcxproj @@ -20,8 +20,8 @@ 15.0 - {0B4207C7-3246-47CE-AA9C-4E2C0CA3C09B} - box2d + {4122CC44-1E4C-4A08-B16F-1A650585EBD4} + Box2D 10.0.17134.0 @@ -76,6 +76,7 @@ Disabled true true + $(SolutionDir)..\Source\3rdparty\;%(AdditionalIncludeDirectories) @@ -84,6 +85,7 @@ Disabled true true + $(SolutionDir)..\Source\3rdparty\;%(AdditionalIncludeDirectories) @@ -94,6 +96,7 @@ true true true + $(SolutionDir)..\Source\3rdparty\;%(AdditionalIncludeDirectories) true @@ -108,6 +111,7 @@ true true true + $(SolutionDir)..\Source\3rdparty\;%(AdditionalIncludeDirectories) true @@ -115,6 +119,101 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Build/3rdParty/box2d/box2d.vcxproj.filters b/Build/3rdParty/box2d/box2d.vcxproj.filters index 3c6f4fd..bad924b 100644 --- a/Build/3rdParty/box2d/box2d.vcxproj.filters +++ b/Build/3rdParty/box2d/box2d.vcxproj.filters @@ -1,17 +1,307 @@  - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + {54962725-7c7b-450f-83e8-9e47db0acd9d} - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hh;hpp;hxx;hm;inl;inc;ipp;xsd + + {0e29a4d3-8d20-4856-80fa-e76df88b4b7c} - - {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 + + {15794cf3-b31e-4a81-8e15-d4dfd1d17e4d} + + {cf0b3c53-c1c7-4fcf-8796-ff872c83d53e} + + + {ea9586f4-ee8c-4416-b1a4-184ba3dfafc4} + + + {ffd86797-9317-40cf-92d2-e1dab63ad857} + + + {aee7169a-a4bd-4889-8d5b-7292f7a5ecbe} + + + + + + Collision + + + Collision + + + Collision + + + Collision + + + Collision + + + Collision\Shapes + + + Collision\Shapes + + + Collision\Shapes + + + Collision\Shapes + + + Collision\Shapes + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Dynamics + + + Dynamics + + + Dynamics + + + Dynamics + + + Dynamics + + + Dynamics + + + Dynamics + + + Dynamics\Joints + + + Dynamics\Joints + + + Dynamics\Joints + + + Dynamics\Joints + + + Dynamics\Joints + + + Dynamics\Joints + + + Dynamics\Joints + + + Dynamics\Joints + + + Dynamics\Joints + + + Dynamics\Joints + + + Dynamics\Joints + + + Dynamics\Joints + + + Dynamics\Contacts + + + Dynamics\Contacts + + + Dynamics\Contacts + + + Dynamics\Contacts + + + Dynamics\Contacts + + + Dynamics\Contacts + + + Dynamics\Contacts + + + Dynamics\Contacts + + + Dynamics\Contacts + + + Rope + + + + + Collision + + + Collision + + + Collision + + + Collision + + + Collision + + + Collision + + + Collision + + + Collision + + + Collision\Shapes + + + Collision\Shapes + + + Collision\Shapes + + + Collision\Shapes + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Dynamics + + + Dynamics + + + Dynamics + + + Dynamics + + + Dynamics + + + Dynamics + + + Dynamics\Joints + + + Dynamics\Joints + + + Dynamics\Joints + + + Dynamics\Joints + + + Dynamics\Joints + + + Dynamics\Joints + + + Dynamics\Joints + + + Dynamics\Joints + + + Dynamics\Joints + + + Dynamics\Joints + + + Dynamics\Joints + + + Dynamics\Joints + + + Dynamics\Contacts + + + Dynamics\Contacts + + + Dynamics\Contacts + + + Dynamics\Contacts + + + Dynamics\Contacts + + + Dynamics\Contacts + + + Dynamics\Contacts + + + Dynamics\Contacts + + + Dynamics\Contacts + + + Rope + \ No newline at end of file diff --git a/Build/Asura.sln b/Build/Asura.sln index 852fc1a..657022b 100644 --- a/Build/Asura.sln +++ b/Build/Asura.sln @@ -35,8 +35,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDL2main", "3rdParty\SDL2ma EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "3rdParty\zlib\zlib.vcxproj", "{AF237AA3-67F7-4C93-8249-920DB2878192}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "box2d", "3rdParty\box2d\box2d.vcxproj", "{0B4207C7-3246-47CE-AA9C-4E2C0CA3C09B}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OpenAL", "3rdParty\OpenAL\OpenAL.vcxproj", "{38019689-27C2-488F-9C50-36CA6930CEB7}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mpg123", "3rdParty\mpg123\mpg123.vcxproj", "{83E0897A-E2F4-4057-8077-59C4A0C38E56}" @@ -45,6 +43,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Asura", "Asura\Asura.vcxpro EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Asura.Packer", "Asura.Compiler\Asura.Packer\Asura.Packer.vcxproj", "{DDC9C7EE-C852-4DF0-99C5-7FCE48BC5C9F}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Box2D", "3rdParty\Box2D\Box2D.vcxproj", "{4122CC44-1E4C-4A08-B16F-1A650585EBD4}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|x64 = Debug|x64 @@ -165,14 +165,6 @@ Global {AF237AA3-67F7-4C93-8249-920DB2878192}.Release|x64.Build.0 = Release|x64 {AF237AA3-67F7-4C93-8249-920DB2878192}.Release|x86.ActiveCfg = Release|Win32 {AF237AA3-67F7-4C93-8249-920DB2878192}.Release|x86.Build.0 = Release|Win32 - {0B4207C7-3246-47CE-AA9C-4E2C0CA3C09B}.Debug|x64.ActiveCfg = Debug|x64 - {0B4207C7-3246-47CE-AA9C-4E2C0CA3C09B}.Debug|x64.Build.0 = Debug|x64 - {0B4207C7-3246-47CE-AA9C-4E2C0CA3C09B}.Debug|x86.ActiveCfg = Debug|Win32 - {0B4207C7-3246-47CE-AA9C-4E2C0CA3C09B}.Debug|x86.Build.0 = Debug|Win32 - {0B4207C7-3246-47CE-AA9C-4E2C0CA3C09B}.Release|x64.ActiveCfg = Release|x64 - {0B4207C7-3246-47CE-AA9C-4E2C0CA3C09B}.Release|x64.Build.0 = Release|x64 - {0B4207C7-3246-47CE-AA9C-4E2C0CA3C09B}.Release|x86.ActiveCfg = Release|Win32 - {0B4207C7-3246-47CE-AA9C-4E2C0CA3C09B}.Release|x86.Build.0 = Release|Win32 {38019689-27C2-488F-9C50-36CA6930CEB7}.Debug|x64.ActiveCfg = Debug|x64 {38019689-27C2-488F-9C50-36CA6930CEB7}.Debug|x64.Build.0 = Debug|x64 {38019689-27C2-488F-9C50-36CA6930CEB7}.Debug|x86.ActiveCfg = Debug|Win32 @@ -205,6 +197,14 @@ Global {DDC9C7EE-C852-4DF0-99C5-7FCE48BC5C9F}.Release|x64.Build.0 = Release|x64 {DDC9C7EE-C852-4DF0-99C5-7FCE48BC5C9F}.Release|x86.ActiveCfg = Release|Win32 {DDC9C7EE-C852-4DF0-99C5-7FCE48BC5C9F}.Release|x86.Build.0 = Release|Win32 + {4122CC44-1E4C-4A08-B16F-1A650585EBD4}.Debug|x64.ActiveCfg = Debug|x64 + {4122CC44-1E4C-4A08-B16F-1A650585EBD4}.Debug|x64.Build.0 = Debug|x64 + {4122CC44-1E4C-4A08-B16F-1A650585EBD4}.Debug|x86.ActiveCfg = Debug|Win32 + {4122CC44-1E4C-4A08-B16F-1A650585EBD4}.Debug|x86.Build.0 = Debug|Win32 + {4122CC44-1E4C-4A08-B16F-1A650585EBD4}.Release|x64.ActiveCfg = Release|x64 + {4122CC44-1E4C-4A08-B16F-1A650585EBD4}.Release|x64.Build.0 = Release|x64 + {4122CC44-1E4C-4A08-B16F-1A650585EBD4}.Release|x86.ActiveCfg = Release|Win32 + {4122CC44-1E4C-4A08-B16F-1A650585EBD4}.Release|x86.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -218,9 +218,9 @@ Global {208B9CB8-2101-42A9-9502-0CF54912BC57} = {64D4E4B2-4A60-46F4-A500-370EFED4524F} {E34EAF11-27F4-41E9-BBC6-9CE5DE3359BA} = {64D4E4B2-4A60-46F4-A500-370EFED4524F} {AF237AA3-67F7-4C93-8249-920DB2878192} = {64D4E4B2-4A60-46F4-A500-370EFED4524F} - {0B4207C7-3246-47CE-AA9C-4E2C0CA3C09B} = {64D4E4B2-4A60-46F4-A500-370EFED4524F} {38019689-27C2-488F-9C50-36CA6930CEB7} = {64D4E4B2-4A60-46F4-A500-370EFED4524F} {83E0897A-E2F4-4057-8077-59C4A0C38E56} = {64D4E4B2-4A60-46F4-A500-370EFED4524F} + {4122CC44-1E4C-4A08-B16F-1A650585EBD4} = {64D4E4B2-4A60-46F4-A500-370EFED4524F} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {331032D8-F7CC-43E3-A03B-67108767F96B} -- cgit v1.1-26-g67d0