Attachment #106219 for bug #127026

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

and this patch




			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 101-110 Link Here

(-)linden.orig/indra/llmedia/llmediaengine.h (-2 / +2 lines)
101	static void process_parcel_media_update ( LLMessageSystem msg, void * );	101	static void process_parcel_media_update ( LLMessageSystem msg, void * );
102		102
103	// proxy configuration	103	// proxy configuration
104	void LLMediaEngine::setNetworkProxy ( BOOL enabledIn, const LLString& addressIn,	104	void setNetworkProxy ( BOOL enabledIn, const LLString& addressIn,
105	S32 portIn, S32 socksIn, const LLString& excludeIn );	105	S32 portIn, S32 socksIn, const LLString& excludeIn );
106		106
107	void LLMediaEngine::getNetworkProxy ( BOOL& enabledOut, LLString& addressOut,	107	void getNetworkProxy ( BOOL& enabledOut, LLString& addressOut,
108	S32& portOut, S32& socksOut, LLString& excludeOuy );	108	S32& portOut, S32& socksOut, LLString& excludeOuy );
109		109
110	private:	110	private:

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 750-756 Link Here

(-)linden.orig/indra/llmessage/message.h (-1 / +1 lines)
750	static F32 mTimeDecodesSpamThreshold; // If mTimeDecodes is on, all this many seconds for each msg decode before spamming	750	static F32 mTimeDecodesSpamThreshold; // If mTimeDecodes is on, all this many seconds for each msg decode before spamming
751	static BOOL mTimeDecodes; // Measure time for all message decodes if TRUE;	751	static BOOL mTimeDecodes; // Measure time for all message decodes if TRUE;
752		752
753	void LLMessageSystem::init(); // ctor shared initialisation.	753	void init(); // ctor shared initialisation.
754	};	754	};
755		755
756		756

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 169-175 Link Here

(-)linden.orig/indra/llrender/llimagegl.h (-1 / +1 lines)
169		169
170	// STATICS	170	// STATICS
171	public:	171	public:
172	static std::set<LLImageGL*> LLImageGL::sImageList;	172	static std::set<LLImageGL*> sImageList;
173	static S32 sCount;	173	static S32 sCount;
174		174
175	static F32 sLastFrameTime;	175	static F32 sLastFrameTime;

Lines 307-314 Link Here

(-)linden.orig/indra/llui/llfloater.h (-2 / +2 lines)
307	void getMinimizePosition( S32 left, S32 bottom);	307	void getMinimizePosition( S32 left, S32 bottom);
308	void restoreAll(); // un-minimize all floaters	308	void restoreAll(); // un-minimize all floaters
309	typedef std::set<LLView*> skip_list_t;	309	typedef std::set<LLView*> skip_list_t;
310	void LLFloaterView::pushVisibleAll(BOOL visible, const skip_list_t& skip_list = skip_list_t());	310	void pushVisibleAll(BOOL visible, const skip_list_t& skip_list = skip_list_t());
311	void LLFloaterView::popVisibleAll(const skip_list_t& skip_list = skip_list_t());	311	void popVisibleAll(const skip_list_t& skip_list = skip_list_t());
312		312
313	void setCycleMode(BOOL mode);	313	void setCycleMode(BOOL mode);
314	BOOL getCycleMode();	314	BOOL getCycleMode();

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

Return to bug 127026

Lines 188-195 Link Here

(-)linden.orig/indra/SConstruct (-2 / +8 lines)
188	include_dirs += [ ' ../libraries/' + system_str + '/include/glib-2.0']	188	include_dirs += [ ' ../libraries/' + system_str + '/include/glib-2.0']
189	include_dirs += [ ' ../libraries/' + system_str + '/include/pango-1.0' ]	189	include_dirs += [ ' ../libraries/' + system_str + '/include/pango-1.0' ]
190	include_dirs += [ ' ../libraries/' + system_str + '/include/atk-1.0' ]	190	include_dirs += [ ' ../libraries/' + system_str + '/include/atk-1.0' ]
191	include_dirs += [ ' ../libraries/' + system_str + '/include/ELFIO' ]	191	include_dirs += [ '../libraries/' + system_str + '/include/ELFIO' ]
192	include_dirs += [ ' ../libraries/' + system_str + '/include/llfreetype2' ]	192	include_dirs += [ ' ../libraries/' + system_str + '/include/llfreetype2' ]
		193	pipe = os.popen('pkg-config gtk+-2.0 --cflags')
		194	flags += pipe.read().rstrip('\n') + ' '
		195	pipe.close()
		196	pipe = os.popen('freetype-config --cflags')
		197	flags += pipe.read().rstrip('\n') + ' '
		198	pipe.close()
193	else:	199	else:
194	# Mac-only flags	200	# Mac-only flags
195	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 '	201	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 197-203 Link Here
197	### Build type-specific flags ###	203	### Build type-specific flags ###
198		204
199	debug_opts = flags + '-fno-inline -O0 -D_DEBUG -DLL_DEBUG=1 '	205	debug_opts = flags + '-fno-inline -O0 -D_DEBUG -DLL_DEBUG=1 '
200	release_opts = flags + '-O2 -DNDEBUG -DLL_RELEASE=1 '	206	release_opts = flags + '-DNDEBUG -DLL_RELEASE=1 '
201	releasenoopt_opts = flags + '-O0 -DNDEBUG -DLL_RELEASE=1 '	207	releasenoopt_opts = flags + '-O0 -DNDEBUG -DLL_RELEASE=1 '
202	releasefordownload_opts = flags + '-O2 -DNDEBUG -DLL_RELEASE=1 -DLL_RELEASE_FOR_DOWNLOAD=1 '	208	releasefordownload_opts = flags + '-O2 -DNDEBUG -DLL_RELEASE=1 -DLL_RELEASE_FOR_DOWNLOAD=1 '
203		209