Skip to content

Simplify configuration and cross-platforms #95

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Micky5991 wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Simplify configuration and cross-platforms #95

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b1a1e12
Remove redundant configurations
Micky5991 Feb 27, 2018
f7f7dfa
Allow unsafe code in Wrapper
Micky5991 Feb 27, 2018
ae7f157
Fix output path of Debug GTMP
Micky5991 Feb 27, 2018
a3e51b1
Rename files and output-paths to new folder and file structure
Micky5991 Feb 27, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 0 additions & 19 deletions JustAnotherVoiceChat.Server.Dummy/JustAnotherVoiceChat.Server.Dummy.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,25 +5,6 @@
<TargetFramework>netcoreapp2.0</TargetFramework>
<LangVersion>7</LangVersion>
<IsPackable>false</IsPackable>
<Configurations>Debug Linux;Debug Windows;Release Linux;Release Windows</Configurations>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug Linux|AnyCPU'">
<DefineConstants>TRACE;DEBUG;LINUX;NETCOREAPP2_0;NETCOREAPP2_0</DefineConstants>
<OutputPath>bin\Debug\Linux\</OutputPath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug Windows|AnyCPU'">
<DefineConstants>TRACE;DEBUG;NETCOREAPP2_0</DefineConstants>
<OutputPath>bin\Debug\Windows\</OutputPath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release Windows|AnyCPU'">
<DefineConstants>TRACE;RELEASE;NETCOREAPP2_0</DefineConstants>
<Optimize>true</Optimize>
<OutputPath>bin\Release\Windows\</OutputPath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release Linux|AnyCPU'">
<DefineConstants>TRACE;RELEASE;LINUX;NETCOREAPP2_0</DefineConstants>
<Optimize>true</Optimize>
<OutputPath>bin\Release\Linux\</OutputPath>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\JustAnotherVoiceChat.Server.Wrapper\JustAnotherVoiceChat.Server.Wrapper.csproj" />
Expand Down
39 changes: 11 additions & 28 deletions JustAnotherVoiceChat.Server.GTMP.Resource/JustAnotherVoiceChat.Server.GTMP.Resource.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,41 +12,18 @@
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<LangVersion>7</LangVersion>
<Configurations>Debug Linux;Debug Windows;Debug Windows GTMP;Release Linux;Release Windows</Configurations>
<Configurations>Debug;Debug GTMP;Release</Configurations>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release Linux|AnyCPU'">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<DefineConstants>TRACE;LINUX</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<OutputPath>bin\Release\Linux\</OutputPath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release Windows|AnyCPU'">
<OutputPath>bin\Release\Windows\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<Optimize>true</Optimize>
<DebugType>pdbonly</DebugType>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug Windows|AnyCPU'">
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<OutputPath>bin\Debug\Windows\</OutputPath>
<OutputPath>bin\Debug\</OutputPath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug Linux|AnyCPU'">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<DefineConstants>DEBUG;TRACE;LINUX</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<OutputPath>bin\Debug\Linux\</OutputPath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug Windows GTMP|AnyCPU'">
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug GTMP|AnyCPU'">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
Expand All @@ -55,6 +32,12 @@
<WarningLevel>4</WarningLevel>
<OutputPath>..\..\JustAnotherVoiceChat-GTMP\resources\justanothervoicechat\</OutputPath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'">
<DefineConstants>TRACE</DefineConstants>
<Optimize>true</Optimize>
<DebugType>pdbonly</DebugType>
<OutputPath>bin\Release\</OutputPath>
</PropertyGroup>
<ItemGroup>
<Reference Include="BCrypt.Net, Version=0.1.5073.29922, Culture=neutral, PublicKeyToken=6bcd409ee6bc9292">
<HintPath>..\packages\BCrypt-Official.0.1.109\lib\BCrypt.Net.dll</HintPath>
Expand Down Expand Up @@ -113,4 +96,4 @@
<Target Name="AfterBuild">
</Target>
-->
</Project>
</Project>
32 changes: 7 additions & 25 deletions JustAnotherVoiceChat.Server.GTMP/JustAnotherVoiceChat.Server.GTMP.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,38 +12,20 @@
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<LangVersion>7</LangVersion>
<Configurations>Debug Linux;Debug Windows;Release Linux;Release Windows</Configurations>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug Linux|AnyCPU'">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<DefineConstants>DEBUG;TRACE;LINUX</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<OutputPath>bin\Debug\Linux\</OutputPath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug Windows|AnyCPU'">
<OutputPath>bin\Debug\Windows\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release Windows|AnyCPU'">
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<OutputPath>bin\Release\Windows\</OutputPath>
<OutputPath>bin\Release\</OutputPath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release Linux|AnyCPU'">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<DefineConstants>TRACE;LINUX</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<OutputPath>bin\Release\Linux\</OutputPath>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
<DefineConstants>DEBUG;TRACE</DefineConstants>
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<OutputPath>bin\Debug\</OutputPath>
</PropertyGroup>
<ItemGroup>
<Reference Include="BCrypt.Net, Version=0.1.5073.29922, Culture=neutral, PublicKeyToken=6bcd409ee6bc9292">
Expand Down
19 changes: 0 additions & 19 deletions JustAnotherVoiceChat.Server.Testing/JustAnotherVoiceChat.Server.Testing.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,23 +4,4 @@
<IsPackable>false</IsPackable>
<Configuration Condition=" '$(Configuration)' == '' ">Debug Windows</Configuration>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug Linux|AnyCPU'">
<WarningLevel>0</WarningLevel>
<OutputPath>bin\Debug\Linux\</OutputPath>
<DefineConstants>TRACE;DEBUG;LINUX;NETSTANDARD1_2</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug Windows|AnyCPU'">
<OutputPath>bin\Debug\Windows\</OutputPath>
<DefineConstants>TRACE;DEBUG;NETSTANDARD1_2</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release Windows|AnyCPU'">
<OutputPath>bin\Release\Windows\</OutputPath>
<DefineConstants>TRACE;NETSTANDARD1_2</DefineConstants>
<Optimize>true</Optimize>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release Linux|AnyCPU'">
<OutputPath>bin\Release\Linux\</OutputPath>
<DefineConstants>TRACE;LINUX;NETSTANDARD1_2</DefineConstants>
<Optimize>true</Optimize>
</PropertyGroup>
</Project>
20 changes: 0 additions & 20 deletions JustAnotherVoiceChat.Server.Wrapper.Tests/JustAnotherVoiceChat.Server.Wrapper.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
<Configuration Condition=" '$(Configuration)' == '' ">Debug Windows</Configuration>
<TargetFramework>netcoreapp2.0</TargetFramework>
<IsPackable>false</IsPackable>
<Configurations>Debug Linux;Debug Windows;Release Linux;Release Windows</Configurations>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\JustAnotherVoiceChat.Server.Testing\JustAnotherVoiceChat.Server.Testing.csproj" />
Expand All @@ -15,23 +14,4 @@
<PackageReference Include="NUnit" Version="3.9.0" />
<PackageReference Include="NUnit3TestAdapter" Version="3.9.0" />
</ItemGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug Linux|AnyCPU'">
<WarningLevel>0</WarningLevel>
<OutputPath>bin\Debug\Linux\</OutputPath>
<DefineConstants>TRACE;DEBUG;LINUX;NETCOREAPP2_0</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug Windows|AnyCPU'">
<OutputPath>bin\Debug\Windows\</OutputPath>
<DefineConstants>TRACE;DEBUG;NETCOREAPP2_0</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release Windows|AnyCPU'">
<OutputPath>bin\Release\Windows\</OutputPath>
<DefineConstants>TRACE;NETCOREAPP2_0</DefineConstants>
<Optimize>true</Optimize>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release Linux|AnyCPU'">
<OutputPath>bin\Release\Linux\</OutputPath>
<DefineConstants>TRACE;LINUX;NETCOREAPP2_0</DefineConstants>
<Optimize>true</Optimize>
</PropertyGroup>
</Project>
21 changes: 3 additions & 18 deletions JustAnotherVoiceChat.Server.Wrapper/JustAnotherVoiceChat.Server.Wrapper.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
<FileVersion>$(VoiceChatVersion)</FileVersion>
<Version>$(VoiceChatVersion)</Version>
<LangVersion>7</LangVersion>
<Configurations>Debug Linux;Debug Windows;Release Linux;Release Windows</Configurations>
<Title>JustAnotherVoiceChat-Server .NET Standard Wrapper</Title>
<Description>JustAnotherVoiceChat-Server is the control unit of the JustAnotherVoiceChat TeamSpeak3-Plugin. It uses a dedicated TeamSpeak3-Server to communicate with other players on any .NET based multiplayer-server.</Description>
<Copyright>2018 JustAnotherVoiceChat</Copyright>
Expand All @@ -20,28 +19,14 @@
<Authors>JustAnotherVoiceChat contributors</Authors>
<IsPackable>true</IsPackable>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug Linux|AnyCPU'">
<WarningLevel>0</WarningLevel>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<OutputPath>bin\Debug\Linux\</OutputPath>
<DefineConstants>TRACE;DEBUG;LINUX;NETSTANDARD1_2</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug Windows|AnyCPU'">
<OutputPath>bin\Debug\Windows\</OutputPath>
<DefineConstants>TRACE;DEBUG;NETSTANDARD1_2</DefineConstants>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug GTMP|AnyCPU'">
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release Windows|AnyCPU'">
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<OutputPath>bin\Release\Windows\</OutputPath>
<DefineConstants>TRACE;NETSTANDARD1_2</DefineConstants>
<Optimize>true</Optimize>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release Linux|AnyCPU'">
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<OutputPath>bin\Release\Linux\</OutputPath>
<DefineConstants>TRACE;LINUX;NETSTANDARD1_2</DefineConstants>
<Optimize>true</Optimize>
</PropertyGroup>
<!-- LINUX NATIVE LIBRARY -->
<Target Name="Clean" Condition="'$(Configuration)' == 'Debug Linux' Or '$(Configuration)' == 'Release Linux'">
Expand Down
8 changes: 2 additions & 6 deletions JustAnotherVoiceChat.Server.Wrapper/src/Elements/Wrapper/NativeLibary.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,12 +34,8 @@ namespace JustAnotherVoiceChat.Server.Wrapper.Elements.Wrapper
{
internal static class NativeLibary
{

#if LINUX
private const string JustAnotherVoiceChatLibrary = "libJustAnotherVoiceChat.Server.so";
#else
private const string JustAnotherVoiceChatLibrary = "JustAnotherVoiceChat.Server.dll";
#endif

private const string JustAnotherVoiceChatLibrary = "JustAnotherVoiceChatServer";

[DllImport(JustAnotherVoiceChatLibrary)]
internal static extern void JV_CreateServer(ushort port, string teamspeakServerId, ulong teamspeakChannelId, string teamspeakChannelPassword);
Expand Down
Loading