ubergames/gtkradiant
0
0
Fork 0
mirror of https://github.com/UberGames/GtkRadiant.git synced 2024-11-10 06:31:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix crashes: libxml2 static linking, turn off libintl stuff

Browse source
This commit is contained in:
Timothee Besset 2013-06-03 03:23:11 +01:00
parent 0acbb7abbb
commit 5d0b2a2b94
12 changed files with 51 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libs/synapse.h
View file

@ -70,6 +70,10 @@
// if you #include glib *after* STL, you get those errors .. better be safe then
#include <glib.h>
#if defined( _WIN32 )
// required for static linking libxml on Windows
#define LIBXML_STATIC
#endif
#include "libxml/parser.h"
#include "irefcount.h"

4
plugins/mapxml/plugin.h
View file

@ -24,6 +24,10 @@
#include <stdlib.h>
#include <stdio.h>
#if defined( _WIN32 )
// required for static linking libxml on Windows
#define LIBXML_STATIC
#endif
#include "libxml/parser.h"
#include "synapse.h"

8
radiant.sln
View file

@ -80,6 +80,14 @@ EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vfsqlpk3", "plugins\vfsqlpk3\vfsqlpk3.vcxproj", "{9FD68F2C-B26A-461D-96E0-55AFC48AC9E0}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "q3map2_urt", "tools\urt\tools\quake3\q3map2\q3map2_urt.vcxproj", "{7AF7537E-94C3-4680-8F5E-C1CE30DC2041}"
ProjectSection(ProjectDependencies) = postProject
{B957BA35-F807-4C84-85A2-C1F9AC56713B} = {B957BA35-F807-4C84-85A2-C1F9AC56713B}
{818BAC3D-0399-4416-930D-0AA28D55F798} = {818BAC3D-0399-4416-930D-0AA28D55F798}
{12E69671-B980-4BFF-BC1A-6D9A3C158D16} = {12E69671-B980-4BFF-BC1A-6D9A3C158D16}
{B99A58B4-E5AB-42F6-A28F-D7ACB80E0B06} = {B99A58B4-E5AB-42F6-A28F-D7ACB80E0B06}
{14734EBB-B167-48D9-9B93-2277F645925F} = {14734EBB-B167-48D9-9B93-2277F645925F}
{DDE81BE7-D457-47F3-9762-A838EFA2672E} = {DDE81BE7-D457-47F3-9762-A838EFA2672E}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "q3data", "tools\quake3\q3data\q3data.vcxproj", "{8DFCF3C0-5EC6-4E28-9D38-23FBE5F214FB}"
EndProject

4
radiant/feedback.h
View file

@ -28,6 +28,10 @@
#ifndef __Q3MAP_FEEDBACK__
#define __Q3MAP_FEEDBACK__
#if defined( _WIN32 )
// required for static linking libxml on Windows
#define LIBXML_STATIC
#endif
#include "libxml/parser.h"
// a select message with a brush/entity select information

3
radiant/preferences.cpp
View file

@ -3465,6 +3465,9 @@ void CGameInstall::Run() {
if ( fg == NULL ) {
Error( "Failed to open %s for writing\n", gameFilePath.GetBuffer() );
}
// Running Windows, crashing here?
// Make sure that libintl.h is not redefining fprintf to some broken BS!
// - TTimo
fprintf( fg, "<?xml version=\"1.0\" encoding=\"iso-8859-1\" standalone=\"yes\"?>\n<game\n" );
fprintf( fg, " name=\"%s\"\n", m_strName.GetBuffer() );
fprintf( fg, " "ENGINEPATH_ATTRIBUTE "=\"%s\"\n", m_strEngine.GetBuffer() );

4
radiant/xmlstuff.h
View file

@ -37,6 +37,10 @@
#ifndef __XMLSTUFF__
#define __XMLSTUFF__
#if defined( _WIN32 )
// required for static linking libxml on Windows
#define LIBXML_STATIC
#endif
#include "libxml/parser.h"
struct message_info_s;

4
tools/quake2/common/inout.c
View file

@ -40,6 +40,10 @@
// network broadcasting
#include "l_net/l_net.h"
#if defined( _WIN32 )
// required for static linking libxml on Windows
#define LIBXML_STATIC
#endif
#include "libxml/tree.h"
#ifdef WIN32

4
tools/quake2/common/inout.h
View file

@ -23,6 +23,10 @@
#define __INOUT__
// inout is the only stuff relying on xml, include the headers there
#if defined( _WIN32 )
// required for static linking libxml on Windows
#define LIBXML_STATIC
#endif
#include "libxml/tree.h"
#include "mathlib.h"

4
tools/quake2/qdata_heretic2/common/inout.c
View file

@ -40,6 +40,10 @@
// network broadcasting
#include "l_net/l_net.h"
#if defined( _WIN32 )
// required for static linking libxml on Windows
#define LIBXML_STATIC
#endif
#include "libxml/tree.h"
#ifdef WIN32

4
tools/quake2/qdata_heretic2/common/inout.h
View file

@ -23,6 +23,10 @@
#define __INOUT__
// inout is the only stuff relying on xml, include the headers there
#if defined( _WIN32 )
// required for static linking libxml on Windows
#define LIBXML_STATIC
#endif
#include "libxml/tree.h"
#include "mathlib.h"

4
tools/quake3/common/inout.c
View file

@ -40,6 +40,10 @@
// network broadcasting
#include "l_net/l_net.h"
#if defined( _WIN32 )
// required for static linking libxml on Windows
#define LIBXML_STATIC
#endif
#include "libxml/tree.h"
// utf8 conversion

4
tools/quake3/common/inout.h
View file

@ -23,6 +23,10 @@
#define __INOUT__
// inout is the only stuff relying on xml, include the headers there
#if defined( _WIN32 )
// required for static linking libxml on Windows
#define LIBXML_STATIC
#endif
#include "libxml/tree.h"
#include "mathlib.h"