From: jpbruyere <jp.bruyere@hotmail.com>
Date: Wed, 3 Aug 2016 09:54:27 +0000 (+0200)
Subject: remove GtkSharp dep that comes with mono, add .config to point to
X-Git-Tag: v0.4~18^2~15
X-Git-Url: https://git.osiis.dedyn.io/?a=commitdiff_plain;h=28fcfe42333838e35ac71d7c1a4e64a35b43ee6c;p=jp%2Fcrow.git

remove GtkSharp dep that comes with mono, add .config to point to
correct lib files depending on os
	modifié :         Crow.OpenTK.nuspec
	modifié :         Crow.csproj
	nouveau fichier : Crow.dll.config
	modifié :         Tests/Tests.csproj
---

diff --git a/Crow.OpenTK.nuspec b/Crow.OpenTK.nuspec
index ba664df2..24eeb31c 100644
--- a/Crow.OpenTK.nuspec
+++ b/Crow.OpenTK.nuspec
@@ -2,10 +2,10 @@
 <package >
 	<metadata>
 		<id>Crow.OpenTK</id>
-		<version>0.4.5</version>
+		<version>0.4.6</version>
 		<title>C# Rapid Open Widget Toolkit</title>
 		<authors>JP Bruyere</authors>
-		<owners>Grand Tetras Software Team</owners>
+		<owners>Grand Tetras Software</owners>
 		<licenseUrl>https://www.gnu.org/licenses/gpl-3.0.html</licenseUrl>
 		<projectUrl>https://jpbruyere.github.io/Crow/</projectUrl>
 		<iconUrl>https://jpbruyere.github.io/Crow/images/crow.png</iconUrl>
@@ -26,7 +26,6 @@ For more information, please visit https://jpbruyere.github.io/Crow/.
 		<copyright>Copyright 2016</copyright>
 		<dependencies>
 			<dependency id="OpenTK.Next" version="1.2" />
-			<dependency id="GtkSharp" version="3.1" />
 		</dependencies>
         <tags>Crow OpenTK OpenGL Widget Interface GUI C# .Net Mono</tags>
         <references>
@@ -37,6 +36,9 @@ For more information, please visit https://jpbruyere.github.io/Crow/.
             <frameworkAssembly assemblyName="System.Drawing" />
             <frameworkAssembly assemblyName="System.Xml" />
         </frameworkAssemblies>
+		<contentFiles>
+			<files include="build/Release/Crow.dll.config" copyToOutput="true" />
+		</contentFiles>
 	</metadata>
 	<files>
 		<file src="Tests/OpenTKGameWindow.cs" target="content" />
diff --git a/Crow.csproj b/Crow.csproj
index 1710e316..ad8ce32f 100644
--- a/Crow.csproj
+++ b/Crow.csproj
@@ -141,21 +141,12 @@
     <Reference Include="System.Xml" />
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.Drawing" />
-    <Reference Include="cairo-sharp">
-      <HintPath>$(SolutionDir)packages\GtkSharp.3.1.3\lib\net45\cairo-sharp.dll</HintPath>
-    </Reference>
-    <Reference Include="gdk-sharp">
-      <HintPath>$(SolutionDir)packages\GtkSharp.3.1.3\lib\net45\gdk-sharp.dll</HintPath>
-    </Reference>
-    <Reference Include="gio-sharp">
-      <HintPath>$(SolutionDir)packages\GtkSharp.3.1.3\lib\net45\gio-sharp.dll</HintPath>
-    </Reference>
-    <Reference Include="glib-sharp">
-      <HintPath>$(SolutionDir)packages\GtkSharp.3.1.3\lib\net45\glib-sharp.dll</HintPath>
-    </Reference>
+	<Reference Include="cairo-sharp"/>
+	<Reference Include="gdk-sharp"/>
+	<Reference Include="gio-sharp"/>
+	<Reference Include="glib-sharp"/>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(SolutionDir)packages\GtkSharp.3.1.3\build\net45\GtkSharp.targets" Condition="Exists('$(SolutionDir)packages\GtkSharp.3.1.3\build\net45\GtkSharp.targets')" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
@@ -237,5 +228,8 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="README.md" />
+    <None Include="Crow.dll.config">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
   </ItemGroup>
 </Project>
diff --git a/Crow.dll.config b/Crow.dll.config
new file mode 100644
index 00000000..485a9495
--- /dev/null
+++ b/Crow.dll.config
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <dllmap os="!windows,osx" dll="libgio-2.0-0.dll" target="libgio-2.0.so.0"/>
+  <dllmap os="!windows,osx" dll="libglib-2.0-0.dll" target="libglib-2.0.so.0"/>
+  <dllmap os="!windows,osx" dll="libgobject-2.0-0.dll" target="libgobject-2.0.so.0"/>
+  <dllmap os="!windows,osx" dll="libgdk-3-0.dll" target="libgdk-3.so.0"/>
+  <dllmap os="!windows,osx" dll="libgdk_pixbuf-2.0-0.dll" target="libgdk_pixbuf-2.0.so.0"/>
+
+  
+  <dllmap os="windows" dll="rsvg-2" target="librsvg-2-2.dll"/>
+  
+  <dllmap os="osx" dll="libgio-2.0-0.dll" target="libgio-2.0.0.dylib"/>
+  <dllmap os="osx" dll="libgio-2.0-0.dll" target="libgio-2.0.0.dylib"/>
+  <dllmap os="osx" dll="libglib-2.0-0.dll" target="libglib-2.0.0.dylib"/>
+  <dllmap os="osx" dll="libgobject-2.0-0.dll" target="libgobject-2.0.0.dylib"/>
+  <dllmap os="osx" dll="libgdk-3.0.dll" target="libgdk-quartz-3.0.0.dylib"/>
+  <dllmap os="osx" dll="libgdk_pixbuf-2.0-0.dll" target="libgdk_pixbuf-2.0.0.dylib"/>
+</configuration>
diff --git a/Tests/Tests.csproj b/Tests/Tests.csproj
index 03b2b281..7e32a7d5 100644
--- a/Tests/Tests.csproj
+++ b/Tests/Tests.csproj
@@ -41,24 +41,15 @@
     <Reference Include="System.Data" />
     <Reference Include="System.Xml" />
     <Reference Include="System.Drawing" />
-    <Reference Include="cairo-sharp">
-      <HintPath>$(SolutionDir)packages\GtkSharp.3.1.3\lib\net45\cairo-sharp.dll</HintPath>
-    </Reference>
-    <Reference Include="gdk-sharp">
-      <HintPath>$(SolutionDir)packages\GtkSharp.3.1.3\lib\net45\gdk-sharp.dll</HintPath>
-    </Reference>
-    <Reference Include="gio-sharp">
-      <HintPath>$(SolutionDir)packages\GtkSharp.3.1.3\lib\net45\gio-sharp.dll</HintPath>
-    </Reference>
-    <Reference Include="glib-sharp">
-      <HintPath>$(SolutionDir)packages\GtkSharp.3.1.3\lib\net45\glib-sharp.dll</HintPath>
-    </Reference>
-    <Reference Include="OpenTK">
+	<Reference Include="cairo-sharp"/>
+	<Reference Include="gdk-sharp"/>
+	<Reference Include="gio-sharp"/>
+	<Reference Include="glib-sharp"/>
+	<Reference Include="OpenTK">
       <HintPath>$(SolutionDir)packages\OpenTK.Next.1.2.2336.6514-pre\lib\net20\OpenTK.dll</HintPath>
     </Reference>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(SolutionDir)packages\GtkSharp.3.1.3\build\net45\GtkSharp.targets" Condition="Exists('$(SolutionDir)packages\GtkSharp.3.1.3\build\net45\GtkSharp.targets')" />
   <ItemGroup>
     <Compile Include="Interfaces\testBorder.goml.cs" />
     <Compile Include="BasicTests.cs" />