From f38fdbdbe03abfc4ec76f2d6f67ebc1b5e09be3d Mon Sep 17 00:00:00 2001 From: "Nyx (Neal Orman)" Date: Wed, 11 Jan 2012 10:51:18 -0500 Subject: BUILDFIX - updating reference to llpathinglib to use newly built havok version --- autobuild.xml | 144 +++++++++++++++++++++++++++++----------------------------- 1 file changed, 72 insertions(+), 72 deletions(-) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index bf51705166..f32b3b918b 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -855,6 +855,54 @@ + havok + + license + havok-ares + license_file + LICENSES/havok.txt + name + havok + platforms + + darwin + + archive + + hash + 286741271be3dc3473af3044ad6d002e + url + http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/3p-havok/rev/224189/arch/Darwin/installer/havok-0.1-darwin-20110316.tar.bz2 + + name + darwin + + linux + + archive + + hash + 1b6c85fc7705779cd2c2b02f7437fb24 + url + http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/3p-havok/rev/224189/arch/Linux/installer/havok-0.1-linux-20110316.tar.bz2 + + name + linux + + windows + + archive + + hash + 534c5217692bef44a60a3cf26ccb08d9 + url + http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/3p-havok-source_Windows-vs2010/rev/245961/arch/CYGWIN/installer/havok_source-2011.2-windows-20111130.tar.bz2 + + name + windows + + + jpeglib license @@ -1191,6 +1239,30 @@ + llpathinglib + + license + llpathinglib + license_file + LICENSES/llpathinglib.txt + name + llpathinglib + platforms + + windows + + archive + + hash + 2c71cf8f3b91bd65f48ecfaf8a99f713 + url + http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/stinson_llpathinglibrary/rev/247417/arch/CYGWIN/installer/llpathinglibrary-0.1-windows-20120110.tar.bz2 + + name + windows + + + llqtwebkit license @@ -1759,78 +1831,6 @@ - havok - - license - havok-ares - license_file - LICENSES/havok.txt - name - havok - platforms - - darwin - - archive - - hash - 286741271be3dc3473af3044ad6d002e - url - http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/3p-havok/rev/224189/arch/Darwin/installer/havok-0.1-darwin-20110316.tar.bz2 - - name - darwin - - linux - - archive - - hash - 1b6c85fc7705779cd2c2b02f7437fb24 - url - http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/3p-havok/rev/224189/arch/Linux/installer/havok-0.1-linux-20110316.tar.bz2 - - name - linux - - windows - - archive - - hash - 534c5217692bef44a60a3cf26ccb08d9 - url - http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/3p-havok-source_Windows-vs2010/rev/245961/arch/CYGWIN/installer/havok_source-2011.2-windows-20111130.tar.bz2 - - name - windows - - - - llpathinglib - - license - llpathinglib - license_file - LICENSES/llpathinglib.txt - name - llpathinglib - platforms - - windows - - archive - - hash - 59aad7ca249a01db807eea62a862baba - url - http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/stinson_llpathinglibrary/rev/247312/arch/CYGWIN/installer/llpathinglibrary-0.1-windows-20120106.tar.bz2 - - name - windows - - - package_description -- cgit v1.3 From 764cbbb373ed3876bef8d822ec261608dc173015 Mon Sep 17 00:00:00 2001 From: "Nyx (Neal Orman)" Date: Wed, 11 Jan 2012 11:54:38 -0500 Subject: PATH-180, buildfix - updating pathing library. Added a linux version to start building/testing Updated Havok to 2011.3 Updated Havok has new evaluation key built in --- autobuild.xml | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index f32b3b918b..87ace8b3ef 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -1249,14 +1249,26 @@ llpathinglib platforms + linux + + archive + + hash + f2d05013bc89688c3deeb86c9077380f + url + http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/stinson_llpathinglibrary/rev/247452/arch/Linux/installer/llpathinglibrary-0.1-linux-20120111.tar.bz2 + + name + linux + windows archive hash - 2c71cf8f3b91bd65f48ecfaf8a99f713 + b47f59bd4313d485f7e0d7a0d46e0d68 url - http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/stinson_llpathinglibrary/rev/247417/arch/CYGWIN/installer/llpathinglibrary-0.1-windows-20120110.tar.bz2 + http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/stinson_llpathinglibrary/rev/247452/arch/CYGWIN/installer/llpathinglibrary-0.1-windows-20120111.tar.bz2 name windows -- cgit v1.3 From 82295222c478bf6b7b3840a22fc7f30ebcd05fc7 Mon Sep 17 00:00:00 2001 From: "Nyx (Neal Orman)" Date: Wed, 11 Jan 2012 13:57:48 -0500 Subject: PATH-180 BUILDFIX - updating pathing lib packages to grab prep's fixes to include all the havok libs. --- autobuild.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index 87ace8b3ef..b79f398054 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -1254,9 +1254,9 @@ archive hash - f2d05013bc89688c3deeb86c9077380f + 8b6813875c5b72a38b4038697ce132fa url - http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/stinson_llpathinglibrary/rev/247452/arch/Linux/installer/llpathinglibrary-0.1-linux-20120111.tar.bz2 + http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/stinson_llpathinglibrary/rev/247455/arch/Linux/installer/llpathinglibrary-0.1-linux-20120111.tar.bz2 name linux @@ -1266,9 +1266,9 @@ archive hash - b47f59bd4313d485f7e0d7a0d46e0d68 + 2678d6cc52245f1fc82e2e5759cfe855 url - http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/stinson_llpathinglibrary/rev/247452/arch/CYGWIN/installer/llpathinglibrary-0.1-windows-20120111.tar.bz2 + http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/stinson_llpathinglibrary/rev/247455/arch/CYGWIN/installer/llpathinglibrary-0.1-windows-20120111.tar.bz2 name windows -- cgit v1.3 From 2cc9c54fc6027871a320b6a3dfbb212994eb949f Mon Sep 17 00:00:00 2001 From: Todd Stinson Date: Fri, 13 Jan 2012 11:12:15 -0800 Subject: Updating to the latest llpathinglib package. --- autobuild.xml | 8 ++++---- indra/newview/llfloaterpathfindinglinksets.cpp | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index b79f398054..339c3286ae 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -1254,9 +1254,9 @@ archive hash - 8b6813875c5b72a38b4038697ce132fa + 760a7e956f6ed540d3b655dafc57788a url - http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/stinson_llpathinglibrary/rev/247455/arch/Linux/installer/llpathinglibrary-0.1-linux-20120111.tar.bz2 + http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/stinson_llpathinglibrary/rev/247477/arch/Linux/installer/llpathinglibrary-0.1-linux-20120111.tar.bz2 name linux @@ -1266,9 +1266,9 @@ archive hash - 2678d6cc52245f1fc82e2e5759cfe855 + 28be1280ceab6255726a8104b6615cdb url - http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/stinson_llpathinglibrary/rev/247455/arch/CYGWIN/installer/llpathinglibrary-0.1-windows-20120111.tar.bz2 + http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/stinson_llpathinglibrary/rev/247477/arch/CYGWIN/installer/llpathinglibrary-0.1-windows-20120111.tar.bz2 name windows diff --git a/indra/newview/llfloaterpathfindinglinksets.cpp b/indra/newview/llfloaterpathfindinglinksets.cpp index fb14563cbf..ab2f551228 100644 --- a/indra/newview/llfloaterpathfindinglinksets.cpp +++ b/indra/newview/llfloaterpathfindinglinksets.cpp @@ -42,7 +42,7 @@ #include "llhttpclient.h" #include "lluuid.h" -#define XXX_STINSON_USE_FAKE_DATA +//#define XXX_STINSON_USE_FAKE_DATA #ifdef XXX_STINSON_USE_FAKE_DATA #include "llviewerobject.h" #include "llviewerobjectlist.h" -- cgit v1.3 From df5e1de7ebc6a9eb729ae9f1e86898ac1208328c Mon Sep 17 00:00:00 2001 From: Todd Stinson Date: Wed, 18 Jan 2012 13:11:03 -0800 Subject: Updating to the latest llpathinglib pre-built package. --- autobuild.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index 339c3286ae..f71c5d3a2e 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -1254,9 +1254,9 @@ archive hash - 760a7e956f6ed540d3b655dafc57788a + a682c345382dfc19d0e718b073e7c5b9 url - http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/stinson_llpathinglibrary/rev/247477/arch/Linux/installer/llpathinglibrary-0.1-linux-20120111.tar.bz2 + http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/stinson_llpathinglibrary/rev/247841/arch/Linux/installer/llpathinglibrary-0.1-linux-20120117.tar.bz2 name linux @@ -1266,9 +1266,9 @@ archive hash - 28be1280ceab6255726a8104b6615cdb + e36acc0135ab309062a481f2afef0086 url - http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/stinson_llpathinglibrary/rev/247477/arch/CYGWIN/installer/llpathinglibrary-0.1-windows-20120111.tar.bz2 + http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/stinson_llpathinglibrary/rev/247841/arch/CYGWIN/installer/llpathinglibrary-0.1-windows-20120117.tar.bz2 name windows -- cgit v1.3 From 3b6606eed8b04783f8b80df71e4fe24f7432bde5 Mon Sep 17 00:00:00 2001 From: "Nyx (Neal Orman)" Date: Thu, 19 Jan 2012 12:04:42 -0500 Subject: PATH-180 FIX? updating to latest pathing lib, and ensuring order invariance Grabbing latest packaged pathing library, and adding linker flags to deal with circular dependencies.` --- autobuild.xml | 4 ++-- indra/cmake/LLPathingLib.cmake | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index 339c3286ae..2175626251 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -1254,9 +1254,9 @@ archive hash - 760a7e956f6ed540d3b655dafc57788a + 76cac9c6be702db7402623a405f7e59c url - http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/stinson_llpathinglibrary/rev/247477/arch/Linux/installer/llpathinglibrary-0.1-linux-20120111.tar.bz2 + http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/stinson_llpathinglibrary/rev/248048/arch/Linux/installer/llpathinglibrary-0.1-linux-20120119.tar.bz2 name linux diff --git a/indra/cmake/LLPathingLib.cmake b/indra/cmake/LLPathingLib.cmake index c108b33e8c..8e622d83db 100644 --- a/indra/cmake/LLPathingLib.cmake +++ b/indra/cmake/LLPathingLib.cmake @@ -16,3 +16,8 @@ set(LLPATHING_LIBRARIES debug ${LL_PATHING_DEBUG_LIB} optimized ${LL_PATHING_RELEASE_LIB} ) + +if (LINUX) + list(INSERT LLPATHING_LIBRARIES 0 -Wl,--start-group) + list(APPEND LLPATHING_LIBRARIES -Wl,--end-group) +endif (LINUX) -- cgit v1.3 From 146f0c25504cc16458cb20312eba63b04d26389d Mon Sep 17 00:00:00 2001 From: "Nyx (Neal Orman)" Date: Thu, 19 Jan 2012 13:20:42 -0500 Subject: PATH-180 WIP fixing library package hash merge error previous package had wrong hash. Manually generated it and replacing. --- autobuild.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index 395e03554e..fb597e5dda 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -1254,7 +1254,7 @@ archive hash - 76cac9c6be702db7402623a405f7e59c + 9cfcb4c93f77d0f5e7541b57b0feaeef url http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/stinson_llpathinglibrary/rev/248048/arch/Linux/installer/llpathinglibrary-0.1-linux-20120119.tar.bz2 -- cgit v1.3