mirror of
https://github.com/UberGames/GtkRadiant.git
synced 2024-11-10 14:41:54 +00:00
(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
This commit is contained in:
parent
b8d058e623
commit
35afb8e83e
10 changed files with 38 additions and 24 deletions
9
CHANGES
9
CHANGES
|
@ -1,6 +1,15 @@
|
||||||
This is the changelog for developers, != changelog for the end user
|
This is the changelog for developers, != changelog for the end user
|
||||||
that we distribute with the binaries. (see changelog)
|
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
|
28/02/2007
|
||||||
namespace
|
namespace
|
||||||
- Radiant is now Vista compatible (Aero must be disabled)
|
- Radiant is now Vista compatible (Aero must be disabled)
|
||||||
|
|
|
@ -8,10 +8,11 @@ Thomas "namespace" Nitschke spam@codecreator.net
|
||||||
Stefan "Shaderman" Greven
|
Stefan "Shaderman" Greven
|
||||||
"Topsun"
|
"Topsun"
|
||||||
SmallPileofGibs spog@planetquake.com
|
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
|
||||||
----
|
----
|
||||||
|
|
|
@ -111,8 +111,7 @@ copyFileIfExists(libxml2, installRoot)
|
||||||
libmhash = os.path.normpath(os.path.join(thisDir, "../mhash-0.9/win32/libmhash/Release/libmhash.dll"))
|
libmhash = os.path.normpath(os.path.join(thisDir, "../mhash-0.9/win32/libmhash/Release/libmhash.dll"))
|
||||||
copyFileIfExists(libmhash, installRoot)
|
copyFileIfExists(libmhash, installRoot)
|
||||||
|
|
||||||
msvcr80 = os.path.normpath(os.path.join(thisDir, "../msvc_redist/msvcr80.dll"))
|
copySvn("../msvc_redist", installRoot)
|
||||||
copyFileIfExists(msvcr80, installRoot)
|
|
||||||
|
|
||||||
dbghelp = os.path.normpath(os.path.join(thisDir, "../msvc_redist/dbghelp.dll"))
|
dbghelp = os.path.normpath(os.path.join(thisDir, "../msvc_redist/dbghelp.dll"))
|
||||||
copyFileIfExists(dbghelp, installRoot)
|
copyFileIfExists(dbghelp, installRoot)
|
||||||
|
|
|
@ -70,13 +70,13 @@
|
||||||
/>
|
/>
|
||||||
<Tool
|
<Tool
|
||||||
Name="VCLinkerTool"
|
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"
|
OutputFile="$(OutDir)/$(ProjectName).exe"
|
||||||
LinkIncremental="1"
|
LinkIncremental="1"
|
||||||
SuppressStartupBanner="true"
|
SuppressStartupBanner="true"
|
||||||
AdditionalLibraryDirectories=""../../gtk2-2.10/lib";"../../libxml2-2.6/lib";"../libs/profile/debug/""
|
AdditionalLibraryDirectories=""../../gtk2-2.10/lib";"../../libxml2-2.6/lib";"../libs/profile/debug/""
|
||||||
IgnoreAllDefaultLibraries="true"
|
IgnoreAllDefaultLibraries="false"
|
||||||
IgnoreDefaultLibraryNames="msvcprtd.lib"
|
IgnoreDefaultLibraryNames=""
|
||||||
GenerateDebugInformation="true"
|
GenerateDebugInformation="true"
|
||||||
ProgramDatabaseFile="$(OutDir)/$(ProjectName).pdb"
|
ProgramDatabaseFile="$(OutDir)/$(ProjectName).pdb"
|
||||||
StripPrivateSymbols="$(OutDir)/$(ProjectName)_stripped.pdb"
|
StripPrivateSymbols="$(OutDir)/$(ProjectName)_stripped.pdb"
|
||||||
|
@ -151,7 +151,7 @@
|
||||||
UsePrecompiledHeader="0"
|
UsePrecompiledHeader="0"
|
||||||
WarningLevel="4"
|
WarningLevel="4"
|
||||||
Detect64BitPortabilityProblems="true"
|
Detect64BitPortabilityProblems="true"
|
||||||
DebugInformationFormat="3"
|
DebugInformationFormat="0"
|
||||||
DisableSpecificWarnings="4610;4510;4512;4505;4100;4127;4996"
|
DisableSpecificWarnings="4610;4510;4512;4505;4100;4127;4996"
|
||||||
/>
|
/>
|
||||||
<Tool
|
<Tool
|
||||||
|
@ -166,13 +166,13 @@
|
||||||
/>
|
/>
|
||||||
<Tool
|
<Tool
|
||||||
Name="VCLinkerTool"
|
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"
|
OutputFile="$(OutDir)/$(ProjectName).exe"
|
||||||
LinkIncremental="1"
|
LinkIncremental="1"
|
||||||
SuppressStartupBanner="true"
|
SuppressStartupBanner="true"
|
||||||
AdditionalLibraryDirectories=""../../gtk2-2.10/lib";"../../libxml2-2.6/lib";"../libs/profile/release/""
|
AdditionalLibraryDirectories=""../../gtk2-2.10/lib";"../../libxml2-2.6/lib";"../libs/profile/release/""
|
||||||
IgnoreAllDefaultLibraries="true"
|
IgnoreAllDefaultLibraries="false"
|
||||||
IgnoreDefaultLibraryNames="msvcprt.lib"
|
IgnoreDefaultLibraryNames=""
|
||||||
GenerateDebugInformation="true"
|
GenerateDebugInformation="true"
|
||||||
ProgramDatabaseFile="$(OutDir)/$(ProjectName).pdb"
|
ProgramDatabaseFile="$(OutDir)/$(ProjectName).pdb"
|
||||||
StripPrivateSymbols="$(OutDir)/$(ProjectName)_stripped.pdb"
|
StripPrivateSymbols="$(OutDir)/$(ProjectName)_stripped.pdb"
|
||||||
|
|
|
@ -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)
|
if(pixbuf != 0)
|
||||||
{
|
{
|
||||||
gtk_window_set_icon(window, pixbuf);
|
gtk_window_set_icon(window, pixbuf);
|
||||||
|
|
|
@ -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 "windows.h"
|
||||||
#include "winnt.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
|
||||||
|
|
Binary file not shown.
Before Width: | Height: | Size: 630 B After Width: | Height: | Size: 3.1 KiB |
|
@ -10,7 +10,7 @@
|
||||||
</dir>
|
</dir>
|
||||||
<dir name="lib">
|
<dir name="lib">
|
||||||
<dir name="gtk-2.0">
|
<dir name="gtk-2.0">
|
||||||
<dir name="2.4.0">
|
<dir name="2.10.0">
|
||||||
<dir name="engines">
|
<dir name="engines">
|
||||||
<file name="libwimp.dll"/>
|
<file name="libwimp.dll"/>
|
||||||
</dir>
|
</dir>
|
||||||
|
|
|
@ -9,17 +9,17 @@
|
||||||
<component name=".\components\q2map.xml" root="..\..\install" />
|
<component name=".\components\q2map.xml" root="..\..\install" />
|
||||||
<component name=".\components\bspc.xml" root="bin" />
|
<component name=".\components\bspc.xml" root="bin" />
|
||||||
<component name=".\components\iconv.xml" root="..\..\..\iconv-1.9\bin" />
|
<component name=".\components\iconv.xml" root="..\..\..\iconv-1.9\bin" />
|
||||||
<component name=".\components\intl.xml" root="..\..\..\gtk2-2.4\install" />
|
<component name=".\components\intl.xml" root="..\..\..\gtk2-2.10\install" />
|
||||||
<component name=".\components\glib2.xml" root="..\..\..\gtk2-2.4\install" />
|
<component name=".\components\glib2.xml" root="..\..\install" />
|
||||||
<component name=".\components\atk.xml" root="..\..\..\gtk2-2.4\install" />
|
<component name=".\components\atk.xml" root="..\..\install" />
|
||||||
<component name=".\components\pango.xml" root="..\..\..\gtk2-2.4\install" />
|
<component name=".\components\pango.xml" root="..\..\install" />
|
||||||
<component name=".\components\gtk2.xml" root="..\..\..\gtk2-2.4\install" />
|
<component name=".\components\gtk2.xml" root="..\..\install" />
|
||||||
<component name=".\components\gtkglext.xml" root="..\..\..\gtk2-2.4\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\zlib.xml" root="..\..\install" />
|
||||||
<component name=".\components\msvcr71.xml" root="..\..\install" />
|
<component name=".\components\msvcr80.xml" root="..\..\install" />
|
||||||
<component name=".\components\dbghelp.xml" root="..\..\install" />
|
<component name=".\components\dbghelp.xml" root="..\..\install" />
|
||||||
<component name=".\components\archivezip.xml" root="..\..\install" />
|
<component name=".\components\archivezip.xml" root="..\..\install" />
|
||||||
<component name=".\components\archivepak.xml" root="..\..\install" />
|
<component name=".\components\archivepak.xml" root="..\..\install" />
|
||||||
|
|
|
@ -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_VERSION "2.5.17"
|
||||||
#define Q3MAP_MOTD "Voter turnout"
|
#define Q3MAP_MOTD "Last one turns the lights off"
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue