From c837f866466b24e5c6480e0faba979bee7a2eb81 Mon Sep 17 00:00:00 2001 From: Ben Owen Date: Fri, 4 Jan 2019 21:40:45 +0000 Subject: [PATCH 1/3] Move DLLs from the win7-x86 / win7-x64 runtime folders to win-x86 / win-x64. --- runtimes/{win7-x64 => win-x64}/native/FreeImage.dll | Bin runtimes/{win7-x86 => win-x86}/native/FreeImage.dll | Bin src/FreeImage.Standard/FreeImage.Standard.csproj | 8 ++++---- 3 files changed, 4 insertions(+), 4 deletions(-) rename runtimes/{win7-x64 => win-x64}/native/FreeImage.dll (100%) rename runtimes/{win7-x86 => win-x86}/native/FreeImage.dll (100%) diff --git a/runtimes/win7-x64/native/FreeImage.dll b/runtimes/win-x64/native/FreeImage.dll similarity index 100% rename from runtimes/win7-x64/native/FreeImage.dll rename to runtimes/win-x64/native/FreeImage.dll diff --git a/runtimes/win7-x86/native/FreeImage.dll b/runtimes/win-x86/native/FreeImage.dll similarity index 100% rename from runtimes/win7-x86/native/FreeImage.dll rename to runtimes/win-x86/native/FreeImage.dll diff --git a/src/FreeImage.Standard/FreeImage.Standard.csproj b/src/FreeImage.Standard/FreeImage.Standard.csproj index 282be47..3bfa955 100644 --- a/src/FreeImage.Standard/FreeImage.Standard.csproj +++ b/src/FreeImage.Standard/FreeImage.Standard.csproj @@ -30,12 +30,12 @@ - - runtimes/win7-x64/native/FreeImage.dll + + runtimes/win-x64/native/FreeImage.dll true - - runtimes/win7-x86/native/FreeImage.dll + + runtimes/win-x86/native/FreeImage.dll true From 44e41e6adcb4738a404f44f742e7787cba68a2a5 Mon Sep 17 00:00:00 2001 From: Ben Owen Date: Fri, 4 Jan 2019 21:40:45 +0000 Subject: [PATCH 2/3] Move DLLs from the win7-x86 / win7-x64 runtime folders to win-x86 / win-x64. Partially fixes #1. --- runtimes/{win7-x64 => win-x64}/native/FreeImage.dll | Bin runtimes/{win7-x86 => win-x86}/native/FreeImage.dll | Bin src/FreeImage.Standard/FreeImage.Standard.csproj | 8 ++++---- 3 files changed, 4 insertions(+), 4 deletions(-) rename runtimes/{win7-x64 => win-x64}/native/FreeImage.dll (100%) rename runtimes/{win7-x86 => win-x86}/native/FreeImage.dll (100%) diff --git a/runtimes/win7-x64/native/FreeImage.dll b/runtimes/win-x64/native/FreeImage.dll similarity index 100% rename from runtimes/win7-x64/native/FreeImage.dll rename to runtimes/win-x64/native/FreeImage.dll diff --git a/runtimes/win7-x86/native/FreeImage.dll b/runtimes/win-x86/native/FreeImage.dll similarity index 100% rename from runtimes/win7-x86/native/FreeImage.dll rename to runtimes/win-x86/native/FreeImage.dll diff --git a/src/FreeImage.Standard/FreeImage.Standard.csproj b/src/FreeImage.Standard/FreeImage.Standard.csproj index 282be47..3bfa955 100644 --- a/src/FreeImage.Standard/FreeImage.Standard.csproj +++ b/src/FreeImage.Standard/FreeImage.Standard.csproj @@ -30,12 +30,12 @@ - - runtimes/win7-x64/native/FreeImage.dll + + runtimes/win-x64/native/FreeImage.dll true - - runtimes/win7-x86/native/FreeImage.dll + + runtimes/win-x86/native/FreeImage.dll true From fcf7a5dc41e301706f608580807e6b45404d7976 Mon Sep 17 00:00:00 2001 From: Ben Owen Date: Sat, 5 Jan 2019 00:59:14 +0000 Subject: [PATCH 3/3] Rename ubuntu.16.04-x64 to linux-x64. Tested on openSUSE Tumbleweed. --- README.md | 2 +- .../native/libfreeimage-3.17.0.so | Bin src/FreeImage.Standard/FreeImage.Standard.csproj | 6 +++--- 3 files changed, 4 insertions(+), 4 deletions(-) rename runtimes/{ubuntu.16.04-x64 => linux-x64}/native/libfreeimage-3.17.0.so (100%) diff --git a/README.md b/README.md index 7ed7470..d0d71aa 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ This is a clone of the FreeImage .NET project (http://freeimage.sourceforge.net/) modified to work with .NET Standard 2.0. -FreeImage native binaries are included in the nuget package for Windows x86/x64, Ubuntu x64 (^16.04), and OSX x64 (^10.10). +FreeImage native binaries are included in the nuget package for Windows x86/x64, Linux x64/armhf, and OSX x64 (^10.10). For other platforms they will have to be installed separately. Note that the native function calls require the library filename to be "FreeImage," so symlinking may be required (eg. "sudo ln -s /usr/lib/x86_64-linux-gnu/libfreeimage.so /usr/lib/FreeImage"). diff --git a/runtimes/ubuntu.16.04-x64/native/libfreeimage-3.17.0.so b/runtimes/linux-x64/native/libfreeimage-3.17.0.so similarity index 100% rename from runtimes/ubuntu.16.04-x64/native/libfreeimage-3.17.0.so rename to runtimes/linux-x64/native/libfreeimage-3.17.0.so diff --git a/src/FreeImage.Standard/FreeImage.Standard.csproj b/src/FreeImage.Standard/FreeImage.Standard.csproj index 3bfa955..ca3c062 100644 --- a/src/FreeImage.Standard/FreeImage.Standard.csproj +++ b/src/FreeImage.Standard/FreeImage.Standard.csproj @@ -20,7 +20,7 @@ This is a clone of the FreeImage .NET project (http://freeimage.sourceforge.net/) modified to work with dotnet core. Note that all functions that use System.Drawing.Bitmap have been removed from the netstandard framework versions as there is no implementation for this class. - FreeImage native binaries are included in the nuget package for Windows x86/x64, Ubuntu x64 (^16.04), and OSX x64 (^10.10). + FreeImage native binaries are included in the nuget package for Windows x86/x64, Linux x64/armhf, and OSX x64 (^10.10). For other platforms they will have to be installed separately. Note that the native function calls require the the library filename to be "FreeImage," so symlinking may be required (eg. "sudo ln -s /usr/lib/x86_64-linux-gnu/libfreeimage.so /usr/lib/FreeImage"). @@ -46,8 +46,8 @@ - - runtimes/ubuntu.16.04-x64/native/FreeImage.so + + runtimes/linux-x64/native/FreeImage.so true