diff -Naur linden.orig/indra/SConstruct linden/indra/SConstruct --- linden.orig/indra/SConstruct 2007-01-08 07:50:12.000000000 +0900 +++ linden/indra/SConstruct 2007-01-09 23:54:03.000000000 +0900 @@ -188,8 +188,14 @@ 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/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 ' @@ -197,7 +203,7 @@ ### Build type-specific flags ### debug_opts = flags + '-fno-inline -O0 -D_DEBUG -DLL_DEBUG=1 ' - release_opts = flags + '-O2 -DNDEBUG -DLL_RELEASE=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 ' diff -Naur linden.orig/indra/llcommon/llsdserialize_xml.cpp linden/indra/llcommon/llsdserialize_xml.cpp --- linden.orig/indra/llcommon/llsdserialize_xml.cpp 2007-01-08 07:50:13.000000000 +0900 +++ linden/indra/llcommon/llsdserialize_xml.cpp 2007-01-09 17:49:40.000000000 +0900 @@ -35,7 +35,7 @@ extern "C" { -#include "expat/expat.h" +#include "expat.h" } /** diff -Naur linden.orig/indra/llcommon/llsys.cpp linden/indra/llcommon/llsys.cpp --- linden.orig/indra/llcommon/llsys.cpp 2007-01-08 07:50:13.000000000 +0900 +++ linden/indra/llcommon/llsys.cpp 2007-01-09 17:53:11.000000000 +0900 @@ -30,7 +30,7 @@ #include "llsys.h" #include -#include +#include #include "processor.h" #if LL_WINDOWS diff -Naur linden.orig/indra/llimage/llimagejpeg.h linden/indra/llimage/llimagejpeg.h --- linden.orig/indra/llimage/llimagejpeg.h 2007-01-08 07:50:13.000000000 +0900 +++ linden/indra/llimage/llimagejpeg.h 2007-01-09 20:04:03.000000000 +0900 @@ -33,9 +33,8 @@ #include "llimage.h" extern "C" { -#include "jpeglib/jinclude.h" -#include "jpeglib/jpeglib.h" -#include "jpeglib/jerror.h" +#include "jpeglib.h" +#include "jerror.h" } class LLImageJPEG : public LLImageFormatted diff -Naur linden.orig/indra/llmedia/llmediaengine.h linden/indra/llmedia/llmediaengine.h --- linden.orig/indra/llmedia/llmediaengine.h 2007-01-08 07:50:14.000000000 +0900 +++ linden/indra/llmedia/llmediaengine.h 2007-01-09 22:48:24.000000000 +0900 @@ -101,10 +101,10 @@ static void process_parcel_media_update ( LLMessageSystem *msg, void ** ); // proxy configuration - void LLMediaEngine::setNetworkProxy ( BOOL enabledIn, const LLString& addressIn, + void setNetworkProxy ( BOOL enabledIn, const LLString& addressIn, S32 portIn, S32 socksIn, const LLString& excludeIn ); - void LLMediaEngine::getNetworkProxy ( BOOL& enabledOut, LLString& addressOut, + void getNetworkProxy ( BOOL& enabledOut, LLString& addressOut, S32& portOut, S32& socksOut, LLString& excludeOuy ); private: diff -Naur linden.orig/indra/llmessage/llfiltersd2xmlrpc.cpp linden/indra/llmessage/llfiltersd2xmlrpc.cpp --- linden.orig/indra/llmessage/llfiltersd2xmlrpc.cpp 2007-01-08 07:50:15.000000000 +0900 +++ linden/indra/llmessage/llfiltersd2xmlrpc.cpp 2007-01-09 19:04:06.000000000 +0900 @@ -76,7 +76,7 @@ #include #include -#include +#include #include "apr-1/apr_base64.h" #include "llbuffer.h" diff -Naur linden.orig/indra/llmessage/llhttpassetstorage.cpp linden/indra/llmessage/llhttpassetstorage.cpp --- linden.orig/indra/llmessage/llhttpassetstorage.cpp 2007-01-08 07:50:15.000000000 +0900 +++ linden/indra/llmessage/llhttpassetstorage.cpp 2007-01-09 17:53:26.000000000 +0900 @@ -34,7 +34,7 @@ #include "llvfile.h" #include "llvfs.h" -#include "zlib/zlib.h" +#include "zlib.h" const F32 MAX_PROCESSING_TIME = 0.005f; const S32 CURL_XFER_BUFFER_SIZE = 65536; diff -Naur linden.orig/indra/llmessage/message.h linden/indra/llmessage/message.h --- linden.orig/indra/llmessage/message.h 2007-01-08 07:50:14.000000000 +0900 +++ linden/indra/llmessage/message.h 2007-01-09 18:58:05.000000000 +0900 @@ -750,7 +750,7 @@ static F32 mTimeDecodesSpamThreshold; // If mTimeDecodes is on, all this many seconds for each msg decode before spamming static BOOL mTimeDecodes; // Measure time for all message decodes if TRUE; - void LLMessageSystem::init(); // ctor shared initialisation. + void init(); // ctor shared initialisation. }; diff -Naur linden.orig/indra/llrender/llfont.cpp linden/indra/llrender/llfont.cpp --- linden.orig/indra/llrender/llfont.cpp 2007-01-08 07:50:15.000000000 +0900 +++ linden/indra/llrender/llfont.cpp 2007-01-09 22:07:05.000000000 +0900 @@ -30,11 +30,11 @@ #include "llfont.h" // Freetype stuff -#if LL_LINUX // I had to do some work to avoid the system-installed FreeType headers... --ryan. -#include "llfreetype2/freetype/ft2build.h" -#else +// #if LL_LINUX // I had to do some work to avoid the system-installed FreeType headers... --ryan. +// #include "llfreetype2/freetype/ft2build.h" +// #else #include -#endif +// #endif // For some reason, this won't work if it's not wrapped in the ifdef #ifdef FT_FREETYPE_H diff -Naur linden.orig/indra/llrender/llimagegl.h linden/indra/llrender/llimagegl.h --- linden.orig/indra/llrender/llimagegl.h 2007-01-08 07:50:15.000000000 +0900 +++ linden/indra/llrender/llimagegl.h 2007-01-09 22:18:56.000000000 +0900 @@ -169,7 +169,7 @@ // STATICS public: - static std::set LLImageGL::sImageList; + static std::set sImageList; static S32 sCount; static F32 sLastFrameTime; diff -Naur linden.orig/indra/llui/llfloater.h linden/indra/llui/llfloater.h --- linden.orig/indra/llui/llfloater.h 2007-01-08 07:50:16.000000000 +0900 +++ linden/indra/llui/llfloater.h 2007-01-10 00:10:24.000000000 +0900 @@ -307,8 +307,8 @@ void getMinimizePosition( S32 *left, S32 *bottom); void restoreAll(); // un-minimize all floaters typedef std::set skip_list_t; - void LLFloaterView::pushVisibleAll(BOOL visible, const skip_list_t& skip_list = skip_list_t()); - void LLFloaterView::popVisibleAll(const skip_list_t& skip_list = skip_list_t()); + void pushVisibleAll(BOOL visible, const skip_list_t& skip_list = skip_list_t()); + void popVisibleAll(const skip_list_t& skip_list = skip_list_t()); void setCycleMode(BOOL mode); BOOL getCycleMode(); diff -Naur linden.orig/indra/llxml/llxmlnode.h linden/indra/llxml/llxmlnode.h --- linden.orig/indra/llxml/llxmlnode.h 2007-01-08 07:50:17.000000000 +0900 +++ linden/indra/llxml/llxmlnode.h 2007-01-09 17:49:12.000000000 +0900 @@ -29,7 +29,7 @@ #define LL_LLXMLNODE_H #define XML_STATIC -#include "expat/expat.h" +#include "expat.h" #include #include "indra_constants.h" diff -Naur linden.orig/indra/llxml/llxmlparser.h linden/indra/llxml/llxmlparser.h --- linden.orig/indra/llxml/llxmlparser.h 2007-01-08 07:50:17.000000000 +0900 +++ linden/indra/llxml/llxmlparser.h 2007-01-09 17:49:22.000000000 +0900 @@ -29,7 +29,7 @@ #define LL_LLXMLPARSER_H #define XML_STATIC -#include "expat/expat.h" +#include "expat.h" class LLXmlParser { diff -Naur linden.orig/indra/newview/lluserauth.cpp linden/indra/newview/lluserauth.cpp --- linden.orig/indra/newview/lluserauth.cpp 2007-01-08 07:50:24.000000000 +0900 +++ linden/indra/newview/lluserauth.cpp 2007-01-09 19:04:45.000000000 +0900 @@ -40,7 +40,7 @@ // NOTE: MUST include these after otherincludes since queue gets redefined!?!! #include -#include +#include diff -Naur linden.orig/indra/newview/llviewerobjectlist.cpp linden/indra/newview/llviewerobjectlist.cpp --- linden.orig/indra/newview/llviewerobjectlist.cpp 2007-01-08 07:50:25.000000000 +0900 +++ linden/indra/newview/llviewerobjectlist.cpp 2007-01-09 17:53:58.000000000 +0900 @@ -60,7 +60,7 @@ #include "u64.h" #include "llviewerimagelist.h" #include "lldatapacker.h" -#include +#include #include "object_flags.h" extern BOOL gVelocityInterpolate; diff -Naur linden.orig/indra/newview/llxmlrpctransaction.cpp linden/indra/newview/llxmlrpctransaction.cpp --- linden.orig/indra/newview/llxmlrpctransaction.cpp 2007-01-08 07:50:24.000000000 +0900 +++ linden/indra/newview/llxmlrpctransaction.cpp 2007-01-09 19:04:27.000000000 +0900 @@ -33,7 +33,7 @@ // Have to include these last to avoid queue redefinition! #include -#include +#include #include "viewer.h"