(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 ede320a5409ec2aec9bcc1cae9288234556d6e2b..4be9615991bc918be4fc8ca357c3d07d2d86c5c2 100644 (file)
--- 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)
 
 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)
 28/02/2007
 namespace
 - Radiant is now Vista compatible (Aero must be disabled)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 9590febe226573ec60e10bbb4abf30d86ca738f5..664e339d3ae518ce7bdd2c35e1472d1a407d2a09 100644 (file)
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -8,10 +8,11 @@ Thomas "namespace" Nitschke spam@codecreator.net
 Stefan "Shaderman" Greven
 "Topsun"
 SmallPileofGibs spog@planetquake.com
 Stefan "Shaderman" Greven
 "Topsun"
 SmallPileofGibs spog@planetquake.com

+"Tr3b"

 
 Small contributions and improvements for 1.5
 --------
 
 Small contributions and improvements for 1.5
 --------

-"eb"
+Eric "eb" Barth

 
 Loki
 ----
 
 Loki
 ----

diff --git a/install.py b/install.py
index 10960da94c115ae755c6d81e738437d26b74500a..3a2f284fba37e2e6da425a8337f5301709f69e0f 100644 (file)
--- 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)
 
 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)
 
 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 985e6bf3ff2eb392fb8b4d0b32b8edec37422d72..364fb6b96c6853c315108adf8fb09057e701d884 100644 (file)
--- a/radiant/GtkRadiant.vcproj
+++ b/radiant/GtkRadiant.vcproj
@@ -70,13 +70,13 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r

-                               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)"\r
+                               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)"\r

                                OutputFile="$(OutDir)/$(ProjectName).exe"\r
                                LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories="&quot;../../gtk2-2.10/lib&quot;;&quot;../../libxml2-2.6/lib&quot;;&quot;../libs/profile/debug/&quot;"\r
                                OutputFile="$(OutDir)/$(ProjectName).exe"\r
                                LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories="&quot;../../gtk2-2.10/lib&quot;;&quot;../../libxml2-2.6/lib&quot;;&quot;../libs/profile/debug/&quot;"\r

-                               IgnoreAllDefaultLibraries="true"\r
-                               IgnoreDefaultLibraryNames="msvcprtd.lib"\r
+                               IgnoreAllDefaultLibraries="false"\r
+                               IgnoreDefaultLibraryNames=""\r

                                GenerateDebugInformation="true"\r
                                ProgramDatabaseFile="$(OutDir)/$(ProjectName).pdb"\r
                                StripPrivateSymbols="$(OutDir)/$(ProjectName)_stripped.pdb"\r
                                GenerateDebugInformation="true"\r
                                ProgramDatabaseFile="$(OutDir)/$(ProjectName).pdb"\r
                                StripPrivateSymbols="$(OutDir)/$(ProjectName)_stripped.pdb"\r


@@ -151,7 +151,7 @@
                                UsePrecompiledHeader="0"\r
                                WarningLevel="4"\r
                                Detect64BitPortabilityProblems="true"\r
                                UsePrecompiledHeader="0"\r
                                WarningLevel="4"\r
                                Detect64BitPortabilityProblems="true"\r

-                               DebugInformationFormat="3"\r
+                               DebugInformationFormat="0"\r

                                DisableSpecificWarnings="4610;4510;4512;4505;4100;4127;4996"\r
                        />\r
                        <Tool\r
                                DisableSpecificWarnings="4610;4510;4512;4505;4100;4127;4996"\r
                        />\r
                        <Tool\r


@@ -166,13 +166,13 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r

-                               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"\r
+                               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"\r

                                OutputFile="$(OutDir)/$(ProjectName).exe"\r
                                LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories="&quot;../../gtk2-2.10/lib&quot;;&quot;../../libxml2-2.6/lib&quot;;&quot;../libs/profile/release/&quot;"\r
                                OutputFile="$(OutDir)/$(ProjectName).exe"\r
                                LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories="&quot;../../gtk2-2.10/lib&quot;;&quot;../../libxml2-2.6/lib&quot;;&quot;../libs/profile/release/&quot;"\r

-                               IgnoreAllDefaultLibraries="true"\r
-                               IgnoreDefaultLibraryNames="msvcprt.lib"\r
+                               IgnoreAllDefaultLibraries="false"\r
+                               IgnoreDefaultLibraryNames=""\r

                                GenerateDebugInformation="true"\r
                                ProgramDatabaseFile="$(OutDir)/$(ProjectName).pdb"\r
                                StripPrivateSymbols="$(OutDir)/$(ProjectName)_stripped.pdb"\r
                                GenerateDebugInformation="true"\r
                                ProgramDatabaseFile="$(OutDir)/$(ProjectName).pdb"\r
                                StripPrivateSymbols="$(OutDir)/$(ProjectName)_stripped.pdb"\r

diff --git a/radiant/mainframe.cpp b/radiant/mainframe.cpp
index 7710d468a62794efad3492a65f740b0012e4f79f..6af2cf8f69854028ae087b79b817054ae9840cde 100644 (file)
--- a/radiant/mainframe.cpp
+++ b/radiant/mainframe.cpp
@@ -2890,7 +2890,7 @@ void MainFrame::Create()
 
 #if !defined(WIN32)
   {
 
 #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);
     if(pixbuf != 0)
     {
       gtk_window_set_icon(window, pixbuf);

diff --git a/radiant/stacktrace.cpp b/radiant/stacktrace.cpp
index f4daecb1482c17c9214fe65976b9d1815bf2e62e..850556a22a37d5ee18c0c25702d3ef1c4e33c235 100644 (file)
--- a/radiant/stacktrace.cpp
+++ b/radiant/stacktrace.cpp
@@ -51,7 +51,7 @@ void write_stack_trace(TextOutputStream& outputStream)
 }      
 #endif
 
 }      
 #endif
 

-#if defined (WIN32) && defined (_MSC_VER)
+#if defined (WIN32) && defined (_MSC_VER) && defined (DEBUG)

 
 #include "windows.h"
 #include "winnt.h"
 
 #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) {}
 }
 
   __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
 #endif

diff --git a/setup/data/tools/bitmaps/icon.bmp b/setup/data/tools/bitmaps/icon.bmp
index 4224da83bd4e52d7dbcec18590434482522700b5..e270952b393fa7a60d566fafaea28cba63cdc761 100644 (file)
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 7ffbe5eeacb23f53c8e02b2dc3ad678ee0b38abf..e71720b3cfce9b224d94127f2ed0b7b168f9cafd 100644 (file)
--- 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>
   <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>
         <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 941e6d2d2f3bafcbb12860956843b416b1208849..d964a59f877626758328cd23a6f28d843b148ca1 100644 (file)
--- 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\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\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\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" />
     <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 f91dbaae9f62f5b2bcc2f98d7beb89aa1447192f..9d8daddecc0c67391e74bc8cfdcae4daa5462764 100644 (file)
--- 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 */
 
 
 /* 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"