Rename win32/dist into win32/gtksharp because we might very well

put other runtimes in SVN.


git-svn-id: file:///srv/caca.zoy.org/var/lib/svn/libpipi/trunk@2954 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/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:$(top_srcdir)/win32/gtksharp/bin/pango-sharp.dll \
+	-r:$(top_srcdir)/win32/gtksharp/bin/atk-sharp.dll \
+	-r:$(top_srcdir)/win32/gtksharp/bin/gdk-sharp.dll \
+	-r:$(top_srcdir)/win32/gtksharp/bin/gtk-sharp.dll \
+	-r:$(top_srcdir)/win32/gtksharp/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\dist\bin\atk-sharp.dll</HintPath>
+      <HintPath>..\win32\gtksharp\bin\atk-sharp.dll</HintPath>
     </Reference>
     <Reference Include="gdk-sharp, Version=2.10.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\win32\dist\bin\gdk-sharp.dll</HintPath>
+      <HintPath>..\win32\gtksharp\bin\gdk-sharp.dll</HintPath>
     </Reference>
     <Reference Include="glade-sharp, Version=2.10.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\win32\dist\bin\glade-sharp.dll</HintPath>
+      <HintPath>..\win32\gtksharp\bin\glade-sharp.dll</HintPath>
     </Reference>
     <Reference Include="glib-sharp, Version=2.10.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\win32\dist\bin\glib-sharp.dll</HintPath>
+      <HintPath>..\win32\gtksharp\bin\glib-sharp.dll</HintPath>
     </Reference>
     <Reference Include="gtk-sharp, Version=2.10.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\win32\dist\bin\gtk-sharp.dll</HintPath>
+      <HintPath>..\win32\gtksharp\bin\gtk-sharp.dll</HintPath>
     </Reference>
     <Reference Include="gtkglarea-sharp, Version=0.0.3.0, Culture=neutral, PublicKeyToken=7df758c0fb49fe62">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\win32\dist\bin\gtkglarea-sharp.dll</HintPath>
+      <HintPath>..\win32\gtksharp\bin\gtkglarea-sharp.dll</HintPath>
     </Reference>
     <Reference Include="Mono.Posix, Version=2.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\win32\dist\bin\Mono.Posix.dll</HintPath>
+      <HintPath>..\win32\gtksharp\bin\Mono.Posix.dll</HintPath>
     </Reference>
     <Reference Include="pango-sharp, Version=2.10.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\win32\dist\bin\pango-sharp.dll</HintPath>
+      <HintPath>..\win32\gtksharp\bin\pango-sharp.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />
@@ -109,7 +109,7 @@
   <!-- 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">
-    <CreateItem Include="..\win32\dist\**\*.*" Exclude="..\win32\**\.svn\**">
+    <CreateItem Include="..\win32\gtksharp\**\*.*" Exclude="..\win32\**\.svn\**">
       <Output TaskParameter="Include" ItemName="DistInclude" />
     </CreateItem>
     <Copy Sourcefiles="@(DistInclude)" DestinationFolder="$(OutDir)\..\%(RecursiveDir)" />

build-win32

@@ -37,7 +37,7 @@ rm -Rf "${BUILDDIR}"
 #i586-mingw32msvc-strip "${INSTALLDIR}/lib/"*.dll || true
 
 # Install gtk-sharp
-cp -r "win32/dist/"* "${INSTALLDIR}/"
+cp -r "win32/gtksharp/"* "${INSTALLDIR}/"
 
 # Install pipi-sharp
 mv "${INSTALLDIR}/lib/pipi-sharp/"* "${INSTALLDIR}/bin/"