Merge pull request #3608 from larsbrubaker/master
Getting MaterControl solution to build
This commit is contained in:
Lars Brubaker
GitHub
commit
d80aaabfe2
7 changed files with 51 additions and 19 deletions
|
|
@ -85,6 +85,11 @@ namespace MatterHackers.MatterControl.DesignTools.Operations
|
|||
}
|
||||
}
|
||||
|
||||
public static int EstimatedMemory(this IObject3D object3D)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
public static bool IsRoot(this IObject3D object3D)
|
||||
{
|
||||
return object3D.Parent == null;
|
||||
|
|
|
|||
|
|
@ -37,6 +37,7 @@ namespace MatterHackers.MatterControl
|
|||
using MatterHackers.Agg.Image;
|
||||
using MatterHackers.Agg.Platform;
|
||||
using MatterHackers.DataConverters3D;
|
||||
using MatterHackers.MatterControl.DesignTools.Operations;
|
||||
using MatterHackers.MatterControl.Library;
|
||||
using MatterHackers.RayTracer;
|
||||
|
||||
|
|
|
|||
|
|
@ -541,6 +541,9 @@
|
|||
<Compile Include="PrinterCommunication\Io\SendProgressStream.cs" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="C5, Version=2.5.0.0, Culture=neutral, PublicKeyToken=282361b99ded7e8e, processorArchitecture=MSIL">
|
||||
<HintPath>packages\C5.2.5.3\lib\net45\C5.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Markdig, Version=0.15.0.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>packages\Markdig.0.15.0\lib\net40\Markdig.dll</HintPath>
|
||||
</Reference>
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MatterControl", "MatterCont
|
|||
{670BDDFF-927B-425D-9DD1-22ACB14356EB} = {670BDDFF-927B-425D-9DD1-22ACB14356EB}
|
||||
EndProjectSection
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tesselate", "Submodules\agg-sharp\Tesselate\Tesselate.csproj", "{AE37DE1F-22F7-49EE-8732-FC6BC8DC58D9}"
|
||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tesselate", "Submodules\agg-sharp\Tesselate\Tesselate.csproj", "{AE37DE1F-22F7-49EE-8732-FC6BC8DC58D9}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PlatformWin32", "Submodules\agg-sharp\PlatformWin32\PlatformWin32.csproj", "{670BDDFF-927B-425D-9DD1-22ACB14356EB}"
|
||||
ProjectSection(ProjectDependencies) = postProject
|
||||
|
|
@ -32,27 +32,27 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PlatformWin32", "Submodules
|
|||
{657DBC6D-C3EA-4398-A3FA-DDB73C14F71B} = {657DBC6D-C3EA-4398-A3FA-DDB73C14F71B}
|
||||
EndProjectSection
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VectorMath", "Submodules\agg-sharp\VectorMath\VectorMath.csproj", "{D3E41B4E-BFBB-44CA-94C8-95C00F754FDD}"
|
||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VectorMath", "Submodules\agg-sharp\VectorMath\VectorMath.csproj", "{D3E41B4E-BFBB-44CA-94C8-95C00F754FDD}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RenderOpenGl", "Submodules\agg-sharp\RenderOpenGl\RenderOpenGl.csproj", "{545B6912-77FF-4B34-BA76-6C3D6A32BE6A}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Gui", "Submodules\agg-sharp\Gui\Gui.csproj", "{74F6BB6C-9D02-4512-A59A-21940E35C532}"
|
||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Gui", "Submodules\agg-sharp\Gui\Gui.csproj", "{74F6BB6C-9D02-4512-A59A-21940E35C532}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Csg", "Submodules\agg-sharp\Csg\Csg.csproj", "{7E61A5BD-E78F-4B80-88C9-3821B4FA062E}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PolygonMesh", "Submodules\agg-sharp\PolygonMesh\PolygonMesh.csproj", "{86F6AAF2-9B50-40B8-A427-1897D76471C5}"
|
||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PolygonMesh", "Submodules\agg-sharp\PolygonMesh\PolygonMesh.csproj", "{86F6AAF2-9B50-40B8-A427-1897D76471C5}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Agg", "Submodules\agg-sharp\agg\Agg.csproj", "{657DBC6D-C3EA-4398-A3FA-DDB73C14F71B}"
|
||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Agg", "Submodules\agg-sharp\agg\Agg.csproj", "{657DBC6D-C3EA-4398-A3FA-DDB73C14F71B}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Community.CsharpSqlite", "Community.CsharpSqlite\Community.CsharpSqlite.csproj", "{F1653F20-D47D-4F29-8C55-3C835542AF5F}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RayTracer", "Submodules\agg-sharp\RayTracer\RayTracer.csproj", "{1E01ABE0-B494-4FE4-B0D6-540133286887}"
|
||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RayTracer", "Submodules\agg-sharp\RayTracer\RayTracer.csproj", "{1E01ABE0-B494-4FE4-B0D6-540133286887}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Localizations", "Submodules\agg-sharp\Localizations\Localizations.csproj", "{CA96058C-1A37-465D-A357-D6D695B13D25}"
|
||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Localizations", "Submodules\agg-sharp\Localizations\Localizations.csproj", "{CA96058C-1A37-465D-A357-D6D695B13D25}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ImageProcessing", "Submodules\agg-sharp\ImageProcessing\ImageProcessing.csproj", "{036BCCBA-52D8-457C-84AE-8821F209FE4A}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "clipper_library", "Submodules\agg-sharp\clipper_library\clipper_library.csproj", "{9B062971-A88E-4A3D-B3C9-12B78D15FA66}"
|
||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "clipper_library", "Submodules\agg-sharp\clipper_library\clipper_library.csproj", "{9B062971-A88E-4A3D-B3C9-12B78D15FA66}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MarchingSquares", "Submodules\agg-sharp\MarchingSquares\MarchingSquares.csproj", "{DF6845CD-64C6-4263-8357-DA8066855739}"
|
||||
EndProject
|
||||
|
|
@ -68,7 +68,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "InfInstaller", "PrinterDriv
|
|||
EndProject
|
||||
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{FBE6DF29-85A9-4A8B-B739-35BE4CA0A9B7}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DataConverters3D", "Submodules\agg-sharp\DataConverters3D\DataConverters3D.csproj", "{04667764-DC7B-4B95-AEF6-B4E6C87A54E9}"
|
||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DataConverters3D", "Submodules\agg-sharp\DataConverters3D\DataConverters3D.csproj", "{04667764-DC7B-4B95-AEF6-B4E6C87A54E9}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MatterControl.Tests", "Tests\MatterControl.Tests\MatterControl.Tests.csproj", "{E1455E5C-127C-4282-8CC5-452C300E91D0}"
|
||||
EndProject
|
||||
|
|
@ -78,13 +78,13 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MatterSlice.Tests", "Submod
|
|||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GuiAutomation", "Submodules\agg-sharp\GuiAutomation\GuiAutomation.csproj", "{E9102310-0029-4D8F-B1E9-88FBA6147D45}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DataConverters2D", "Submodules\agg-sharp\DataConverters2D\DataConverters2D.csproj", "{94838988-523C-4B11-AD82-8B9B76F23A31}"
|
||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DataConverters2D", "Submodules\agg-sharp\DataConverters2D\DataConverters2D.csproj", "{94838988-523C-4B11-AD82-8B9B76F23A31}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MatterControl.AutomationTests", "Tests\MatterControl.AutomationTests\MatterControl.AutomationTests.csproj", "{418E7058-92EE-4329-86BA-AC26B65AFB25}"
|
||||
EndProject
|
||||
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tools", "Tools", "{FED00F38-E911-45E1-A788-26980E84C3D6}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Net3dBool", "Submodules\agg-sharp\PolygonMesh\Net3dBool\Net3dBool.csproj", "{7EE4636D-8A92-4015-9562-7FCD6ADD0645}"
|
||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Net3dBool", "Submodules\agg-sharp\PolygonMesh\Net3dBool\Net3dBool.csproj", "{7EE4636D-8A92-4015-9562-7FCD6ADD0645}"
|
||||
EndProject
|
||||
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "MatterSlice", "MatterSlice", "{57647FCB-8F00-4C05-972C-3CF6ACD12A63}"
|
||||
EndProject
|
||||
|
|
@ -100,6 +100,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MatterControl.OpenGL", "Mat
|
|||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MatterControl.Printing", "MatterControl.Printing\MatterControl.Printing.csproj", "{97D5ADE3-C1B4-4B46-8A3E-718A4F7F079F}"
|
||||
EndProject
|
||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Typography.GlyphLayout", "Submodules\agg-sharp\Typography.GlyphLayout\Typography.GlyphLayout.csproj", "{DE958333-2467-409D-904D-92C9CCD0BA52}"
|
||||
EndProject
|
||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Typography.OpenFont", "Submodules\agg-sharp\Typography.OpenFont\Typography.OpenFont.csproj", "{723AE80D-A512-4CF0-9F5A-8CC7323A26BB}"
|
||||
EndProject
|
||||
Global
|
||||
GlobalSection(SharedMSBuildProjectFiles) = preSolution
|
||||
Submodules\agg-sharp\Typography.GlyphLayout\Typography.GlyphLayout.projitems*{657dbc6d-c3ea-4398-a3fa-ddb73c14f71b}*SharedItemsImports = 4
|
||||
|
|
@ -376,6 +380,22 @@ Global
|
|||
{97D5ADE3-C1B4-4B46-8A3E-718A4F7F079F}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{97D5ADE3-C1B4-4B46-8A3E-718A4F7F079F}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
|
||||
{97D5ADE3-C1B4-4B46-8A3E-718A4F7F079F}.Release|Mixed Platforms.Build.0 = Release|Any CPU
|
||||
{DE958333-2467-409D-904D-92C9CCD0BA52}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{DE958333-2467-409D-904D-92C9CCD0BA52}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{DE958333-2467-409D-904D-92C9CCD0BA52}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
|
||||
{DE958333-2467-409D-904D-92C9CCD0BA52}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
|
||||
{DE958333-2467-409D-904D-92C9CCD0BA52}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{DE958333-2467-409D-904D-92C9CCD0BA52}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{DE958333-2467-409D-904D-92C9CCD0BA52}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
|
||||
{DE958333-2467-409D-904D-92C9CCD0BA52}.Release|Mixed Platforms.Build.0 = Release|Any CPU
|
||||
{723AE80D-A512-4CF0-9F5A-8CC7323A26BB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{723AE80D-A512-4CF0-9F5A-8CC7323A26BB}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{723AE80D-A512-4CF0-9F5A-8CC7323A26BB}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
|
||||
{723AE80D-A512-4CF0-9F5A-8CC7323A26BB}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
|
||||
{723AE80D-A512-4CF0-9F5A-8CC7323A26BB}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{723AE80D-A512-4CF0-9F5A-8CC7323A26BB}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{723AE80D-A512-4CF0-9F5A-8CC7323A26BB}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
|
||||
{723AE80D-A512-4CF0-9F5A-8CC7323A26BB}.Release|Mixed Platforms.Build.0 = Release|Any CPU
|
||||
EndGlobalSection
|
||||
GlobalSection(SolutionProperties) = preSolution
|
||||
HideSolutionNode = FALSE
|
||||
|
|
@ -412,6 +432,8 @@ Global
|
|||
{1A901129-C885-425F-8D4B-86698F98A2B4} = {2AB9B589-5C98-4C05-BBEA-F97DAE168EAB}
|
||||
{CBDEEC31-D688-417B-9BF2-F0DB2E4FB268} = {FED00F38-E911-45E1-A788-26980E84C3D6}
|
||||
{97D5ADE3-C1B4-4B46-8A3E-718A4F7F079F} = {FED00F38-E911-45E1-A788-26980E84C3D6}
|
||||
{DE958333-2467-409D-904D-92C9CCD0BA52} = {2AB9B589-5C98-4C05-BBEA-F97DAE168EAB}
|
||||
{723AE80D-A512-4CF0-9F5A-8CC7323A26BB} = {2AB9B589-5C98-4C05-BBEA-F97DAE168EAB}
|
||||
EndGlobalSection
|
||||
GlobalSection(ExtensibilityGlobals) = postSolution
|
||||
SolutionGuid = {42D74E06-00EA-43D2-A05B-9BEAD4A2C8A0}
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
Subproject commit 8ca7d6aec6bb0226efdb1f50de603ac45b8c1e8e
|
||||
Subproject commit a04aa7553129c7287291227acbb9f0f8522f44f4
|
||||
|
|
@ -38,17 +38,17 @@ namespace MatterControl.Tests
|
|||
#endif
|
||||
|
||||
// This list can be refreshed via the rebuildDependencies() helper function below
|
||||
string knownAssemblies = @"MatterHackers.VectorMath.dll
|
||||
AGG.dll
|
||||
MatterHackers.PolygonMesh.dll
|
||||
string knownAssemblies = @"VectorMath.dll
|
||||
Agg.dll
|
||||
PolygonMesh.dll
|
||||
clipper_library.dll
|
||||
MatterHackers.Agg.UI.dll
|
||||
Gui.dll
|
||||
Tesselate.dll
|
||||
MatterHackers.DataConverters2D.dll
|
||||
DataConverters2D.dll
|
||||
MatterHackers.RenderOpenGl.dll
|
||||
RayTracer.dll
|
||||
MatterHackers.DataConverters3D.dll
|
||||
MatterHackers.Localizations.dll
|
||||
DataConverters3D.dll
|
||||
Localizations.dll
|
||||
agg_platform_win32.dll
|
||||
Community.CsharpSqlite.dll
|
||||
MatterHackers.MatterControl.Plugins.dll
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<packages>
|
||||
<package id="C5" version="2.5.3" targetFramework="net471" />
|
||||
<package id="Markdig" version="0.15.0" targetFramework="net471" />
|
||||
<package id="MIConvexHull" version="1.1.17.1019" targetFramework="net471" />
|
||||
<package id="Mindscape.Raygun4Net" version="5.5.2" targetFramework="net461" />
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue