Skip to content
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

Jump to bottom

dotnet core support #11

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

dotnet core support #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3802221
feat, dotnet core support to build on linux/macOS
merl111 Aug 28, 2019
8e82d69
fix, removed netstanard from project
merl111 Aug 28, 2019
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
15 changes: 4 additions & 11 deletions ExampleShared/ExampleShared.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
Expand All @@ -9,9 +8,9 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>ExampleShared</RootNamespace>
<AssemblyName>ExampleShared</AssemblyName>
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
<TargetFramework>netcoreapp2.0</TargetFramework>
<TargetFrameworks Condition="'$(OS)' != 'Unix'">net472;netcoreapp2.0</TargetFrameworks>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
Expand All @@ -38,21 +37,15 @@
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Data" />
<Reference Include="System.Net.Http" />
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="Shared.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\NuklearDotNet\NuklearDotNet.csproj">
<Project>{bdb132a4-22a1-479d-a4d0-0a2b00021f16}</Project>
<Name>NuklearDotNet</Name>
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>
</Project>
36 changes: 0 additions & 36 deletions ExampleShared/Properties/AssemblyInfo.cs
View file
Open in desktop

This file was deleted.

13 changes: 4 additions & 9 deletions Example_SFML/Example_SFML.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{F8966879-6638-4D6C-8793-1FA63234B7E7}</ProjectGuid>
<OutputType>Exe</OutputType>
<RootNamespace>Example_SFML</RootNamespace>
<AssemblyName>Example_SFML</AssemblyName>
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
<TargetFramework>netcoreapp2.0</TargetFramework>
<TargetFrameworks Condition="'$(OS)' != 'Unix'">net472;netcoreapp2.0</TargetFrameworks>
<FileAlignment>512</FileAlignment>
<NuGetPackageImportStamp>
</NuGetPackageImportStamp>
Expand Down Expand Up @@ -67,10 +67,6 @@
<Reference Include="System.Net.Http" />
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="Program.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
<None Include="App.config" />
</ItemGroup>
Expand Down Expand Up @@ -107,5 +103,4 @@
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>
</Project>
36 changes: 0 additions & 36 deletions Example_SFML/Properties/AssemblyInfo.cs
View file
Open in desktop

This file was deleted.

13 changes: 13 additions & 0 deletions Nuklear/makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
CFLAGS = -O3 -Wall

.PHONY: all clean

all: shared

shared: Nuklear.c
$(CC) -fPIC -O3 -c Nuklear.c -I../nuklear_c
$(CC) -shared -Wl,--export-dynamic Nuklear.o -o ../binaries/libnuklear.so
rm -rf *.o

clean:
rm -rf *.o *.so
28 changes: 7 additions & 21 deletions NuklearDotNet/NuklearDotNet.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
Expand All @@ -9,7 +8,8 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>NuklearDotNet</RootNamespace>
<AssemblyName>NuklearDotNet</AssemblyName>
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
<TargetFramework>netcoreapp2.0</TargetFramework>
<TargetFrameworks Condition="'$(OS)' != 'Unix'">net472;netcoreapp2.0</TargetFrameworks>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile />
</PropertyGroup>
Expand Down Expand Up @@ -37,26 +37,12 @@
<Reference Include="System.Core" />
<Reference Include="System.Numerics" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Data" />
<Reference Include="System.Net.Http" />
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="Init.cs" />
<Compile Include="Draw.cs" />
<Compile Include="Font.cs" />
<Compile Include="Input.cs" />
<Compile Include="Layout.cs" />
<Compile Include="Macros.cs" />
<Compile Include="NuklearAPI.cs" />
<Compile Include="Style.cs" />
<Compile Include="Widget.cs" />
<Compile Include="Text.cs" />
<Compile Include="General.cs" />
<Compile Include="Nuklear.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>
<Target Name="BuildNuklear" BeforeTargets="InitializeBuildStatus">
<Exec Condition="'$(OS)' == 'Unix'" Command="make" WorkingDirectory="..\Nuklear\" />
</Target>
</Project>
36 changes: 0 additions & 36 deletions NuklearDotNet/Properties/AssemblyInfo.cs
View file
Open in desktop

This file was deleted.