Attachment #107542 for bug #127026

View | Details | Raw Unified | Return to bug 127026 | Differences between

and this patch




		if build_target == 'client':
			flags += '-DAPPID=secondlife -DLL_SDL=1 -DLL_X11=1 '
			flags += '-DLL_GTK=1 '
			client_external_libs += [ 'gtk-x11-2.0', 'ELFIO' ]
			include_dirs += [ '../libraries/' + system_str + '/include/gtk-2.0' ]
			include_dirs += [ '../libraries/' + system_str + '/include/glib-2.0']
			include_dirs += [ '../libraries/' + system_str + '/include/pango-1.0' ]
			include_dirs += [ '../libraries/' + system_str + '/include/atk-1.0' ]
			include_dirs += [ '../libraries/' + system_str + '/include/ELFIO' ]
			include_dirs += [ '../libraries/' + system_str + '/include/llfreetype2' ]
			pipe = os.popen('pkg-config gtk+-2.0 --cflags')
			flags += pipe.read().rstrip('\n') + ' '
			pipe.close()
			pipe = os.popen('freetype-config --cflags')
			flags += pipe.read().rstrip('\n') + ' '
			pipe.close()
	else:
		# Mac-only flags
		flags += '-x c++ -arch ppc -pipe -Wno-trigraphs -fpascal-strings -faltivec -fasm-blocks -g -O2 -fmessage-length=0 -mtune=G4 -Wno-deprecated-declarations -Wno-invalid-offsetof -mmacosx-version-min=10.3 -DLL_DARWIN=1 -Wmost -Wno-sign-compare -Wno-switch -fpch-preprocess -F./newview/build/Deployment -fconstant-cfstrings -ffor-scope -Wno-reorder -isysroot /Developer/SDKs/MacOSX10.3.9.sdk '

	### Build type-specific flags ###

	debug_opts = flags + '-fno-inline -O0 -D_DEBUG -DLL_DEBUG=1 '
	release_opts = flags + '-DNDEBUG -DLL_RELEASE=1 '
	releasenoopt_opts = flags + '-O0 -DNDEBUG -DLL_RELEASE=1 '
	releasefordownload_opts = flags + '-O2 -DNDEBUG -DLL_RELEASE=1 -DLL_RELEASE_FOR_DOWNLOAD=1 '


Lines 35-41 Link Here

(-)linden.orig/indra/llcommon/llsdserialize_xml.cpp (-1 / +1 lines)
35		35
36	extern "C"	36	extern "C"
37	{	37	{
38	#include "expat/expat.h"	38	#include "expat.h"
39	}	39	}
40		40
41	/**	41	/**

Lines 30-36 Link Here

(-)linden.orig/indra/llcommon/llsys.cpp (-1 / +1 lines)
30	#include "llsys.h"	30	#include "llsys.h"
31		31
32	#include <iostream>	32	#include <iostream>
33	#include <zlib/zlib.h>	33	#include <zlib.h>
34	#include "processor.h"	34	#include "processor.h"
35		35
36	#if LL_WINDOWS	36	#if LL_WINDOWS

Lines 33-41 Link Here

(-)linden.orig/indra/llimage/llimagejpeg.h (-3 / +2 lines)
33	#include "llimage.h"	33	#include "llimage.h"
34		34
35	extern "C" {	35	extern "C" {
36	#include "jpeglib/jinclude.h"	36	#include "jpeglib.h"
37	#include "jpeglib/jpeglib.h"	37	#include "jerror.h"
38	#include "jpeglib/jerror.h"
39	}	38	}
40		39
41	class LLImageJPEG : public LLImageFormatted	40	class LLImageJPEG : public LLImageFormatted

Lines 76-82 Link Here

(-)linden.orig/indra/llmessage/llfiltersd2xmlrpc.cpp (-1 / +1 lines)
76		76
77	#include <sstream>	77	#include <sstream>
78	#include <iterator>	78	#include <iterator>
79	#include <xmlrpc-epi/xmlrpc.h>	79	#include <xmlrpc.h>
80	#include "apr-1/apr_base64.h"	80	#include "apr-1/apr_base64.h"
81		81
82	#include "llbuffer.h"	82	#include "llbuffer.h"

Lines 34-40 Link Here

(-)linden.orig/indra/llmessage/llhttpassetstorage.cpp (-1 / +1 lines)
34	#include "llvfile.h"	34	#include "llvfile.h"
35	#include "llvfs.h"	35	#include "llvfs.h"
36		36
37	#include "zlib/zlib.h"	37	#include "zlib.h"
38		38
39	const F32 MAX_PROCESSING_TIME = 0.005f;	39	const F32 MAX_PROCESSING_TIME = 0.005f;
40	const S32 CURL_XFER_BUFFER_SIZE = 65536;	40	const S32 CURL_XFER_BUFFER_SIZE = 65536;

Lines 30-40 Link Here

(-)linden.orig/indra/llrender/llfont.cpp (-4 / +4 lines)
30	#include "llfont.h"	30	#include "llfont.h"
31		31
32	// Freetype stuff	32	// Freetype stuff
33	#if LL_LINUX // I had to do some work to avoid the system-installed FreeType headers... --ryan.	33	// #if LL_LINUX // I had to do some work to avoid the system-installed FreeType headers... --ryan.
34	#include "llfreetype2/freetype/ft2build.h"	34	// #include "llfreetype2/freetype/ft2build.h"
35	#else	35	// #else
36	#include <ft2build.h>	36	#include <ft2build.h>
37	#endif	37	// #endif
38		38
39	// For some reason, this won't work if it's not wrapped in the ifdef	39	// For some reason, this won't work if it's not wrapped in the ifdef
40	#ifdef FT_FREETYPE_H	40	#ifdef FT_FREETYPE_H

Lines 29-35 Link Here

(-)linden.orig/indra/llxml/llxmlnode.h (-1 / +1 lines)
29	#define LL_LLXMLNODE_H	29	#define LL_LLXMLNODE_H
30		30
31	#define XML_STATIC	31	#define XML_STATIC
32	#include "expat/expat.h"	32	#include "expat.h"
33	#include <map>	33	#include <map>
34		34
35	#include "indra_constants.h"	35	#include "indra_constants.h"

Lines 29-35 Link Here

(-)linden.orig/indra/llxml/llxmlparser.h (-1 / +1 lines)
29	#define LL_LLXMLPARSER_H	29	#define LL_LLXMLPARSER_H
30		30
31	#define XML_STATIC	31	#define XML_STATIC
32	#include "expat/expat.h"	32	#include "expat.h"
33		33
34	class LLXmlParser	34	class LLXmlParser
35	{	35	{

Lines 40-46 Link Here

(-)linden.orig/indra/newview/lluserauth.cpp (-1 / +1 lines)
40		40
41	// NOTE: MUST include these after otherincludes since queue gets redefined!?!!	41	// NOTE: MUST include these after otherincludes since queue gets redefined!?!!
42	#include <curl/curl.h>	42	#include <curl/curl.h>
43	#include <xmlrpc-epi/xmlrpc.h>	43	#include <xmlrpc.h>
44		44
45		45
46		46

Lines 60-66 Link Here

(-)linden.orig/indra/newview/llviewerobjectlist.cpp (-1 / +1 lines)
60	#include "u64.h"	60	#include "u64.h"
61	#include "llviewerimagelist.h"	61	#include "llviewerimagelist.h"
62	#include "lldatapacker.h"	62	#include "lldatapacker.h"
63	#include <zlib/zlib.h>	63	#include <zlib.h>
64	#include "object_flags.h"	64	#include "object_flags.h"
65		65
66	extern BOOL gVelocityInterpolate;	66	extern BOOL gVelocityInterpolate;

Lines 33-39 Link Here

(-)linden.orig/indra/newview/llxmlrpctransaction.cpp (-1 / +1 lines)
33		33
34	// Have to include these last to avoid queue redefinition!	34	// Have to include these last to avoid queue redefinition!
35	#include <curl/curl.h>	35	#include <curl/curl.h>
36	#include <xmlrpc-epi/xmlrpc.h>	36	#include <xmlrpc.h>
37		37
38	#include "viewer.h"	38	#include "viewer.h"
39		39

Lines 28-34 Link Here

(-)linden/indra/llimagej2coj/llimagej2coj.cpp (-1 / +1 lines)
28	#include "linden_common.h"	28	#include "linden_common.h"
29	#include "llimagej2coj.h"	29	#include "llimagej2coj.h"
30		30
31	#include "openjpeg/openjpeg.h"	31	#include "openjpeg.h"
32		32
33	#include "lltimer.h"	33	#include "lltimer.h"
34	#include "llmemory.h"	34	#include "llmemory.h"

Return to bug 127026

Lines 182-194 Link Here

(-)linden.orig/indra/SConstruct (-2 / +8 lines)
182	if build_target == 'client':	182	if build_target == 'client':
183	flags += '-DAPPID=secondlife -DLL_SDL=1 -DLL_X11=1 '	183	flags += '-DAPPID=secondlife -DLL_SDL=1 -DLL_X11=1 '
184	flags += '-DLL_GTK=1 '	184	flags += '-DLL_GTK=1 '
185	client_external_libs += [ 'gtk-x11-2.0', 'elfio' ]	185	client_external_libs += [ 'gtk-x11-2.0', 'ELFIO' ]
186	include_dirs += [ '../libraries/' + system_str + '/include/gtk-2.0' ]	186	include_dirs += [ '../libraries/' + system_str + '/include/gtk-2.0' ]
187	include_dirs += [ '../libraries/' + system_str + '/include/glib-2.0']	187	include_dirs += [ '../libraries/' + system_str + '/include/glib-2.0']
188	include_dirs += [ '../libraries/' + system_str + '/include/pango-1.0' ]	188	include_dirs += [ '../libraries/' + system_str + '/include/pango-1.0' ]
189	include_dirs += [ '../libraries/' + system_str + '/include/atk-1.0' ]	189	include_dirs += [ '../libraries/' + system_str + '/include/atk-1.0' ]
190	include_dirs += [ '../libraries/' + system_str + '/include/ELFIO' ]	190	include_dirs += [ '../libraries/' + system_str + '/include/ELFIO' ]
191	include_dirs += [ '../libraries/' + system_str + '/include/llfreetype2' ]	191	include_dirs += [ '../libraries/' + system_str + '/include/llfreetype2' ]
		192	pipe = os.popen('pkg-config gtk+-2.0 --cflags')
		193	flags += pipe.read().rstrip('\n') + ' '
		194	pipe.close()
		195	pipe = os.popen('freetype-config --cflags')
		196	flags += pipe.read().rstrip('\n') + ' '
		197	pipe.close()
192	else:	198	else:
193	# Mac-only flags	199	# Mac-only flags
194	flags += '-x c++ -arch ppc -pipe -Wno-trigraphs -fpascal-strings -faltivec -fasm-blocks -g -O2 -fmessage-length=0 -mtune=G4 -Wno-deprecated-declarations -Wno-invalid-offsetof -mmacosx-version-min=10.3 -DLL_DARWIN=1 -Wmost -Wno-sign-compare -Wno-switch -fpch-preprocess -F./newview/build/Deployment -fconstant-cfstrings -ffor-scope -Wno-reorder -isysroot /Developer/SDKs/MacOSX10.3.9.sdk '	200	flags += '-x c++ -arch ppc -pipe -Wno-trigraphs -fpascal-strings -faltivec -fasm-blocks -g -O2 -fmessage-length=0 -mtune=G4 -Wno-deprecated-declarations -Wno-invalid-offsetof -mmacosx-version-min=10.3 -DLL_DARWIN=1 -Wmost -Wno-sign-compare -Wno-switch -fpch-preprocess -F./newview/build/Deployment -fconstant-cfstrings -ffor-scope -Wno-reorder -isysroot /Developer/SDKs/MacOSX10.3.9.sdk '
Lines 196-202 Link Here
196	### Build type-specific flags ###	202	### Build type-specific flags ###
197		203
198	debug_opts = flags + '-fno-inline -O0 -D_DEBUG -DLL_DEBUG=1 '	204	debug_opts = flags + '-fno-inline -O0 -D_DEBUG -DLL_DEBUG=1 '
199	release_opts = flags + '-O2 -DNDEBUG -DLL_RELEASE=1 '	205	release_opts = flags + '-DNDEBUG -DLL_RELEASE=1 '
200	releasenoopt_opts = flags + '-O0 -DNDEBUG -DLL_RELEASE=1 '	206	releasenoopt_opts = flags + '-O0 -DNDEBUG -DLL_RELEASE=1 '
201	releasefordownload_opts = flags + '-O2 -DNDEBUG -DLL_RELEASE=1 -DLL_RELEASE_FOR_DOWNLOAD=1 '	207	releasefordownload_opts = flags + '-O2 -DNDEBUG -DLL_RELEASE=1 -DLL_RELEASE_FOR_DOWNLOAD=1 '
202		208