Clean up build targets and output dirs. (#302)

* Clean up build targets and output dirs.

All old Any CPU targets and mixed ones have been removed. They wouldn't have worked anyways due to SFML.

Cleaned up all the build output directories to be neat and clean.

* Fix Travis
This commit is contained in:
Pieter-Jan Briers
2017-08-04 15:11:28 +02:00
committed by Silver
parent 09ecdade70
commit 975eea832d
8 changed files with 22 additions and 69 deletions

View File

@@ -17,5 +17,5 @@ before_script:
script:
- "msbuild /p:Configuration=Release /p:HEADLESS=1 SpaceStation14.sln"
- "cd packages/NUnit.ConsoleRunner.3.6.1/tools"
- "mono --debug nunit3-console.exe ../../../SS14.UnitTesting/bin/Release/SS14.UnitTesting.dll"
- "mono --debug nunit3-console.exe ../../../bin/UnitTesting/SS14.UnitTesting.dll"

View File

@@ -39,7 +39,7 @@
<DebugSymbols>True</DebugSymbols>
<FileAlignment>4096</FileAlignment>
<Optimize>False</Optimize>
<OutputPath>..\bin\</OutputPath>
<OutputPath>$(SolutionDir)bin\Lidgren\</OutputPath>
<RegisterForComInterop>False</RegisterForComInterop>
<RemoveIntegerChecks>False</RemoveIntegerChecks>
<TreatWarningsAsErrors>False</TreatWarningsAsErrors>
@@ -62,7 +62,7 @@
<DebugSymbols>False</DebugSymbols>
<FileAlignment>4096</FileAlignment>
<Optimize>True</Optimize>
<OutputPath>..\bin\</OutputPath>
<OutputPath>$(SolutionDir)bin\Lidgren\</OutputPath>
<RegisterForComInterop>False</RegisterForComInterop>
<RemoveIntegerChecks>False</RemoveIntegerChecks>
<TreatWarningsAsErrors>False</TreatWarningsAsErrors>

View File

@@ -31,7 +31,7 @@
<DebugSymbols>True</DebugSymbols>
<FileAlignment>4096</FileAlignment>
<Optimize>false</Optimize>
<OutputPath>..\bin\Graphics\</OutputPath>
<OutputPath>$(SolutionDir)bin\Graphics\</OutputPath>
<RegisterForComInterop>False</RegisterForComInterop>
<RemoveIntegerChecks>False</RemoveIntegerChecks>
<WarningLevel>4</WarningLevel>
@@ -46,7 +46,7 @@
<DefineConstants>TRACE</DefineConstants>
<FileAlignment>4096</FileAlignment>
<Optimize>True</Optimize>
<OutputPath>..\bin\</OutputPath>
<OutputPath>$(SolutionDir)bin\Graphics\</OutputPath>
<RegisterForComInterop>False</RegisterForComInterop>
<RemoveIntegerChecks>False</RemoveIntegerChecks>
<WarningLevel>4</WarningLevel>

View File

@@ -55,7 +55,7 @@
<DebugSymbols>True</DebugSymbols>
<FileAlignment>4096</FileAlignment>
<Optimize>False</Optimize>
<OutputPath>..\bin\Client\</OutputPath>
<OutputPath>$(SolutionDir)bin\Client\</OutputPath>
<RegisterForComInterop>False</RegisterForComInterop>
<RemoveIntegerChecks>False</RemoveIntegerChecks>
<TreatWarningsAsErrors>False</TreatWarningsAsErrors>
@@ -76,7 +76,7 @@
<DebugSymbols>False</DebugSymbols>
<FileAlignment>4096</FileAlignment>
<Optimize>True</Optimize>
<OutputPath>..\bin\Client\</OutputPath>
<OutputPath>$(SolutionDir)bin\Client\</OutputPath>
<RegisterForComInterop>False</RegisterForComInterop>
<RemoveIntegerChecks>False</RemoveIntegerChecks>
<TreatWarningsAsErrors>False</TreatWarningsAsErrors>

View File

@@ -41,7 +41,7 @@
<DebugSymbols>True</DebugSymbols>
<FileAlignment>4096</FileAlignment>
<Optimize>False</Optimize>
<OutputPath>..\bin\Server\</OutputPath>
<OutputPath>$(SolutionDir)bin\Server\</OutputPath>
<RegisterForComInterop>False</RegisterForComInterop>
<RemoveIntegerChecks>False</RemoveIntegerChecks>
<TreatWarningsAsErrors>False</TreatWarningsAsErrors>
@@ -62,7 +62,7 @@
<DebugSymbols>False</DebugSymbols>
<FileAlignment>4096</FileAlignment>
<Optimize>True</Optimize>
<OutputPath>..\bin\Server\</OutputPath>
<OutputPath>$(SolutionDir)bin\Server\</OutputPath>
<RegisterForComInterop>False</RegisterForComInterop>
<RemoveIntegerChecks>False</RemoveIntegerChecks>
<TreatWarningsAsErrors>False</TreatWarningsAsErrors>

View File

@@ -31,7 +31,7 @@
<DebugSymbols>True</DebugSymbols>
<FileAlignment>4096</FileAlignment>
<Optimize>False</Optimize>
<OutputPath>..\bin\</OutputPath>
<OutputPath>$(SolutionDir)bin\Shared\</OutputPath>
<RegisterForComInterop>False</RegisterForComInterop>
<RemoveIntegerChecks>False</RemoveIntegerChecks>
<WarningLevel>4</WarningLevel>
@@ -45,7 +45,7 @@
<DefineConstants>TRACE</DefineConstants>
<FileAlignment>4096</FileAlignment>
<Optimize>True</Optimize>
<OutputPath>..\bin\</OutputPath>
<OutputPath>$(SolutionDir)bin\Shared\</OutputPath>
<RegisterForComInterop>False</RegisterForComInterop>
<RemoveIntegerChecks>False</RemoveIntegerChecks>
<WarningLevel>4</WarningLevel>

View File

@@ -2,7 +2,7 @@
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<Platform Condition=" '$(Platform)' == '' ">x86</Platform>
<ProjectGuid>{F0ADA779-40B8-4F7E-BA6C-CDB19F3065D9}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
@@ -19,23 +19,24 @@
<TargetFrameworkProfile />
<NoWarn>0649</NoWarn>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<OutputPath>$(SolutionDir)bin\UnitTesting\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<PlatformTarget>x86</PlatformTarget>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<OutputPath>$(SolutionDir)bin\UnitTesting\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<PlatformTarget>x86</PlatformTarget>
</PropertyGroup>
<ItemGroup>
<Reference Include="nunit.framework">

View File

@@ -1,6 +1,6 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.26403.7
VisualStudioVersion = 15.0.26430.16
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Lidgren.Network", "Lidgren.Network\Lidgren.Network.csproj", "{59250BAF-0000-0000-0000-000000000000}"
EndProject
@@ -16,82 +16,34 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SS14.UnitTesting", "SS14.Un
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Debug|Mixed Platforms = Debug|Mixed Platforms
Debug|x86 = Debug|x86
Release|Any CPU = Release|Any CPU
Release|Mixed Platforms = Release|Mixed Platforms
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{59250BAF-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|x86
{59250BAF-0000-0000-0000-000000000000}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
{59250BAF-0000-0000-0000-000000000000}.Debug|Mixed Platforms.Build.0 = 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|Any CPU.ActiveCfg = Release|x86
{59250BAF-0000-0000-0000-000000000000}.Release|Mixed Platforms.ActiveCfg = Release|x86
{59250BAF-0000-0000-0000-000000000000}.Release|Mixed Platforms.Build.0 = Release|x86
{59250BAF-0000-0000-0000-000000000000}.Release|x86.ActiveCfg = Release|x86
{59250BAF-0000-0000-0000-000000000000}.Release|x86.Build.0 = Release|x86
{0C31DFDF-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|x86
{0C31DFDF-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|x86
{0C31DFDF-0000-0000-0000-000000000000}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
{0C31DFDF-0000-0000-0000-000000000000}.Debug|Mixed Platforms.Build.0 = 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|Any CPU.ActiveCfg = Release|x86
{0C31DFDF-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|x86
{0C31DFDF-0000-0000-0000-000000000000}.Release|Mixed Platforms.ActiveCfg = Release|x86
{0C31DFDF-0000-0000-0000-000000000000}.Release|Mixed Platforms.Build.0 = Release|x86
{0C31DFDF-0000-0000-0000-000000000000}.Release|x86.ActiveCfg = Release|x86
{0C31DFDF-0000-0000-0000-000000000000}.Release|x86.Build.0 = Release|x86
{B04AAE71-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|x86
{B04AAE71-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|x86
{B04AAE71-0000-0000-0000-000000000000}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
{B04AAE71-0000-0000-0000-000000000000}.Debug|Mixed Platforms.Build.0 = 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|Any CPU.ActiveCfg = Release|x86
{B04AAE71-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|x86
{B04AAE71-0000-0000-0000-000000000000}.Release|Mixed Platforms.ActiveCfg = Release|x86
{B04AAE71-0000-0000-0000-000000000000}.Release|Mixed Platforms.Build.0 = Release|x86
{B04AAE71-0000-0000-0000-000000000000}.Release|x86.ActiveCfg = Release|x86
{B04AAE71-0000-0000-0000-000000000000}.Release|x86.Build.0 = Release|x86
{0529F740-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|x86
{0529F740-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|x86
{0529F740-0000-0000-0000-000000000000}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
{0529F740-0000-0000-0000-000000000000}.Debug|Mixed Platforms.Build.0 = 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|Any CPU.ActiveCfg = Release|x86
{0529F740-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|x86
{0529F740-0000-0000-0000-000000000000}.Release|Mixed Platforms.ActiveCfg = Release|x86
{0529F740-0000-0000-0000-000000000000}.Release|Mixed Platforms.Build.0 = Release|x86
{0529F740-0000-0000-0000-000000000000}.Release|x86.ActiveCfg = Release|x86
{0529F740-0000-0000-0000-000000000000}.Release|x86.Build.0 = Release|x86
{302B877E-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|x86
{302B877E-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|x86
{302B877E-0000-0000-0000-000000000000}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
{302B877E-0000-0000-0000-000000000000}.Debug|Mixed Platforms.Build.0 = 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|Any CPU.ActiveCfg = Release|x86
{302B877E-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|x86
{302B877E-0000-0000-0000-000000000000}.Release|Mixed Platforms.ActiveCfg = Release|x86
{302B877E-0000-0000-0000-000000000000}.Release|Mixed Platforms.Build.0 = Release|x86
{302B877E-0000-0000-0000-000000000000}.Release|x86.ActiveCfg = Release|x86
{302B877E-0000-0000-0000-000000000000}.Release|x86.Build.0 = Release|x86
{F0ADA779-40B8-4F7E-BA6C-CDB19F3065D9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{F0ADA779-40B8-4F7E-BA6C-CDB19F3065D9}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F0ADA779-40B8-4F7E-BA6C-CDB19F3065D9}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{F0ADA779-40B8-4F7E-BA6C-CDB19F3065D9}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{F0ADA779-40B8-4F7E-BA6C-CDB19F3065D9}.Debug|x86.ActiveCfg = Debug|Any CPU
{F0ADA779-40B8-4F7E-BA6C-CDB19F3065D9}.Release|Any CPU.ActiveCfg = Release|Any CPU
{F0ADA779-40B8-4F7E-BA6C-CDB19F3065D9}.Release|Any CPU.Build.0 = Release|Any CPU
{F0ADA779-40B8-4F7E-BA6C-CDB19F3065D9}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{F0ADA779-40B8-4F7E-BA6C-CDB19F3065D9}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{F0ADA779-40B8-4F7E-BA6C-CDB19F3065D9}.Release|x86.ActiveCfg = Release|Any CPU
{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|x86.ActiveCfg = Release|x86
{F0ADA779-40B8-4F7E-BA6C-CDB19F3065D9}.Release|x86.Build.0 = Release|x86
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE