From bc745f7342fc531a9c3d8293204fd6a958b08cca Mon Sep 17 00:00:00 2001
From: divverent <divverent@61c419a2-8eb2-4b30-bcec-8cead039b335>
Date: Tue, 9 Dec 2008 09:04:07 +0000
Subject: [PATCH 1/1] update changelog; make the Makefile support a
 MAKEFILE_CONF parameter to not have to symlink cross-Makefile.conf all the
 time

git-svn-id: svn://svn.icculus.org/netradiant/trunk@134 61c419a2-8eb2-4b30-bcec-8cead039b335
---
 ChangeLog                       | 26 ++++++++++++++++++++++++++
 CHANGES => ChangeLog.idsoftware |  0
 Makefile                        |  3 ++-
 cross-Makefile.conf             |  4 ++--
 4 files changed, 30 insertions(+), 3 deletions(-)
 rename CHANGES => ChangeLog.idsoftware (100%)

diff --git a/ChangeLog b/ChangeLog
index 1d1012aa..5703e497 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,29 @@
+2008-11-28 Rudolf Polzer divVerent(at)alientrap.org
+	* q3map2: -dirty: don't treat skybox surfaces as solid for dirtmapping;
+	  prevents Quake 2-ish "dark near skybox" effect.
+
+2008-11-21 Rudolf Polzer divVerent(at)alientrap.org
+	* radiant: applied win32 font and build fix by ingar
+
+2008-11-20 Rudolf Polzer divVerent(at)alientrap.org
+	* q3map2: extend some more limits but just by a bit this time to not
+	  let memory usage rise too high
+	* radiant: fix finding the .mtl file for .obj models
+
+2008-11-18 Rudolf Polzer divVerent(at)alientrap.org
+	* q3map2: get rid of the MAX_MAP_DRAW_VERTS limit (the array already was
+	  dynamic anyway); allows creating BSPs of over 400 MB in size ;)
+
+2008-11-10 Rudolf Polzer divVerent(at)alientrap.org
+	* radiant: draw targeting arrows also for target2, etc. keys even in Q3
+	  map mode; this is good for Nexuiz which now supports target, target2,
+	  target3 and target4.
+
+2008-11-07 Rudolf Polzer divVerent(at)alientrap.org
+	* radiant: fix buffer overruns because of using the realpath function
+	  with an insufficient buffer; there might be more of these in the code
+	  base
+
 2008-10-27 Rudolf Polzer divVerent(at)alientrap.org
 	* q3map2: -convert -format ase -shadersasbitmap convert mode that writes
 	  the shader names in the *BITMAP field in the .ase. That way, the .ase
diff --git a/CHANGES b/ChangeLog.idsoftware
similarity index 100%
rename from CHANGES
rename to ChangeLog.idsoftware
diff --git a/Makefile b/Makefile
index 7bd232cc..e3d5ddcd 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,5 @@
--include Makefile.conf
+MAKEFILE_CONF      ?= Makefile.conf
+-include $(MAKEFILE_CONF)
 
 ## CONFIGURATION SETTINGS
 # user customizable stuf
diff --git a/cross-Makefile.conf b/cross-Makefile.conf
index 1fd92f99..dd4229a7 100644
--- a/cross-Makefile.conf
+++ b/cross-Makefile.conf
@@ -3,10 +3,10 @@
 # edit the paths in here
 
 # how to call the mingw tools
-MINGW_EXEC_PREFIX = i586-mingw32msvc-
+MINGW_EXEC_PREFIX = i386-mingw32-
 
 # where the dependencies package is extracted
-RADIANT_DEPENDENCIES_PREFIX = $(HOME)/radiantdeps/
+RADIANT_DEPENDENCIES_PREFIX = /home/divverent/radiant-deps-mingw32/
 
 # run the prefix fixing tool
 IGNORETHIS := $(shell cd $(RADIANT_DEPENDENCIES_PREFIX) && ./fixprefix.sh)
-- 
2.39.2