From e4ad4d3e1953190ac346d36ca16b2a6382b6490f Mon Sep 17 00:00:00 2001 From: namespace Date: Sun, 4 Mar 2007 15:03:15 +0000 Subject: [PATCH] Linux compile fix and updated COMPILING git-svn-id: https://zerowing.idsoftware.com/svn/radiant/GtkRadiant/trunk@149 8a3a26a2-13c4-0310-b231-cf6edde360e5 --- COMPILING | 20 ++++++-------------- radiant/stacktrace.cpp | 2 ++ 2 files changed, 8 insertions(+), 14 deletions(-) diff --git a/COMPILING b/COMPILING index d197bc35..d6960e34 100644 --- a/COMPILING +++ b/COMPILING @@ -21,9 +21,9 @@ Linux/OSX(using X-windows) ========================== environment: -- gcc3 (preferably) -- scons = 0.96 (radiant is built with scons rather than make) -- python >= 2.3.0 (scons requires python, some build steps use python) +- gcc >= version 3.1 (preferably) +- scons >= 0.96 (radiant is built with scons rather than make) +- python >= 2.3.0, (scons requires python, some build steps use python) - svn >= 1.1 (some build steps use svn) dependencies: @@ -46,24 +46,16 @@ Execute './GtkRadiant/install/radiant.x86' (or './GtkRadiant/install/radiant.ppc -Win32 (2000 or XP) +Win32 (2000, XP or Vista) ================== environment: -- visual studio .net 2003 -- microsoft c++ compiler 7.1 (comes with vs.net 2003) +- visual studio 2005 - python 2.3.0 or later (some build steps use python) - subversion 1.1 or later (some build steps use svn) dependencies are prepackaged archives, extract them to the directory above GtkRadiant.sln: -- http://zerowing.idsoftware.com/files/radiant/developer/1.5/iconv-1.9.2.zip -- http://zerowing.idsoftware.com/files/radiant/developer/1.5/gtk2-2.4.14.zip (gtk-wimp, gtkglext, gtk, glib, atk, pango etc) -- http://zerowing.idsoftware.com/files/radiant/developer/1.5/libxml2-2.6.24.zip -- http://zerowing.idsoftware.com/files/radiant/developer/1.5/STLport-4.6.2.zip -- http://zerowing.idsoftware.com/files/radiant/developer/1.5/zlib1-1.2.1.zip (for archivezip module) -- http://zerowing.idsoftware.com/files/radiant/developer/1.5/libpng-1.2.5.zip (for imagepng module) -- http://zerowing.idsoftware.com/files/radiant/developer/1.5/mhash-0.9.1.zip (for q3map2) -- http://zerowing.idsoftware.com/files/radiant/developer/1.5/msvc_redist.zip (msvc runtime libraries) +- http://zerowing.idsoftware.com/files/radiant/developer/1.5/gtkradiant-1.5-dependencies-1.0.zip build: Open GtkRadiant.sln. diff --git a/radiant/stacktrace.cpp b/radiant/stacktrace.cpp index 850556a2..7c75db42 100644 --- a/radiant/stacktrace.cpp +++ b/radiant/stacktrace.cpp @@ -309,8 +309,10 @@ void write_stack_trace(TextOutputStream& outputStream) } #else +#if defined (WIN32) void write_stack_trace(TextOutputStream& outputStream) { outputStream << "\nStacktrace is disabled in release-builds\n"; } #endif +#endif -- 2.39.2