From 380222181564ab7f1ec7bb5cc5c5b0f586be5809 Mon Sep 17 00:00:00 2001 From: Merl111 Date: Wed, 28 Aug 2019 19:31:48 +0200 Subject: [PATCH 1/2] feat, dotnet core support to build on linux/macOS - added makefile to build Nuklear wrapper - WinForms example cannot be build on Linux/macOS for obvious reasons --- ExampleShared/ExampleShared.csproj | 14 +++------ ExampleShared/Properties/AssemblyInfo.cs | 36 ------------------------ Example_SFML/Example_SFML.csproj | 13 +++------ Example_SFML/Properties/AssemblyInfo.cs | 36 ------------------------ Nuklear/makefile | 13 +++++++++ NuklearDotNet/NuklearDotNet.csproj | 28 +++++------------- NuklearDotNet/Properties/AssemblyInfo.cs | 36 ------------------------ 7 files changed, 28 insertions(+), 148 deletions(-) delete mode 100644 ExampleShared/Properties/AssemblyInfo.cs delete mode 100644 Example_SFML/Properties/AssemblyInfo.cs create mode 100644 Nuklear/makefile delete mode 100644 NuklearDotNet/Properties/AssemblyInfo.cs diff --git a/ExampleShared/ExampleShared.csproj b/ExampleShared/ExampleShared.csproj index 0d834e4..e314a14 100644 --- a/ExampleShared/ExampleShared.csproj +++ b/ExampleShared/ExampleShared.csproj @@ -1,6 +1,5 @@  - - + Debug AnyCPU @@ -9,9 +8,9 @@ Properties ExampleShared ExampleShared - v4.7.2 + netcoreapp2.0;netstandard2.0 + net472;netcoreapp2.0 512 - true @@ -44,15 +43,10 @@ - - - - {bdb132a4-22a1-479d-a4d0-0a2b00021f16} NuklearDotNet - - \ No newline at end of file + diff --git a/ExampleShared/Properties/AssemblyInfo.cs b/ExampleShared/Properties/AssemblyInfo.cs deleted file mode 100644 index be7c3c9..0000000 --- a/ExampleShared/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("ExampleShared")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("ExampleShared")] -[assembly: AssemblyCopyright("Copyright © 2018")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("1dd60202-210f-4e88-97fa-3f6b9f2d04bb")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/Example_SFML/Example_SFML.csproj b/Example_SFML/Example_SFML.csproj index 3f6cf75..6d1246c 100644 --- a/Example_SFML/Example_SFML.csproj +++ b/Example_SFML/Example_SFML.csproj @@ -1,6 +1,5 @@  - - + Debug AnyCPU @@ -8,7 +7,8 @@ Exe Example_SFML Example_SFML - v4.7.2 + netcoreapp2.0 + net472;netcoreapp2.0 512 @@ -67,10 +67,6 @@ - - - - @@ -107,5 +103,4 @@ PreserveNewest - - \ No newline at end of file + diff --git a/Example_SFML/Properties/AssemblyInfo.cs b/Example_SFML/Properties/AssemblyInfo.cs deleted file mode 100644 index a90d5f7..0000000 --- a/Example_SFML/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("Example_SFML")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("Example_SFML")] -[assembly: AssemblyCopyright("Copyright © 2018")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("f8966879-6638-4d6c-8793-1fa63234b7e7")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/Nuklear/makefile b/Nuklear/makefile new file mode 100644 index 0000000..7fd13c5 --- /dev/null +++ b/Nuklear/makefile @@ -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 diff --git a/NuklearDotNet/NuklearDotNet.csproj b/NuklearDotNet/NuklearDotNet.csproj index a3c9da8..8f2d852 100644 --- a/NuklearDotNet/NuklearDotNet.csproj +++ b/NuklearDotNet/NuklearDotNet.csproj @@ -1,6 +1,5 @@  - - + Debug AnyCPU @@ -9,7 +8,8 @@ Properties NuklearDotNet NuklearDotNet - v4.6.2 + netcoreapp2.0 + net472;netcoreapp2.0 512 @@ -37,26 +37,12 @@ - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + diff --git a/NuklearDotNet/Properties/AssemblyInfo.cs b/NuklearDotNet/Properties/AssemblyInfo.cs deleted file mode 100644 index 377c082..0000000 --- a/NuklearDotNet/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("NuklearDotNet")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("NuklearDotNet")] -[assembly: AssemblyCopyright("Copyright © 2018")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("bdb132a4-22a1-479d-a4d0-0a2b00021f16")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] From 8e82d698307f3f2ad784eadc5d72d2152379b772 Mon Sep 17 00:00:00 2001 From: Merl111 Date: Wed, 28 Aug 2019 20:29:35 +0200 Subject: [PATCH 2/2] fix, removed netstanard from project --- ExampleShared/ExampleShared.csproj | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/ExampleShared/ExampleShared.csproj b/ExampleShared/ExampleShared.csproj index e314a14..1dbee8b 100644 --- a/ExampleShared/ExampleShared.csproj +++ b/ExampleShared/ExampleShared.csproj @@ -8,7 +8,7 @@ Properties ExampleShared ExampleShared - netcoreapp2.0;netstandard2.0 + netcoreapp2.0 net472;netcoreapp2.0 512 @@ -37,7 +37,6 @@ -