From e46e4a79939117c19d6c70f710660adb565913a6 Mon Sep 17 00:00:00 2001 From: PJB3005 Date: Sat, 19 Aug 2017 11:24:49 +0200 Subject: [PATCH] Fix SFML references. --- Content.Client/Content.Client.csproj | 16 ++++---- Content.Server/Content.Server.csproj | 16 ++++---- Content.Shared/Content.Shared.csproj | 21 ++++++---- SS14.Content.targets | 5 +++ SpaceStation14Content.sln | 61 +++++++++++++++++++++++++++- 5 files changed, 95 insertions(+), 24 deletions(-) diff --git a/Content.Client/Content.Client.csproj b/Content.Client/Content.Client.csproj index d3ceb49096..a423d04b11 100644 --- a/Content.Client/Content.Client.csproj +++ b/Content.Client/Content.Client.csproj @@ -50,12 +50,6 @@ $(SolutionDir)packages\YamlDotNet.4.2.1\lib\net35\YamlDotNet.dll - - ..\engine\Third-Party\sfmlnet-graphics-2.dll - - - ..\engine\Third-Party\sfmlnet-system-2.dll - $(SolutionDir)packages\OpenTK.3.0.0-pre\lib\net20\OpenTK.dll @@ -73,6 +67,14 @@ {59250baf-0000-0000-0000-000000000000} Lidgren.Network + + {46786269-57b9-48e7-aa4f-8f4d84609fe6} + sfml-graphics + + + {31d24303-f6a9-4d53-bb03-a73edcb3186d} + sfml-system + {302b877e-0000-0000-0000-000000000000} SS14.Client.Graphics @@ -96,4 +98,4 @@ - + \ No newline at end of file diff --git a/Content.Server/Content.Server.csproj b/Content.Server/Content.Server.csproj index f8738eeb9d..75769a3f77 100644 --- a/Content.Server/Content.Server.csproj +++ b/Content.Server/Content.Server.csproj @@ -42,12 +42,6 @@ $(SolutionDir)packages\YamlDotNet.4.2.1\lib\net35\YamlDotNet.dll - - ..\engine\Third-Party\sfmlnet-graphics-2.dll - - - ..\engine\Third-Party\sfmlnet-system-2.dll - $(SolutionDir)packages\OpenTK.3.0.0-pre\lib\net20\OpenTK.dll @@ -65,6 +59,14 @@ {59250baf-0000-0000-0000-000000000000} Lidgren.Network + + {46786269-57b9-48e7-aa4f-8f4d84609fe6} + sfml-graphics + + + {31d24303-f6a9-4d53-bb03-a73edcb3186d} + sfml-system + {b04aae71-0000-0000-0000-000000000000} SS14.Server @@ -83,4 +85,4 @@ - + \ No newline at end of file diff --git a/Content.Shared/Content.Shared.csproj b/Content.Shared/Content.Shared.csproj index 984dc496ec..96b361daf4 100644 --- a/Content.Shared/Content.Shared.csproj +++ b/Content.Shared/Content.Shared.csproj @@ -41,12 +41,6 @@ $(SolutionDir)packages\YamlDotNet.4.2.1\lib\net35\YamlDotNet.dll - - ..\engine\Third-Party\sfmlnet-graphics-2.dll - - - ..\engine\Third-Party\sfmlnet-system-2.dll - $(SolutionDir)packages\OpenTK.3.0.0-pre\lib\net20\OpenTK.dll @@ -60,6 +54,14 @@ {59250baf-0000-0000-0000-000000000000} Lidgren.Network + + {46786269-57b9-48e7-aa4f-8f4d84609fe6} + sfml-graphics + + + {31d24303-f6a9-4d53-bb03-a73edcb3186d} + sfml-system + {0529f740-0000-0000-0000-000000000000} SS14.Shared @@ -76,8 +78,9 @@ - False - + False + + @@ -92,4 +95,4 @@ - + \ No newline at end of file diff --git a/SS14.Content.targets b/SS14.Content.targets index cbf0d4356a..ce9cf1cf13 100644 --- a/SS14.Content.targets +++ b/SS14.Content.targets @@ -3,4 +3,9 @@ + + + False + + diff --git a/SpaceStation14Content.sln b/SpaceStation14Content.sln index d201a98da4..1326c6361c 100644 --- a/SpaceStation14Content.sln +++ b/SpaceStation14Content.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 -VisualStudioVersion = 15.0.26430.15 +VisualStudioVersion = 15.0.26430.16 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Content.Shared", "Content.Shared\Content.Shared.csproj", "{26AEEBB3-DDE7-443A-9F43-7BC7F4ACF6B5}" ProjectSection(ProjectDependencies) = postProject @@ -41,52 +41,107 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Engine", "Engine", "{B01693 EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BuildChecker", "BuildChecker\BuildChecker.csproj", "{C899FCA4-7037-4E49-ABC2-44DE72487110}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "sfml-system", "engine\SFML\src\System\sfml-system.csproj", "{31D24303-F6A9-4D53-BB03-A73EDCB3186D}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "sfml-graphics", "engine\SFML\src\Graphics\sfml-graphics.csproj", "{46786269-57B9-48E7-AA4F-8F4D84609FE6}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "sfml-window", "engine\SFML\src\Window\sfml-window.csproj", "{D17DE83D-A592-461F-8AF2-53F9E22E1D0F}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SFML", "SFML", "{1780DA39-F1EC-4100-8C58-ECD756C68033}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|x64 = Debug|x64 Debug|x86 = Debug|x86 + Release|x64 = Release|x64 Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution + {26AEEBB3-DDE7-443A-9F43-7BC7F4ACF6B5}.Debug|x64.ActiveCfg = Debug|x86 {26AEEBB3-DDE7-443A-9F43-7BC7F4ACF6B5}.Debug|x86.ActiveCfg = Debug|x86 {26AEEBB3-DDE7-443A-9F43-7BC7F4ACF6B5}.Debug|x86.Build.0 = Debug|x86 + {26AEEBB3-DDE7-443A-9F43-7BC7F4ACF6B5}.Release|x64.ActiveCfg = Release|x86 {26AEEBB3-DDE7-443A-9F43-7BC7F4ACF6B5}.Release|x86.ActiveCfg = Release|x86 {26AEEBB3-DDE7-443A-9F43-7BC7F4ACF6B5}.Release|x86.Build.0 = Release|x86 + {0529F740-0000-0000-0000-000000000000}.Debug|x64.ActiveCfg = Debug|x86 {0529F740-0000-0000-0000-000000000000}.Debug|x86.ActiveCfg = Debug|x86 {0529F740-0000-0000-0000-000000000000}.Debug|x86.Build.0 = Debug|x86 + {0529F740-0000-0000-0000-000000000000}.Release|x64.ActiveCfg = Release|x86 {0529F740-0000-0000-0000-000000000000}.Release|x86.ActiveCfg = Release|x86 {0529F740-0000-0000-0000-000000000000}.Release|x86.Build.0 = Release|x86 + {B04AAE71-0000-0000-0000-000000000000}.Debug|x64.ActiveCfg = Debug|x86 {B04AAE71-0000-0000-0000-000000000000}.Debug|x86.ActiveCfg = Debug|x86 {B04AAE71-0000-0000-0000-000000000000}.Debug|x86.Build.0 = Debug|x86 + {B04AAE71-0000-0000-0000-000000000000}.Release|x64.ActiveCfg = Release|x86 {B04AAE71-0000-0000-0000-000000000000}.Release|x86.ActiveCfg = Release|x86 {B04AAE71-0000-0000-0000-000000000000}.Release|x86.Build.0 = Release|x86 + {302B877E-0000-0000-0000-000000000000}.Debug|x64.ActiveCfg = Debug|x86 {302B877E-0000-0000-0000-000000000000}.Debug|x86.ActiveCfg = Debug|x86 {302B877E-0000-0000-0000-000000000000}.Debug|x86.Build.0 = Debug|x86 + {302B877E-0000-0000-0000-000000000000}.Release|x64.ActiveCfg = Release|x86 {302B877E-0000-0000-0000-000000000000}.Release|x86.ActiveCfg = Release|x86 {302B877E-0000-0000-0000-000000000000}.Release|x86.Build.0 = Release|x86 + {0C31DFDF-0000-0000-0000-000000000000}.Debug|x64.ActiveCfg = Debug|x86 {0C31DFDF-0000-0000-0000-000000000000}.Debug|x86.ActiveCfg = Debug|x86 {0C31DFDF-0000-0000-0000-000000000000}.Debug|x86.Build.0 = Debug|x86 + {0C31DFDF-0000-0000-0000-000000000000}.Release|x64.ActiveCfg = Release|x86 {0C31DFDF-0000-0000-0000-000000000000}.Release|x86.ActiveCfg = Release|x86 {0C31DFDF-0000-0000-0000-000000000000}.Release|x86.Build.0 = Release|x86 + {F0ADA779-40B8-4F7E-BA6C-CDB19F3065D9}.Debug|x64.ActiveCfg = Debug|x86 {F0ADA779-40B8-4F7E-BA6C-CDB19F3065D9}.Debug|x86.ActiveCfg = Debug|x86 {F0ADA779-40B8-4F7E-BA6C-CDB19F3065D9}.Debug|x86.Build.0 = Debug|x86 + {F0ADA779-40B8-4F7E-BA6C-CDB19F3065D9}.Release|x64.ActiveCfg = Release|x86 {F0ADA779-40B8-4F7E-BA6C-CDB19F3065D9}.Release|x86.ActiveCfg = Release|x86 {F0ADA779-40B8-4F7E-BA6C-CDB19F3065D9}.Release|x86.Build.0 = Release|x86 + {B38DBBD0-04C2-4D1A-84E2-B3446F6ADF2A}.Debug|x64.ActiveCfg = Debug|x86 {B38DBBD0-04C2-4D1A-84E2-B3446F6ADF2A}.Debug|x86.ActiveCfg = Debug|x86 {B38DBBD0-04C2-4D1A-84E2-B3446F6ADF2A}.Debug|x86.Build.0 = Debug|x86 + {B38DBBD0-04C2-4D1A-84E2-B3446F6ADF2A}.Release|x64.ActiveCfg = Release|x86 {B38DBBD0-04C2-4D1A-84E2-B3446F6ADF2A}.Release|x86.ActiveCfg = Release|x86 {B38DBBD0-04C2-4D1A-84E2-B3446F6ADF2A}.Release|x86.Build.0 = Release|x86 + {A2E5F175-78AF-4DDD-8F97-E2D2552372ED}.Debug|x64.ActiveCfg = Debug|x86 {A2E5F175-78AF-4DDD-8F97-E2D2552372ED}.Debug|x86.ActiveCfg = Debug|x86 {A2E5F175-78AF-4DDD-8F97-E2D2552372ED}.Debug|x86.Build.0 = Debug|x86 + {A2E5F175-78AF-4DDD-8F97-E2D2552372ED}.Release|x64.ActiveCfg = Release|x86 {A2E5F175-78AF-4DDD-8F97-E2D2552372ED}.Release|x86.ActiveCfg = Release|x86 {A2E5F175-78AF-4DDD-8F97-E2D2552372ED}.Release|x86.Build.0 = Release|x86 + {59250BAF-0000-0000-0000-000000000000}.Debug|x64.ActiveCfg = Debug|x86 {59250BAF-0000-0000-0000-000000000000}.Debug|x86.ActiveCfg = Debug|x86 {59250BAF-0000-0000-0000-000000000000}.Debug|x86.Build.0 = Debug|x86 + {59250BAF-0000-0000-0000-000000000000}.Release|x64.ActiveCfg = Release|x86 {59250BAF-0000-0000-0000-000000000000}.Release|x86.ActiveCfg = Release|x86 {59250BAF-0000-0000-0000-000000000000}.Release|x86.Build.0 = Release|x86 + {C899FCA4-7037-4E49-ABC2-44DE72487110}.Debug|x64.ActiveCfg = Debug|x86 {C899FCA4-7037-4E49-ABC2-44DE72487110}.Debug|x86.ActiveCfg = Debug|x86 {C899FCA4-7037-4E49-ABC2-44DE72487110}.Debug|x86.Build.0 = Debug|x86 + {C899FCA4-7037-4E49-ABC2-44DE72487110}.Release|x64.ActiveCfg = Debug|x86 + {C899FCA4-7037-4E49-ABC2-44DE72487110}.Release|x64.Build.0 = Debug|x86 {C899FCA4-7037-4E49-ABC2-44DE72487110}.Release|x86.ActiveCfg = Debug|x86 {C899FCA4-7037-4E49-ABC2-44DE72487110}.Release|x86.Build.0 = Debug|x86 + {31D24303-F6A9-4D53-BB03-A73EDCB3186D}.Debug|x64.ActiveCfg = Debug|x64 + {31D24303-F6A9-4D53-BB03-A73EDCB3186D}.Debug|x64.Build.0 = Debug|x64 + {31D24303-F6A9-4D53-BB03-A73EDCB3186D}.Debug|x86.ActiveCfg = Debug|x86 + {31D24303-F6A9-4D53-BB03-A73EDCB3186D}.Debug|x86.Build.0 = Debug|x86 + {31D24303-F6A9-4D53-BB03-A73EDCB3186D}.Release|x64.ActiveCfg = Release|x64 + {31D24303-F6A9-4D53-BB03-A73EDCB3186D}.Release|x64.Build.0 = Release|x64 + {31D24303-F6A9-4D53-BB03-A73EDCB3186D}.Release|x86.ActiveCfg = Release|x86 + {31D24303-F6A9-4D53-BB03-A73EDCB3186D}.Release|x86.Build.0 = Release|x86 + {46786269-57B9-48E7-AA4F-8F4D84609FE6}.Debug|x64.ActiveCfg = Debug|x64 + {46786269-57B9-48E7-AA4F-8F4D84609FE6}.Debug|x64.Build.0 = Debug|x64 + {46786269-57B9-48E7-AA4F-8F4D84609FE6}.Debug|x86.ActiveCfg = Debug|x86 + {46786269-57B9-48E7-AA4F-8F4D84609FE6}.Debug|x86.Build.0 = Debug|x86 + {46786269-57B9-48E7-AA4F-8F4D84609FE6}.Release|x64.ActiveCfg = Release|x64 + {46786269-57B9-48E7-AA4F-8F4D84609FE6}.Release|x64.Build.0 = Release|x64 + {46786269-57B9-48E7-AA4F-8F4D84609FE6}.Release|x86.ActiveCfg = Release|x86 + {46786269-57B9-48E7-AA4F-8F4D84609FE6}.Release|x86.Build.0 = Release|x86 + {D17DE83D-A592-461F-8AF2-53F9E22E1D0F}.Debug|x64.ActiveCfg = Debug|x64 + {D17DE83D-A592-461F-8AF2-53F9E22E1D0F}.Debug|x64.Build.0 = Debug|x64 + {D17DE83D-A592-461F-8AF2-53F9E22E1D0F}.Debug|x86.ActiveCfg = Debug|x86 + {D17DE83D-A592-461F-8AF2-53F9E22E1D0F}.Debug|x86.Build.0 = Debug|x86 + {D17DE83D-A592-461F-8AF2-53F9E22E1D0F}.Release|x64.ActiveCfg = Release|x64 + {D17DE83D-A592-461F-8AF2-53F9E22E1D0F}.Release|x64.Build.0 = Release|x64 + {D17DE83D-A592-461F-8AF2-53F9E22E1D0F}.Release|x86.ActiveCfg = Release|x86 + {D17DE83D-A592-461F-8AF2-53F9E22E1D0F}.Release|x86.Build.0 = Release|x86 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -99,5 +154,9 @@ Global {F0ADA779-40B8-4F7E-BA6C-CDB19F3065D9} = {B01693E5-CF08-4DB7-8920-407F8D6603A1} {59250BAF-0000-0000-0000-000000000000} = {B01693E5-CF08-4DB7-8920-407F8D6603A1} {C899FCA4-7037-4E49-ABC2-44DE72487110} = {3202E94D-E985-4181-9F69-F458A7F6574F} + {31D24303-F6A9-4D53-BB03-A73EDCB3186D} = {1780DA39-F1EC-4100-8C58-ECD756C68033} + {46786269-57B9-48E7-AA4F-8F4D84609FE6} = {1780DA39-F1EC-4100-8C58-ECD756C68033} + {D17DE83D-A592-461F-8AF2-53F9E22E1D0F} = {1780DA39-F1EC-4100-8C58-ECD756C68033} + {1780DA39-F1EC-4100-8C58-ECD756C68033} = {B01693E5-CF08-4DB7-8920-407F8D6603A1} EndGlobalSection EndGlobal