From 34dc213377c20bac163c966399684454b7215fda Mon Sep 17 00:00:00 2001
From: Dean Ellis <dellis1972@googlemail.com>
Date: Mon, 1 Jun 2020 11:19:52 +0100
Subject: [PATCH] Make 64 bit Linux native lib the default.

Since 64bit OS's are more common we should
make the 64 bit version of the native ibrary
the default.

This helps when running under .net Core. But
it will also allow us to easliy remove the
32 bit version in the future.
---
 Xamarin.LibZipSharp.targets | 4 ++--
 libZipSharp.dll.config      | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Xamarin.LibZipSharp.targets b/Xamarin.LibZipSharp.targets
index b0245ca3..9b8ff968 100644
--- a/Xamarin.LibZipSharp.targets
+++ b/Xamarin.LibZipSharp.targets
@@ -19,10 +19,10 @@
       <Link>%(FileName)%(Extension)</Link>
     </_LibZipNativeLibs>
     <_LibZipNativeLibs Include="$(MSBuildThisFileDirectory)..\runtimes\linux-x64\native\libzip.so">
-      <Link>lib64\%(FileName)%(Extension)</Link>
+      <Link>%(FileName)%(Extension)</Link>
     </_LibZipNativeLibs>
     <_LibZipNativeLibs Include="$(MSBuildThisFileDirectory)..\runtimes\linux-x86\native\libzip.so">
-      <Link>%(FileName)%(Extension)</Link>
+      <Link>lib32\%(FileName)%(Extension)</Link>
     </_LibZipNativeLibs>
     <None Include="@(_LibZipNativeLibs)" Condition="'$(LibZipSharpBundleAllNativeLibraries)' == 'True'">
       <Link>%(Link)</Link>
diff --git a/libZipSharp.dll.config b/libZipSharp.dll.config
index d12f45cc..a31070f2 100644
--- a/libZipSharp.dll.config
+++ b/libZipSharp.dll.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
 	<dllmap dll="libzip" os="osx" target="libzip.dylib"/>
-	<dllmap dll="libzip" os="linux" cpu="x86" target="libzip.so"/>
-	<dllmap dll="libzip" os="linux" cpu="x86-64" target="lib64/libzip.so"/>
+	<dllmap dll="libzip" os="linux" cpu="x86" target="lib32/libzip.so"/>
+	<dllmap dll="libzip" os="linux" cpu="x86-64" target="libzip.so"/>
 </configuration>