Commit Graph

17637 Commits (d78a925f8f00a19bff0dec51ffe893fba76d2b4a)

Author SHA1 Message Date
Xiaohong Bao d78a925f8f Automated merge with https://bitbucket.org/seraph/mesh-development-vs2010 2011-04-18 14:10:17 -06:00
Xiaohong Bao e968760014 more fix for the libminizip issue for linux. 2011-04-18 14:09:58 -06:00
Brad Payne (Vir Linden) 17a70ddf8f merge 2011-04-15 17:12:42 -04:00
Brad Payne (Vir Linden) b6ae8b1156 moved to public llconvexdecomposition builds 2011-04-15 17:12:07 -04:00
Xiaohong Bao 5a3fb5349d Automated merge with https://bitbucket.org/seraph/mesh-development-vs2010 2011-04-15 14:25:57 -06:00
Xiaohong Bao f9f8479472 update collada lib for linux to 226716 2011-04-15 14:25:32 -06:00
Brad Payne (Vir Linden) 47d4dc301f merge 2011-04-15 11:36:43 -04:00
Brad Payne (Vir Linden) c81ae1a3fa removed separate stub lib, since llconvexdecomposition is going public and includes the stub 2011-04-15 11:04:09 -04:00
prep linden 298d71b4d9 License update 2011-04-15 11:02:57 -04:00
prep linden 2851141ee6 merge 2011-04-15 10:48:13 -04:00
prep linden fcfb70f01d License update 2011-04-15 10:47:44 -04:00
Brad Payne (Vir Linden) 88ae509ed9 merge 2011-04-15 10:34:57 -04:00
Brad Payne (Vir Linden) a0359e3241 updated to new llconvexdecomposition build (now with 100% more vs2010) 2011-04-15 10:34:23 -04:00
Xiaohong Bao ed2f4797da update linux glod lib to change 226657. 2011-04-14 17:19:25 -06:00
Xiaohong Bao 6b49a5f67c update to the latest glod lib for linux. 2011-04-14 15:18:49 -06:00
Xiaohong Bao 77575dae62 update to use 32-bit pcre lib for linux. 2011-04-14 14:43:56 -06:00
Dave Parks 75b637d633 Automated merge with https://bitbucket.org/seraph/mesh-development-vs2010 2011-04-14 13:24:31 -05:00
Dave Parks 6ec5e332fb Linux build should use 3p-google-perftools build result 2011-04-14 13:24:21 -05:00
Brad Payne (Vir Linden) acf986ee8b merge 2011-04-14 14:07:27 -04:00
Brad Payne (Vir Linden) 971b67bf87 disable windows debug builds (temporary) 2011-04-14 14:06:59 -04:00
Dave Parks 4f3b3abb87 autobuild doesn't like comments? 2011-04-14 12:36:30 -05:00
Dave Parks 4d395e9e62 Linux not windows (whoops) 2011-04-14 12:22:01 -05:00
Dave Parks b4b3c4f763 Include glext headers on linux. 2011-04-14 11:56:33 -05:00
Brad Payne (Vir Linden) f92d521b46 fixed windows boost library names 2011-04-14 11:08:50 -04:00
Xiaohong Bao 7dfa297be1 update to use the latest collada lib, which is built on the 32bit pcre lib. 2011-04-13 18:08:21 -06:00
Dave Parks dbb7cd6910 Fix for bad kdu URLs 2011-04-13 16:40:20 -05:00
Dave Parks c094102445 Automated merge with https://bitbucket.org/seraph/mesh-development-vs2010 2011-04-13 16:33:53 -05:00
Dave Parks bf36625332 Fix for bad fmod URL's 2011-04-13 16:33:41 -05:00
Brad Payne (Vir Linden) 6db302578a newer glod, colladadom builds on mac 2011-04-13 16:58:04 -04:00
Brad Payne (Vir Linden) 7b62a960d1 merge 2011-04-13 16:50:11 -04:00
Dave Parks b2d3f5009e Automated merge with https://bitbucket.org/seraph/mesh-development-vs2010 2011-04-13 13:43:43 -05:00
Dave Parks 12f9f521ee Fix for bad default setting and libpng using /GL 2011-04-13 13:43:32 -05:00
prep c6da212dc2 Fix to allow for clicking again. 2011-04-13 14:18:19 -04:00
Dave Parks 13e12b2773 Fix for bad merge causing crash in llpolymorph.cpp 2011-04-12 17:22:02 -05:00
Dave Parks 48285958d0 Automated merge with https://bitbucket.org/seraph/mesh-development-vs2010 2011-04-12 16:00:10 -05:00
Dave Parks c77d1b3a65 Define __tcmalloc to actually use tcmalloc (fixes memory alignment issues). 2011-04-12 15:59:46 -05:00
Brad Payne (Vir Linden) c0163bb2e6 merge 2011-04-12 14:40:10 -04:00
Brad Payne (Vir Linden) e0c509d463 updated builds used for pcre, collada on mac 2011-04-12 14:39:31 -04:00
Dave Parks 2027eb8c2b Backed out changeset: c5a0cc9abf49 2011-04-12 12:27:03 -05:00
Dave Parks b13b6ef014 New tcmalloc. 2011-04-12 12:07:45 -05:00
Dave Parks d640839826 We're using libcollada14dom22 now. 2011-04-12 10:34:58 -05:00
Dave Parks f2de0bae8a Fix for bad merge in viewer_manifest.py 2011-04-11 18:07:43 -05:00
Dave Parks 8f01b70ff2 Fix for bad merge concerning incremental linking options. 2011-04-11 17:50:40 -05:00
Dave Parks 0e2df02775 Attempt at making tcmalloc work. 2011-04-11 15:42:17 -05:00
Dave Parks 675e0cfd99 Use tcmalloc from 3p-google-perftools on windows 2011-04-11 14:12:49 -05:00
Nyx (Neal Orman) a6d87cbfea updated colladadom package with header files in the correct location. 2011-04-08 21:18:35 -04:00
Nyx (Neal Orman) 5f872761ca no longer using tcmalloc-minimal, replacing cmake config to refer to
full build version.
2011-04-08 20:03:44 -04:00
Nyx (Neal Orman) 235a4477ab updating GLOD libraries to be 2010/autobuild compatible.
Linux was manually built as our build machines are having difficulties
building it. Will revisit this later.
2011-04-08 19:54:36 -04:00
Nyx (Neal Orman) 0f245490a4 updating colladadom libraries to use the newly autobuilt versions. 2011-04-08 19:04:01 -04:00
Brad Payne (Vir Linden) d490081fe2 changes for newer collada build 2011-04-08 17:12:26 -04:00