From 3011504dd5d006b9004232f7439e68aeeb8edcf7 Mon Sep 17 00:00:00 2001 From: chai Date: Mon, 28 Jan 2019 13:20:28 +0800 Subject: +sdl freetype --- Build/3rdParty/SDL2/SDL2.vcxproj | 313 ++++++++++++++++++++ Build/3rdParty/SDL2/SDL2.vcxproj.filters | 321 ++++++++++++++++++++- Build/3rdParty/SDL2main/SDL2main.vcxproj | 5 + Build/3rdParty/SDL2main/SDL2main.vcxproj.filters | 13 +- Build/3rdParty/freetype/freetype.vcxproj | 71 +++++ Build/3rdParty/freetype/freetype.vcxproj.filters | 225 ++++++++++++++- .../Asura.Packer/Asura.Packer.vcxproj | 7 +- .../Asura.Packer/Asura.Packer.vcxproj.filters | 6 +- Build/Asura.Editor/Asura.Editor.vcxproj | 3 - Build/Asura.Editor/Asura.Editor.vcxproj.filters | 8 - Build/Asura.Engine/Asura.Engine.vcxproj | 9 +- Build/Asura.Engine/Asura.Engine.vcxproj.filters | 3 + Build/Asura.sln | 31 +- 13 files changed, 936 insertions(+), 79 deletions(-) (limited to 'Build') diff --git a/Build/3rdParty/SDL2/SDL2.vcxproj b/Build/3rdParty/SDL2/SDL2.vcxproj index 077a25c..9a61b1c 100644 --- a/Build/3rdParty/SDL2/SDL2.vcxproj +++ b/Build/3rdParty/SDL2/SDL2.vcxproj @@ -76,6 +76,7 @@ Disabled true true + $(SolutionDir)..\Source\3rdparty\SDL2\include;%(AdditionalIncludeDirectories) @@ -84,6 +85,7 @@ Disabled true true + $(SolutionDir)..\Source\3rdparty\SDL2\include;%(AdditionalIncludeDirectories) @@ -94,6 +96,7 @@ true true true + $(SolutionDir)..\Source\3rdparty\SDL2\include;%(AdditionalIncludeDirectories) true @@ -108,6 +111,7 @@ true true true + $(SolutionDir)..\Source\3rdparty\SDL2\include;%(AdditionalIncludeDirectories) true @@ -115,6 +119,315 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Build/3rdParty/SDL2/SDL2.vcxproj.filters b/Build/3rdParty/SDL2/SDL2.vcxproj.filters index 3c6f4fd..2b0eb8a 100644 --- a/Build/3rdParty/SDL2/SDL2.vcxproj.filters +++ b/Build/3rdParty/SDL2/SDL2.vcxproj.filters @@ -1,17 +1,314 @@  - - {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/3rdParty/SDL2main/SDL2main.vcxproj b/Build/3rdParty/SDL2main/SDL2main.vcxproj index 79459eb..042c535 100644 --- a/Build/3rdParty/SDL2main/SDL2main.vcxproj +++ b/Build/3rdParty/SDL2main/SDL2main.vcxproj @@ -76,6 +76,7 @@ Disabled true true + $(SolutionDir)..\Source\3rdparty\SDL2\include;%(AdditionalIncludeDirectories) @@ -84,6 +85,7 @@ Disabled true true + $(SolutionDir)..\Source\3rdparty\SDL2\include;%(AdditionalIncludeDirectories) @@ -94,6 +96,7 @@ true true true + $(SolutionDir)..\Source\3rdparty\SDL2\include;%(AdditionalIncludeDirectories) true @@ -108,6 +111,7 @@ true true true + $(SolutionDir)..\Source\3rdparty\SDL2\include;%(AdditionalIncludeDirectories) true @@ -115,6 +119,7 @@ + diff --git a/Build/3rdParty/SDL2main/SDL2main.vcxproj.filters b/Build/3rdParty/SDL2main/SDL2main.vcxproj.filters index 3c6f4fd..b4129fa 100644 --- a/Build/3rdParty/SDL2main/SDL2main.vcxproj.filters +++ b/Build/3rdParty/SDL2main/SDL2main.vcxproj.filters @@ -1,17 +1,6 @@  - - {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/3rdParty/freetype/freetype.vcxproj b/Build/3rdParty/freetype/freetype.vcxproj index 255f515..076d248 100644 --- a/Build/3rdParty/freetype/freetype.vcxproj +++ b/Build/3rdParty/freetype/freetype.vcxproj @@ -115,6 +115,77 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Build/3rdParty/freetype/freetype.vcxproj.filters b/Build/3rdParty/freetype/freetype.vcxproj.filters index 3c6f4fd..9b09931 100644 --- a/Build/3rdParty/freetype/freetype.vcxproj.filters +++ b/Build/3rdParty/freetype/freetype.vcxproj.filters @@ -1,17 +1,222 @@  - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + {d03885a0-3936-4b36-be6f-79cf2dcc65f1} - - {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 + + {1696baf0-bf31-4e38-abea-614704403127} + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + + + Source Files + + + Source Files + + + Source Files + + \ No newline at end of file diff --git a/Build/Asura.Compiler/Asura.Packer/Asura.Packer.vcxproj b/Build/Asura.Compiler/Asura.Packer/Asura.Packer.vcxproj index a1869e3..72a9787 100644 --- a/Build/Asura.Compiler/Asura.Packer/Asura.Packer.vcxproj +++ b/Build/Asura.Compiler/Asura.Packer/Asura.Packer.vcxproj @@ -20,7 +20,7 @@ 15.0 - {6B47FB6E-4A0B-4B4E-9479-F2DA1F48BC07} + {DDC9C7EE-C852-4DF0-99C5-7FCE48BC5C9F} AsuraPacker 10.0.17134.0 @@ -70,7 +70,7 @@ - + Level3 Disabled @@ -78,7 +78,7 @@ true - + Level3 Disabled @@ -115,7 +115,6 @@ - diff --git a/Build/Asura.Compiler/Asura.Packer/Asura.Packer.vcxproj.filters b/Build/Asura.Compiler/Asura.Packer/Asura.Packer.vcxproj.filters index 2c4b403..9cd8510 100644 --- a/Build/Asura.Compiler/Asura.Packer/Asura.Packer.vcxproj.filters +++ b/Build/Asura.Compiler/Asura.Packer/Asura.Packer.vcxproj.filters @@ -1,6 +1,2 @@  - - - - - \ No newline at end of file + \ No newline at end of file diff --git a/Build/Asura.Editor/Asura.Editor.vcxproj b/Build/Asura.Editor/Asura.Editor.vcxproj index 7603ce6..f69f18b 100644 --- a/Build/Asura.Editor/Asura.Editor.vcxproj +++ b/Build/Asura.Editor/Asura.Editor.vcxproj @@ -119,9 +119,6 @@ true - - - {c402199a-49c2-4568-ae79-b56cb3b510d3} diff --git a/Build/Asura.Editor/Asura.Editor.vcxproj.filters b/Build/Asura.Editor/Asura.Editor.vcxproj.filters index bbc7d2a..98bd8cc 100644 --- a/Build/Asura.Editor/Asura.Editor.vcxproj.filters +++ b/Build/Asura.Editor/Asura.Editor.vcxproj.filters @@ -7,14 +7,6 @@ {df219ecb-2a99-443c-9313-5a6dc80a3255} - - {d9c4718f-cf20-4282-acc4-9bc96e02907c} - - - - - Scripts - diff --git a/Build/Asura.Engine/Asura.Engine.vcxproj b/Build/Asura.Engine/Asura.Engine.vcxproj index fcacefa..2cbffb6 100644 --- a/Build/Asura.Engine/Asura.Engine.vcxproj +++ b/Build/Asura.Engine/Asura.Engine.vcxproj @@ -81,7 +81,7 @@ Disabled true true - $(SolutionDir)..\Source\3rdParty;$(SolutionDir)..\Source\Asura.Engine;%(AdditionalIncludeDirectories) + $(SolutionDir)..\Source\3rdParty;$(SolutionDir)..\Source\Asura.Engine;$(SolutionDir)..\Source\3rdparty\SDL2\include;%(AdditionalIncludeDirectories) @@ -90,7 +90,7 @@ Disabled true true - $(SolutionDir)..\Source\3rdParty;$(SolutionDir)..\Source\Asura.Engine;%(AdditionalIncludeDirectories) + $(SolutionDir)..\Source\3rdParty;$(SolutionDir)..\Source\Asura.Engine;$(SolutionDir)..\Source\3rdparty\SDL2\include;%(AdditionalIncludeDirectories) @@ -101,7 +101,7 @@ true true true - $(SolutionDir)..\Source\3rdParty;$(SolutionDir)..\Source\Asura.Engine;%(AdditionalIncludeDirectories) + $(SolutionDir)..\Source\3rdParty;$(SolutionDir)..\Source\Asura.Engine;$(SolutionDir)..\Source\3rdparty\SDL2\include;%(AdditionalIncludeDirectories) true @@ -116,7 +116,7 @@ true true true - $(SolutionDir)..\Source\3rdParty;$(SolutionDir)..\Source\Asura.Engine;%(AdditionalIncludeDirectories) + $(SolutionDir)..\Source\3rdParty;$(SolutionDir)..\Source\Asura.Engine;$(SolutionDir)..\Source\3rdparty\SDL2\include;%(AdditionalIncludeDirectories) true @@ -162,6 +162,7 @@ + diff --git a/Build/Asura.Engine/Asura.Engine.vcxproj.filters b/Build/Asura.Engine/Asura.Engine.vcxproj.filters index 30e111e..3cb7563 100644 --- a/Build/Asura.Engine/Asura.Engine.vcxproj.filters +++ b/Build/Asura.Engine/Asura.Engine.vcxproj.filters @@ -221,5 +221,8 @@ Graphics + + FileSystem + \ No newline at end of file diff --git a/Build/Asura.sln b/Build/Asura.sln index e4c85ef..852fc1a 100644 --- a/Build/Asura.sln +++ b/Build/Asura.sln @@ -25,8 +25,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LuaJIT", "3rdParty\LuaJIT\L EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lua51c", "3rdParty\lua51c\lua51c.vcxproj", "{B8F9616D-5393-4B34-B191-D200D1985439}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Asura.Packer", "Asura.Compiler\Asura.Packer\Asura.Packer.vcxproj", "{6B47FB6E-4A0B-4B4E-9479-F2DA1F48BC07}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Asura.Unpacker", "Asura.Unpacker\Asura.Unpacker.vcxproj", "{092155A4-23DF-49E1-9353-03C4DDBAB7BC}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Samples", "Samples", "{E068D138-C824-4365-B5A3-27C65E8FD0B5}" @@ -35,8 +33,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDL2", "3rdParty\SDL2\SDL2. EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDL2main", "3rdParty\SDL2main\SDL2main.vcxproj", "{E34EAF11-27F4-41E9-BBC6-9CE5DE3359BA}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "freetype", "3rdParty\freetype\freetype.vcxproj", "{4B970273-A352-433B-98B2-B4BF6DF72F71}" -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}" @@ -47,6 +43,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mpg123", "3rdParty\mpg123\m EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Asura", "Asura\Asura.vcxproj", "{8C1B90A5-8757-4197-9FB2-A38A7EA75849}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Asura.Packer", "Asura.Compiler\Asura.Packer\Asura.Packer.vcxproj", "{DDC9C7EE-C852-4DF0-99C5-7FCE48BC5C9F}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|x64 = Debug|x64 @@ -135,14 +133,6 @@ Global {B8F9616D-5393-4B34-B191-D200D1985439}.Release|x64.Build.0 = Release|x64 {B8F9616D-5393-4B34-B191-D200D1985439}.Release|x86.ActiveCfg = Release|Win32 {B8F9616D-5393-4B34-B191-D200D1985439}.Release|x86.Build.0 = Release|Win32 - {6B47FB6E-4A0B-4B4E-9479-F2DA1F48BC07}.Debug|x64.ActiveCfg = Debug|x64 - {6B47FB6E-4A0B-4B4E-9479-F2DA1F48BC07}.Debug|x64.Build.0 = Debug|x64 - {6B47FB6E-4A0B-4B4E-9479-F2DA1F48BC07}.Debug|x86.ActiveCfg = Debug|Win32 - {6B47FB6E-4A0B-4B4E-9479-F2DA1F48BC07}.Debug|x86.Build.0 = Debug|Win32 - {6B47FB6E-4A0B-4B4E-9479-F2DA1F48BC07}.Release|x64.ActiveCfg = Release|x64 - {6B47FB6E-4A0B-4B4E-9479-F2DA1F48BC07}.Release|x64.Build.0 = Release|x64 - {6B47FB6E-4A0B-4B4E-9479-F2DA1F48BC07}.Release|x86.ActiveCfg = Release|Win32 - {6B47FB6E-4A0B-4B4E-9479-F2DA1F48BC07}.Release|x86.Build.0 = Release|Win32 {092155A4-23DF-49E1-9353-03C4DDBAB7BC}.Debug|x64.ActiveCfg = Debug|x64 {092155A4-23DF-49E1-9353-03C4DDBAB7BC}.Debug|x64.Build.0 = Debug|x64 {092155A4-23DF-49E1-9353-03C4DDBAB7BC}.Debug|x86.ActiveCfg = Debug|Win32 @@ -167,14 +157,6 @@ Global {E34EAF11-27F4-41E9-BBC6-9CE5DE3359BA}.Release|x64.Build.0 = Release|x64 {E34EAF11-27F4-41E9-BBC6-9CE5DE3359BA}.Release|x86.ActiveCfg = Release|Win32 {E34EAF11-27F4-41E9-BBC6-9CE5DE3359BA}.Release|x86.Build.0 = Release|Win32 - {4B970273-A352-433B-98B2-B4BF6DF72F71}.Debug|x64.ActiveCfg = Debug|x64 - {4B970273-A352-433B-98B2-B4BF6DF72F71}.Debug|x64.Build.0 = Debug|x64 - {4B970273-A352-433B-98B2-B4BF6DF72F71}.Debug|x86.ActiveCfg = Debug|Win32 - {4B970273-A352-433B-98B2-B4BF6DF72F71}.Debug|x86.Build.0 = Debug|Win32 - {4B970273-A352-433B-98B2-B4BF6DF72F71}.Release|x64.ActiveCfg = Release|x64 - {4B970273-A352-433B-98B2-B4BF6DF72F71}.Release|x64.Build.0 = Release|x64 - {4B970273-A352-433B-98B2-B4BF6DF72F71}.Release|x86.ActiveCfg = Release|Win32 - {4B970273-A352-433B-98B2-B4BF6DF72F71}.Release|x86.Build.0 = Release|Win32 {AF237AA3-67F7-4C93-8249-920DB2878192}.Debug|x64.ActiveCfg = Debug|x64 {AF237AA3-67F7-4C93-8249-920DB2878192}.Debug|x64.Build.0 = Debug|x64 {AF237AA3-67F7-4C93-8249-920DB2878192}.Debug|x86.ActiveCfg = Debug|Win32 @@ -215,6 +197,14 @@ Global {8C1B90A5-8757-4197-9FB2-A38A7EA75849}.Release|x64.Build.0 = Release|x64 {8C1B90A5-8757-4197-9FB2-A38A7EA75849}.Release|x86.ActiveCfg = Release|Win32 {8C1B90A5-8757-4197-9FB2-A38A7EA75849}.Release|x86.Build.0 = Release|Win32 + {DDC9C7EE-C852-4DF0-99C5-7FCE48BC5C9F}.Debug|x64.ActiveCfg = Debug|x64 + {DDC9C7EE-C852-4DF0-99C5-7FCE48BC5C9F}.Debug|x64.Build.0 = Debug|x64 + {DDC9C7EE-C852-4DF0-99C5-7FCE48BC5C9F}.Debug|x86.ActiveCfg = Debug|Win32 + {DDC9C7EE-C852-4DF0-99C5-7FCE48BC5C9F}.Debug|x86.Build.0 = Debug|Win32 + {DDC9C7EE-C852-4DF0-99C5-7FCE48BC5C9F}.Release|x64.ActiveCfg = Release|x64 + {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 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -227,7 +217,6 @@ Global {B8F9616D-5393-4B34-B191-D200D1985439} = {64D4E4B2-4A60-46F4-A500-370EFED4524F} {208B9CB8-2101-42A9-9502-0CF54912BC57} = {64D4E4B2-4A60-46F4-A500-370EFED4524F} {E34EAF11-27F4-41E9-BBC6-9CE5DE3359BA} = {64D4E4B2-4A60-46F4-A500-370EFED4524F} - {4B970273-A352-433B-98B2-B4BF6DF72F71} = {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} -- cgit v1.1-26-g67d0