Skip to content

Commit bad320e

Browse files
authored
Merge pull request #59 from dellis1972/theswitcharoo
Make 64 bit Linux native lib the default.
2 parents d7bc2c5 + 34dc213 commit bad320e

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

Xamarin.LibZipSharp.targets

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@
1919
<Link>%(FileName)%(Extension)</Link>
2020
</_LibZipNativeLibs>
2121
<_LibZipNativeLibs Include="$(MSBuildThisFileDirectory)..\runtimes\linux-x64\native\libzip.so">
22-
<Link>lib64\%(FileName)%(Extension)</Link>
22+
<Link>%(FileName)%(Extension)</Link>
2323
</_LibZipNativeLibs>
2424
<_LibZipNativeLibs Include="$(MSBuildThisFileDirectory)..\runtimes\linux-x86\native\libzip.so">
25-
<Link>%(FileName)%(Extension)</Link>
25+
<Link>lib32\%(FileName)%(Extension)</Link>
2626
</_LibZipNativeLibs>
2727
<None Include="@(_LibZipNativeLibs)" Condition="'$(LibZipSharpBundleAllNativeLibraries)' == 'True'">
2828
<Link>%(Link)</Link>

libZipSharp.dll.config

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
33
<dllmap dll="libzip" os="osx" target="libzip.dylib"/>
4-
<dllmap dll="libzip" os="linux" cpu="x86" target="libzip.so"/>
5-
<dllmap dll="libzip" os="linux" cpu="x86-64" target="lib64/libzip.so"/>
4+
<dllmap dll="libzip" os="linux" cpu="x86" target="lib32/libzip.so"/>
5+
<dllmap dll="libzip" os="linux" cpu="x86-64" target="libzip.so"/>
66
</configuration>

0 commit comments

Comments
 (0)