win32: move GTK# assemblies into the same directory as the rest

of the GTK# runtime.


git-svn-id: file:///srv/caca.zoy.org/var/lib/svn/libpipi/trunk@2952 92316355-f0b4-4df1-b90c-862c8a59935f

ThePimp/Makefile.am

@@ -37,11 +37,11 @@ if USE_GTKSHARP
 pimp_flags = -pkg:gtk-sharp-2.0 -r:Mono.Posix
 else
 pimp_flags = \
-	-r:$(top_srcdir)/win32/assembly/pango-sharp.dll \
-	-r:$(top_srcdir)/win32/assembly/atk-sharp.dll \
-	-r:$(top_srcdir)/win32/assembly/gdk-sharp.dll \
-	-r:$(top_srcdir)/win32/assembly/gtk-sharp.dll \
-	-r:$(top_srcdir)/win32/assembly/glib-sharp.dll \
+	-r:$(top_srcdir)/win32/dist/bin/pango-sharp.dll \
+	-r:$(top_srcdir)/win32/dist/bin/atk-sharp.dll \
+	-r:$(top_srcdir)/win32/dist/bin/gdk-sharp.dll \
+	-r:$(top_srcdir)/win32/dist/bin/gtk-sharp.dll \
+	-r:$(top_srcdir)/win32/dist/bin/glib-sharp.dll \
 	-r:Mono.Posix
 endif
 

ThePimp/ThePimp.csproj

@@ -40,35 +40,35 @@
   <ItemGroup>
     <Reference Include="atk-sharp, Version=2.10.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\win32\assembly\atk-sharp.dll</HintPath>
+      <HintPath>..\win32\dist\bin\atk-sharp.dll</HintPath>
     </Reference>
     <Reference Include="gdk-sharp, Version=2.10.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\win32\assembly\gdk-sharp.dll</HintPath>
+      <HintPath>..\win32\dist\bin\gdk-sharp.dll</HintPath>
     </Reference>
     <Reference Include="glade-sharp, Version=2.10.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\win32\assembly\glade-sharp.dll</HintPath>
+      <HintPath>..\win32\dist\bin\glade-sharp.dll</HintPath>
     </Reference>
     <Reference Include="glib-sharp, Version=2.10.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\win32\assembly\glib-sharp.dll</HintPath>
+      <HintPath>..\win32\dist\bin\glib-sharp.dll</HintPath>
     </Reference>
     <Reference Include="gtk-sharp, Version=2.10.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\win32\assembly\gtk-sharp.dll</HintPath>
+      <HintPath>..\win32\dist\bin\gtk-sharp.dll</HintPath>
     </Reference>
     <Reference Include="gtkglarea-sharp, Version=0.0.3.0, Culture=neutral, PublicKeyToken=7df758c0fb49fe62">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\win32\assembly\gtkglarea-sharp.dll</HintPath>
+      <HintPath>..\win32\dist\bin\gtkglarea-sharp.dll</HintPath>
     </Reference>
     <Reference Include="Mono.Posix, Version=2.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\win32\assembly\Mono.Posix.dll</HintPath>
+      <HintPath>..\win32\dist\bin\Mono.Posix.dll</HintPath>
     </Reference>
     <Reference Include="pango-sharp, Version=2.10.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\win32\assembly\pango-sharp.dll</HintPath>
+      <HintPath>..\win32\dist\bin\pango-sharp.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />

build-win32

@@ -38,7 +38,6 @@ rm -Rf "${BUILDDIR}"
 
 # Install gtk-sharp
 cp -r "win32/dist/"* "${INSTALLDIR}/"
-cp -r "win32/assembly/"* "${INSTALLDIR}/bin/"
 
 # Install pipi-sharp
 mv "${INSTALLDIR}/lib/pipi-sharp/"* "${INSTALLDIR}/bin/"