From a6f747ac139730b3a8848258ebb0e8cff4aba2fd Mon Sep 17 00:00:00 2001
From: Rudolf Polzer <divVerent@xonotic.org>
Date: Sat, 11 Dec 2010 15:27:29 +0100
Subject: [PATCH] update win32 instructions a bit

---
 COMPILING          | 24 ++++++++----------------
 mingw-Makefile.inc |  2 +-
 2 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/COMPILING b/COMPILING
index 3ac7976..3be80f4 100644
--- a/COMPILING
+++ b/COMPILING
@@ -65,26 +65,18 @@ Win32 (2000, XP, Vista or Windows 7)
 ==================
 
 environment:
-- MinGW
-  http://www.mingw.org/wiki/HOWTO_Install_the_MinGW_GCC_Compiler_Suite (the installer link)
-  Install this to c:\mingw, and select the components C compiler, C++ compiler, Make
-- MSYS
-  http://www.mingw.org/wiki/msys (you need the installer MSYS-versionnumber.exe)
-  Install this to c:\msys\1.0
+- MinGW (http://www.mingw.org/wiki/Getting_Started)
+  Install this to c:\mingw, and select the components C compiler, C++ compiler
+  and MSYS Basic System
 - Prepackaged Radiant dependencies (Gtk and other stuff):
-  http://www.icculus.org/netradiant/files/radiant-deps-mingw32.zip
-  Preferably extract this one to c:\mingw\radiant-deps-mingw32
-  OUTDATED!
-- Subversion must be installed and available in PATH to download the game packs
-- msysGit must be installed and available in PATH to download the game packs
+  http://www.icculus.org/netradiant/files/radiant-deps-mingw32.zip OUTDATED!
+  Preferably extract this one to
+  c:\mingw\msys\1.0\home\username\netradiant-dependencies-mingw32
 
 build:
-- Start the MSYS shell (to be found in c:\msys\1.0\msys.bat)
+- Start the MSYS shell
 - Switch to the directory with NetRadiant source
-- cp mingw-Makefile.conf Makefile.conf
-- (edit mingw-Makefile.conf in case you installed anything to other locations
-  than the recommended ones)
-- make
+- make MAKEFILE_CONF=mingw-Makefile.conf
 
 run:
 - in the "install" directory, double click netradiant.exe
diff --git a/mingw-Makefile.inc b/mingw-Makefile.inc
index 0710fe1..32dc6b1 100644
--- a/mingw-Makefile.inc
+++ b/mingw-Makefile.inc
@@ -2,7 +2,7 @@
 MINGW_EXEC_PREFIX ?=
 
 # where the dependencies package is extracted
-RADIANT_DEPENDENCIES_PREFIX = $(HOME)/radiant-deps-mingw32/
+RADIANT_DEPENDENCIES_PREFIX = $(HOME)/netradiant-dependencies-mingw32/
 
 # run the prefix fixing tool
 IGNORETHIS := $(shell cd $(RADIANT_DEPENDENCIES_PREFIX) && ./fixprefix.sh)
-- 
2.39.2