From: namespace <namespace>
Date: Sat, 3 Mar 2007 18:01:05 +0000 (+0000)
Subject: (THIS IS A TRANSITIONAL REVISION, DO NOT USE, WAIT FOR UPDATED DEPS)
X-Git-Tag: xonotic-v0.7.0~16^2~12^2~148
X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fnetradiant.git;a=commitdiff_plain;h=35afb8e83e19ad68aabcbfcf0bbe5cfde1e4881f

(THIS IS A TRANSITIONAL REVISION, DO NOT USE, WAIT FOR UPDATED DEPS)
- Fixed weird msvcrt bugs caused by dbghelp.dll
- Activated new radiant icon on Linux (Topsun)
- First update for installerfiles (Shaderman)
- New MODT for q3map2 :)
- tiny changes

git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/trunk@146 8a3a26a2-13c4-0310-b231-cf6edde360e5
---

diff --git a/CHANGES b/CHANGES
index ede320a5..4be96159 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,15 @@
 This is the changelog for developers, != changelog for the end user 
 that we distribute with the binaries. (see changelog)
 
+03/03/2007
+namespace
+(THIS IS A TRANSITIONAL REVISION, DO NOT USE, WAIT FOR UPDATED DEPS)
+- Fixed weird msvcrt bugs caused by dbghelp.dll
+- Activated new radiant icon on Linux (Topsun)
+- First update for installerfiles (Shaderman)
+- New MODT for q3map2 :)
+- tiny changes
+
 28/02/2007
 namespace
 - Radiant is now Vista compatible (Aero must be disabled)
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 9590febe..664e339d 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -8,10 +8,11 @@ Thomas "namespace" Nitschke spam@codecreator.net
 Stefan "Shaderman" Greven
 "Topsun"
 SmallPileofGibs spog@planetquake.com
+"Tr3b"
 
 Small contributions and improvements for 1.5
 --------
-"eb"
+Eric "eb" Barth
 
 Loki
 ----
diff --git a/install.py b/install.py
index 10960da9..3a2f284f 100644
--- a/install.py
+++ b/install.py
@@ -111,8 +111,7 @@ copyFileIfExists(libxml2, installRoot)
 libmhash = os.path.normpath(os.path.join(thisDir, "../mhash-0.9/win32/libmhash/Release/libmhash.dll"))
 copyFileIfExists(libmhash, installRoot)
 
-msvcr80 = os.path.normpath(os.path.join(thisDir, "../msvc_redist/msvcr80.dll"))
-copyFileIfExists(msvcr80, installRoot)
+copySvn("../msvc_redist", installRoot)
 
 dbghelp = os.path.normpath(os.path.join(thisDir, "../msvc_redist/dbghelp.dll"))
 copyFileIfExists(dbghelp, installRoot)
diff --git a/radiant/GtkRadiant.vcproj b/radiant/GtkRadiant.vcproj
index 985e6bf3..364fb6b9 100644
--- a/radiant/GtkRadiant.vcproj
+++ b/radiant/GtkRadiant.vcproj
@@ -70,13 +70,13 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="msvcrtd.lib oldnames.lib winmm.lib shell32.lib kernel32.lib user32.lib gdi32.lib shfolder.lib wsock32.lib dbghelp.lib glib-2.0.lib gobject-2.0.lib gdk-win32-2.0.lib gdk_pixbuf-2.0.lib gtk-win32-2.0.lib pango-1.0.lib gtkglext-win32-1.0.lib gdkglext-win32-1.0.lib opengl32.lib libxml2.lib profile.lib $(NOINHERIT)"
+				AdditionalDependencies="winmm.lib shell32.lib kernel32.lib gdi32.lib user32.lib wsock32.lib dbghelp.lib glib-2.0.lib gobject-2.0.lib gdk-win32-2.0.lib gdk_pixbuf-2.0.lib gtk-win32-2.0.lib pango-1.0.lib gtkglext-win32-1.0.lib gdkglext-win32-1.0.lib opengl32.lib libxml2.lib profile.lib $(NOINHERIT)"
 				OutputFile="$(OutDir)/$(ProjectName).exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="&quot;../../gtk2-2.10/lib&quot;;&quot;../../libxml2-2.6/lib&quot;;&quot;../libs/profile/debug/&quot;"
-				IgnoreAllDefaultLibraries="true"
-				IgnoreDefaultLibraryNames="msvcprtd.lib"
+				IgnoreAllDefaultLibraries="false"
+				IgnoreDefaultLibraryNames=""
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)/$(ProjectName).pdb"
 				StripPrivateSymbols="$(OutDir)/$(ProjectName)_stripped.pdb"
@@ -151,7 +151,7 @@
 				UsePrecompiledHeader="0"
 				WarningLevel="4"
 				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
+				DebugInformationFormat="0"
 				DisableSpecificWarnings="4610;4510;4512;4505;4100;4127;4996"
 			/>
 			<Tool
@@ -166,13 +166,13 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="msvcrt.lib oldnames.lib winmm.lib kernel32.lib user32.lib gdi32.lib shfolder.lib wsock32.lib dbghelp.lib glib-2.0.lib gobject-2.0.lib gdk-win32-2.0.lib gdk_pixbuf-2.0.lib gtk-win32-2.0.lib pango-1.0.lib gtkglext-win32-1.0.lib gdkglext-win32-1.0.lib opengl32.lib libxml2.lib profile.lib"
+				AdditionalDependencies="winmm.lib kernel32.lib user32.lib gdi32.lib wsock32.lib glib-2.0.lib gobject-2.0.lib gdk-win32-2.0.lib gdk_pixbuf-2.0.lib gtk-win32-2.0.lib pango-1.0.lib gtkglext-win32-1.0.lib gdkglext-win32-1.0.lib opengl32.lib libxml2.lib profile.lib"
 				OutputFile="$(OutDir)/$(ProjectName).exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="&quot;../../gtk2-2.10/lib&quot;;&quot;../../libxml2-2.6/lib&quot;;&quot;../libs/profile/release/&quot;"
-				IgnoreAllDefaultLibraries="true"
-				IgnoreDefaultLibraryNames="msvcprt.lib"
+				IgnoreAllDefaultLibraries="false"
+				IgnoreDefaultLibraryNames=""
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)/$(ProjectName).pdb"
 				StripPrivateSymbols="$(OutDir)/$(ProjectName)_stripped.pdb"
diff --git a/radiant/mainframe.cpp b/radiant/mainframe.cpp
index 7710d468..6af2cf8f 100644
--- a/radiant/mainframe.cpp
+++ b/radiant/mainframe.cpp
@@ -2890,7 +2890,7 @@ void MainFrame::Create()
 
 #if !defined(WIN32)
   {
-    GdkPixbuf* pixbuf = pixbuf_new_from_file_with_mask("icon.bmp");
+    GdkPixbuf* pixbuf = pixbuf_new_from_file_with_mask("bitmaps/icon.bmp");
     if(pixbuf != 0)
     {
       gtk_window_set_icon(window, pixbuf);
diff --git a/radiant/stacktrace.cpp b/radiant/stacktrace.cpp
index f4daecb1..850556a2 100644
--- a/radiant/stacktrace.cpp
+++ b/radiant/stacktrace.cpp
@@ -51,7 +51,7 @@ void write_stack_trace(TextOutputStream& outputStream)
 }	
 #endif
 
-#if defined (WIN32) && defined (_MSC_VER)
+#if defined (WIN32) && defined (_MSC_VER) && defined (DEBUG)
 
 #include "windows.h"
 #include "winnt.h"
@@ -308,4 +308,9 @@ void write_stack_trace(TextOutputStream& outputStream)
   __try{ RaiseException(0,0,0,0); } __except(write_stack_trace((GetExceptionInformation())->ContextRecord, outputStream), EXCEPTION_CONTINUE_EXECUTION) {}
 }
 
+#else
+void write_stack_trace(TextOutputStream& outputStream)
+{
+	outputStream << "\nStacktrace is disabled in release-builds\n";
+}
 #endif
diff --git a/setup/data/tools/bitmaps/icon.bmp b/setup/data/tools/bitmaps/icon.bmp
index 4224da83..e270952b 100644
Binary files a/setup/data/tools/bitmaps/icon.bmp and b/setup/data/tools/bitmaps/icon.bmp differ
diff --git a/setup/win32/components/gtk2.xml b/setup/win32/components/gtk2.xml
index 7ffbe5ee..e71720b3 100644
--- a/setup/win32/components/gtk2.xml
+++ b/setup/win32/components/gtk2.xml
@@ -10,7 +10,7 @@
   </dir>
   <dir name="lib">
     <dir name="gtk-2.0">
-      <dir name="2.4.0">
+      <dir name="2.10.0">
         <dir name="engines">
           <file name="libwimp.dll"/>
         </dir>
diff --git a/setup/win32/gtkradiant-1.5.0.xml b/setup/win32/gtkradiant-1.5.0.xml
index 941e6d2d..d964a59f 100644
--- a/setup/win32/gtkradiant-1.5.0.xml
+++ b/setup/win32/gtkradiant-1.5.0.xml
@@ -9,17 +9,17 @@
     <component name=".\components\q2map.xml" root="..\..\install" />
     <component name=".\components\bspc.xml" root="bin" />
     <component name=".\components\iconv.xml" root="..\..\..\iconv-1.9\bin" />
-    <component name=".\components\intl.xml" root="..\..\..\gtk2-2.4\install" />
-    <component name=".\components\glib2.xml" root="..\..\..\gtk2-2.4\install" />
-    <component name=".\components\atk.xml" root="..\..\..\gtk2-2.4\install" />
-    <component name=".\components\pango.xml" root="..\..\..\gtk2-2.4\install" />
-    <component name=".\components\gtk2.xml" root="..\..\..\gtk2-2.4\install" />
-    <component name=".\components\gtkglext.xml" root="..\..\..\gtk2-2.4\install" />
+    <component name=".\components\intl.xml" root="..\..\..\gtk2-2.10\install" />
+	<component name=".\components\glib2.xml" root="..\..\install" />
+    <component name=".\components\atk.xml" root="..\..\install" />
+    <component name=".\components\pango.xml" root="..\..\install" />
+    <component name=".\components\gtk2.xml" root="..\..\install" />
+    <component name=".\components\gtkglext.xml" root="..\..\..\gtk2-2.10\install" />
     <component name=".\components\libxml2.xml" root="..\..\..\libxml2-2.6\bin" />
-    <component name=".\components\libpng13.xml" root="..\..\..\libpng-1.2\lib" />
+    <component name=".\components\libpng13.xml" root="..\..\install" />
     <component name=".\components\libmhash.xml" root="..\..\..\mhash-0.9\win32\libmhash\Release" />
-    <component name=".\components\zlib.xml" root="..\..\..\zlib1-1.2" />
-    <component name=".\components\msvcr71.xml" root="..\..\install" />
+    <component name=".\components\zlib.xml" root="..\..\install" />
+    <component name=".\components\msvcr80.xml" root="..\..\install" />
     <component name=".\components\dbghelp.xml" root="..\..\install" />
     <component name=".\components\archivezip.xml" root="..\..\install" />
     <component name=".\components\archivepak.xml" root="..\..\install" />
diff --git a/tools/quake3/q3map2/q3map2.h b/tools/quake3/q3map2/q3map2.h
index f91dbaae..9d8dadde 100644
--- a/tools/quake3/q3map2/q3map2.h
+++ b/tools/quake3/q3map2/q3map2.h
@@ -35,8 +35,8 @@ several games based on the Quake III Arena engine, in the form of "Q3Map2."
 
 
 /* version */
-#define Q3MAP_VERSION	"2.5.16"
-#define Q3MAP_MOTD		"Voter turnout"
+#define Q3MAP_VERSION	"2.5.17"
+#define Q3MAP_MOTD		"Last one turns the lights off"