X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=README.windows;h=86cd63618d842fc0f5fcbda1e229a9c02bf614ac;hb=564ba904339e2ff9b67f8c7e1ec7fc8ce7c74dec;hp=4430c996147c07dc6e5ff5843711f291210a678c;hpb=bd29a3f24202c6fce2386a2a0a6f5914bc99a29e;p=moonshot-ui.git

diff --git a/README.windows b/README.windows
index 4430c99..86cd636 100644
--- a/README.windows
+++ b/README.windows
@@ -28,7 +28,7 @@ You will also need to install the following tools:
 
   * ImageMagick (for converting .svg icons to .png in 'make icons'):
 
-     http://www.imagemagick.org/download/binaries/ImageMagick-6.6.9-10-Q16-windows-dll.exe
+     http://www.imagemagick.org/download/binaries/ImageMagick-6.7.3-7-Q16-windows-dll.exe
 
 I suggest you put all these things in their default locations (the installers
 will sometimes ignore attempts to install them in other places).
@@ -56,14 +56,29 @@ MIDL.EXE and the RPC API to make it usable from gcc.
   ./waf
   ./waf install
 
-You can then build moonshot from the MSYS shell:
+You can then configure moonshot from the MSYS shell:
 
   ACLOCAL="aclocal -I/c/build/share/aclocal" PKG_CONFIG_PATH=/c/build/lib/pkgconfig \
-  ./autogen.sh --disable-maintainer-mode
+    ./autogen.sh --disable-maintainer-mode --prefix=/c/build
+
+The configure script looks for various tools that it may not be able to locate
+automatically. In these cases you will get an error message, and you can set the
+environment variable described there to the location of the program. For example,
+if LIB.EXE is not found you will need to run
+
+  ACLOCAL="aclocal -I/c/build/share/aclocal" PKG_CONFIG_PATH=/c/build/lib/pkgconfig \
+    MSVC_LIB="/c/Program Files/...VC location../bin/lib.exe" \
+    ./autogen.sh --disable-maintainer-mode
+
+If this succeeds, you're ready to build!
+
   make
   make icons
   make installer
 
+The icons and installer targets make a few assumptions based on the install
+prefix. You may have to edit Makefile.am to edit the paths if you haven't
+followed the instructions exactly.
 
 Weird things that might go wrong
 --------------------------------
@@ -71,9 +86,13 @@ Weird things that might go wrong
 MSYS is a little fragile, here are some things to try if you get weird failures
 of any component:
 
-# Make sure your PATH looks like this:
-#   /c/build/bin:/c/tools/python:/usr/local/bin:/mingw/bin:/bin
-# so that there are no entries before these that might override a shell tool.
+  * Make sure your PATH looks like this:
+      /c/build/bin:/c/tools/python:/usr/local/bin:/mingw/bin:/bin
+    so that there are no entries before these that might override a shell tool.
+
+  * Sometimes TMP is set and this breaks some of the tools. Run:
+      export TMP=
+    to fix this.
 
-# Sometimes TMP is set and this breaks some of the tools
-export TMP=
+  * Don't ever use \ in paths (except to escape spaces) - always use /c/build/bin
+    not c:\build\bin. Otherwise shell scripts break all over the place.