diff --git a/Demos/Cosmos Graphic Subsystem/Cosmos Graphic Subsystem.csproj b/Demos/Cosmos Graphic Subsystem/Cosmos Graphic Subsystem.csproj index aca224ba7..14a378015 100644 --- a/Demos/Cosmos Graphic Subsystem/Cosmos Graphic Subsystem.csproj +++ b/Demos/Cosmos Graphic Subsystem/Cosmos Graphic Subsystem.csproj @@ -10,19 +10,14 @@ + - - ..\..\Build\bin\Cosmos.Debug.Kernel.dll - ..\..\Build\bin\Cosmos.IL2CPU.dll - - ..\..\Build\bin\Cosmos.IL2CPU.Plugs.dll - diff --git a/Demos/Guess/GuessKernel.csproj b/Demos/Guess/GuessKernel.csproj index a47cf44ca..aa5489b4b 100644 --- a/Demos/Guess/GuessKernel.csproj +++ b/Demos/Guess/GuessKernel.csproj @@ -10,13 +10,8 @@ + - - - ..\..\Build\bin\Cosmos.Debug.Kernel.dll - - - diff --git a/Kernel.sln b/Kernel.sln index dbc093de2..e7de0d5db 100644 --- a/Kernel.sln +++ b/Kernel.sln @@ -29,8 +29,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "1 HAL", "1 HAL", "{D651C346 EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "2 System", "2 System", "{0259702E-9575-4852-A641-5F9714A9C740}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Common", "Common", "{170A7DE2-E899-4E92-A12B-E68876C9B2A5}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Demos", "Demos", "{B56A6119-1B8F-44E4-9446-291E52F47D4C}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Guess", "Guess", "{5FF9BF2A-5162-4F12-82B6-1693AD776636}" @@ -47,6 +45,10 @@ Project("{471EC4BB-E47E-4229-A789-D1F5F83B52D4}") = "Cosmos Graphic SubsystemBoo EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cosmos.Debug.Kernel", "source\Cosmos.Debug.Kernel\Cosmos.Debug.Kernel.csproj", "{94DBCFC7-B5D2-4148-BE18-D76654C379E2}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "External", "External", "{3CD3D9A5-9BC5-4FEB-8D63-4D535C0ABB78}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cosmos.IL2CPU.Plugs", "source\Cosmos.IL2CPU.Plugs\Cosmos.IL2CPU.Plugs.csproj", "{31D48401-77B2-44AF-B6D3-27AB67C10759}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -166,13 +168,21 @@ Global {94DBCFC7-B5D2-4148-BE18-D76654C379E2}.Release|Any CPU.Build.0 = Release|Any CPU {94DBCFC7-B5D2-4148-BE18-D76654C379E2}.Release|x86.ActiveCfg = Release|Any CPU {94DBCFC7-B5D2-4148-BE18-D76654C379E2}.Release|x86.Build.0 = Release|Any CPU + {31D48401-77B2-44AF-B6D3-27AB67C10759}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {31D48401-77B2-44AF-B6D3-27AB67C10759}.Debug|Any CPU.Build.0 = Debug|Any CPU + {31D48401-77B2-44AF-B6D3-27AB67C10759}.Debug|x86.ActiveCfg = Debug|Any CPU + {31D48401-77B2-44AF-B6D3-27AB67C10759}.Debug|x86.Build.0 = Debug|Any CPU + {31D48401-77B2-44AF-B6D3-27AB67C10759}.Release|Any CPU.ActiveCfg = Release|Any CPU + {31D48401-77B2-44AF-B6D3-27AB67C10759}.Release|Any CPU.Build.0 = Release|Any CPU + {31D48401-77B2-44AF-B6D3-27AB67C10759}.Release|x86.ActiveCfg = Release|Any CPU + {31D48401-77B2-44AF-B6D3-27AB67C10759}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution {1425715D-1C93-44C7-8BB5-F124F195A41A} = {D651C346-95CF-4AE9-B309-DB2A1A512811} - {09099C80-8262-486A-94A5-492F51B08823} = {170A7DE2-E899-4E92-A12B-E68876C9B2A5} + {09099C80-8262-486A-94A5-492F51B08823} = {3CD3D9A5-9BC5-4FEB-8D63-4D535C0ABB78} {9AF5BD03-8A49-49DC-A56E-3AE8DA6B0FF4} = {04B18FFC-8EA0-4E9F-9E1B-478527B19AFA} {F9C7F437-4DC5-4E34-9843-74EC9DB37F4B} = {04B18FFC-8EA0-4E9F-9E1B-478527B19AFA} {4AC1AFCE-C8CE-484D-AE22-F9EE27008FAF} = {0259702E-9575-4852-A641-5F9714A9C740} @@ -190,5 +200,6 @@ Global {49F2C01D-D2C5-4564-810B-1AE92236C5C1} = {A9D558E8-B0C7-4FF6-99D8-CB2BC6FEB7C7} {79D68062-46C5-466D-9289-C033F7348485} = {A9D558E8-B0C7-4FF6-99D8-CB2BC6FEB7C7} {94DBCFC7-B5D2-4148-BE18-D76654C379E2} = {9A923E6F-FF63-4F02-A4EA-C2D44F9323FD} + {31D48401-77B2-44AF-B6D3-27AB67C10759} = {3CD3D9A5-9BC5-4FEB-8D63-4D535C0ABB78} EndGlobalSection EndGlobal diff --git a/source/Cosmos.Core.Plugs/Cosmos.Core.Plugs.csproj b/source/Cosmos.Core.Plugs/Cosmos.Core.Plugs.csproj index 523d3f637..fbbe24ceb 100644 --- a/source/Cosmos.Core.Plugs/Cosmos.Core.Plugs.csproj +++ b/source/Cosmos.Core.Plugs/Cosmos.Core.Plugs.csproj @@ -19,15 +19,13 @@ + ..\..\Build\bin\Cosmos.IL2CPU.dll - - ..\..\Build\bin\Cosmos.IL2CPU.Plugs.dll - \ No newline at end of file diff --git a/source/Cosmos.Core/Cosmos.Core.csproj b/source/Cosmos.Core/Cosmos.Core.csproj index e08cedc14..b7a9af531 100644 --- a/source/Cosmos.Core/Cosmos.Core.csproj +++ b/source/Cosmos.Core/Cosmos.Core.csproj @@ -13,15 +13,13 @@ + ..\..\Build\bin\Cosmos.IL2CPU.dll - - ..\..\Build\bin\Cosmos.IL2CPU.Plugs.dll - diff --git a/source/Cosmos.Core_Asm/Cosmos.Core_Asm.csproj b/source/Cosmos.Core_Asm/Cosmos.Core_Asm.csproj index ff2d841d9..37fa3da47 100644 --- a/source/Cosmos.Core_Asm/Cosmos.Core_Asm.csproj +++ b/source/Cosmos.Core_Asm/Cosmos.Core_Asm.csproj @@ -18,6 +18,7 @@ + @@ -27,9 +28,6 @@ ..\..\Build\bin\Cosmos.IL2CPU.dll - - ..\..\Build\bin\Cosmos.IL2CPU.Plugs.dll - ..\..\Build\bin\XSharp.Common.dll diff --git a/source/Cosmos.HAL/Cosmos.HAL.csproj b/source/Cosmos.HAL/Cosmos.HAL.csproj index 51fd3ccae..89e8fd007 100644 --- a/source/Cosmos.HAL/Cosmos.HAL.csproj +++ b/source/Cosmos.HAL/Cosmos.HAL.csproj @@ -13,6 +13,7 @@ + @@ -22,9 +23,6 @@ ..\..\Build\bin\Cosmos.IL2CPU.dll - - ..\..\Build\bin\Cosmos.IL2CPU.Plugs.dll - \ No newline at end of file diff --git a/source/Cosmos.System.Plugs/Cosmos.System.Plugs.csproj b/source/Cosmos.System.Plugs/Cosmos.System.Plugs.csproj index 8c8ff33ef..85cc8c552 100644 --- a/source/Cosmos.System.Plugs/Cosmos.System.Plugs.csproj +++ b/source/Cosmos.System.Plugs/Cosmos.System.Plugs.csproj @@ -11,6 +11,7 @@ + @@ -18,9 +19,6 @@ ..\..\Build\bin\Cosmos.IL2CPU.dll - - ..\..\Build\bin\Cosmos.IL2CPU.Plugs.dll - diff --git a/source/Cosmos.System/Cosmos.System.csproj b/source/Cosmos.System/Cosmos.System.csproj index a38dd9674..93555e097 100644 --- a/source/Cosmos.System/Cosmos.System.csproj +++ b/source/Cosmos.System/Cosmos.System.csproj @@ -16,15 +16,13 @@ + ..\..\Build\bin\Cosmos.IL2CPU.dll - - ..\..\Build\bin\Cosmos.IL2CPU.Plugs.dll -