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

Versionless RIDs #4

Merged
merged 4 commits into from
Jan 5, 2019
Merged

Versionless RIDs #4

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
c837f86
Move DLLs from the win7-x86 / win7-x64 runtime folders to win-x86 / w…
LordBenjamin Jan 4, 2019
44e41e6
Move DLLs from the win7-x86 / win7-x64 runtime folders to win-x86 / w…
LordBenjamin Jan 4, 2019
a9e77d8
Merge branch 'versionless-rids' of https://github.com/LordBenjamin/Fr…
LordBenjamin Jan 4, 2019
fcf7a5d
Rename ubuntu.16.04-x64 to linux-x64.
LordBenjamin Jan 5, 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
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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").

Expand Down
0 ...u.16.04-x64/native/libfreeimage-3.17.0.so → ...s/linux-x64/native/libfreeimage-3.17.0.so
View file
Open in desktop
File renamed without changes.
0 runtimes/win7-x64/native/FreeImage.dll → runtimes/win-x64/native/FreeImage.dll
View file
Open in desktop
File renamed without changes.
0 runtimes/win7-x86/native/FreeImage.dll → runtimes/win-x86/native/FreeImage.dll
View file
Open in desktop
File renamed without changes.
14 changes: 7 additions & 7 deletions src/FreeImage.Standard/FreeImage.Standard.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<Description>
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").

Expand All @@ -30,12 +30,12 @@

<ItemGroup>

<None Include="..\..\runtimes\win7-x64\native\FreeImage.dll">
<PackagePath>runtimes/win7-x64/native/FreeImage.dll</PackagePath>
<None Include="..\..\runtimes\win-x64\native\FreeImage.dll">
<PackagePath>runtimes/win-x64/native/FreeImage.dll</PackagePath>
<Pack>true</Pack>
</None>
<None Include="..\..\runtimes\win7-x86\native\FreeImage.dll">
<PackagePath>runtimes/win7-x86/native/FreeImage.dll</PackagePath>
<None Include="..\..\runtimes\win-x86\native\FreeImage.dll">
<PackagePath>runtimes/win-x86/native/FreeImage.dll</PackagePath>
<Pack>true</Pack>
</None>

Expand All @@ -46,8 +46,8 @@
</None>

<!-- NOTE: this is renaming to FreeImage... might be avoidable if dll mapping is implemented: https://github.com/dotnet/coreclr/issues/930 -->
<None Include="..\..\runtimes\ubuntu.16.04-x64\native\libfreeimage-3.17.0.so">
<PackagePath>runtimes/ubuntu.16.04-x64/native/FreeImage.so</PackagePath>
<None Include="..\..\runtimes\linux-x64\native\libfreeimage-3.17.0.so">
<PackagePath>runtimes/linux-x64/native/FreeImage.so</PackagePath>
<Pack>true</Pack>
</None>

Expand Down