35c67ca7fb
Merge
2010-12-03 15:44:39 -08:00
35d50fe36e
changing colladadom url from https to http to prevent urllib errors
2010-12-03 15:43:44 -08:00
187369425b
Update glext.h for 32-bit linux.
2010-12-03 03:27:31 -06:00
98802a1ef9
Merge
2010-12-02 21:34:01 -06:00
0be7fcf2a9
SH-373 Update glext.h, disable anti-aliasing on ATI when rendering deferred. Get rid of RenderUseFBO debug setting (only use FBO when rendering deferred). Use GL_ARB_framebuffer_objects instead of GL_EXT_...
2010-12-02 21:33:03 -06:00
bfd8efb057
Automated merge up from viewer-development
2010-12-01 10:55:24 -05:00
3d9aac7f16
updated curl build on windows
2010-11-24 16:35:28 -05:00
fae00f8c79
SH-564 WIP - scrubbing not needed if curl uses thread-safe c-ares lib
2010-11-24 09:03:14 -05:00
9905870465
Fix typo for llconvexdecompositionstub darwin package.
...
CR: davep
2010-11-22 12:24:55 -08:00
ed1d8811d8
Hack old .dll into collada package to make vista/xp happy. Might need to revert if builds start failing.
2010-11-19 16:33:17 -06:00
dc6e5371eb
Update slvoice dependencies to a hopefully correct version
2010-11-17 15:21:56 -08:00
4beeb6c03b
Update Linux slvoice dependency
2010-11-17 12:55:56 -08:00
d93df4720e
Update Mac slvoice dep
2010-11-17 12:52:57 -08:00
f99ccb12df
Update slvoice dependency for Windows
2010-11-17 12:19:00 -08:00
6400374986
SH-432 mesh viewer will not run on OSX 10.5.8
...
Rebuilt the collada library on a 10.5 machine. this should fix the issue,
as the problem was we were building against a version of libxml2 that was
specific to 10.6. Will update to use a non-system version of the lib
later.
2010-11-17 13:59:17 -05:00
8f785cba04
SH-432 WIP mac build of mesh-development is broken
...
Was able to rebuild collada and pcre with architecture i386,
which is our officially supported architecture. This should unstick
the build in theory.
2010-11-16 14:58:03 -05:00
1ec846a94e
SH-396 WIP mac build not working on mesh-development
...
last build of collada didn't have ppc architecture, which is required for
running on 10.4 / 10.5 (was able to build it without ppc when building only for
10.6).
2010-11-15 12:22:13 -05:00
63466f0eca
SH-331 WIP updating colladadom to work for mac on mesh-development
...
Tried building a colladadom package for mac that will run on both 10.5 and 10.6
fingers crossed.
2010-11-12 16:03:19 -05:00
1c2379becb
SH-396 WIP mac build broken on mesh-development
...
Finally fixed collada dynamic library location issue. Should fix mac build if the library
is being packaged properly.
2010-11-05 16:28:19 -04:00
bbf581726a
SH-396 WIP fix mac mesh-development build
...
Fixed the mac references to Collada14Dom.dylib I think. Fingers crossed!
2010-11-04 21:11:38 -04:00
aa6256b089
SH-396 FIX fix mac build on mesh-development branch
...
autobuild recently changed to not upload to s3 without an explicit command-line
argument. Re-uploaded (this time to s3) colladadom for mac, and updated install.xml
2010-11-04 11:11:03 -04:00
6c0c1c47e7
SH-396 FIX mac opensource build
...
Trying a new collada package for mac
2010-11-03 19:02:26 -04:00
688a818259
SH-395 FIX fixes for linux and windows collada libraries
...
updating windows collada libraries
2010-11-02 20:32:20 -04:00
4599ade7a1
SH-395 FIX linux build on mesh-development is broken
...
last package had the wrong version of the binary library packaged with it.
I'm hoping this should fix our linux teamcity issues.
2010-11-01 12:11:30 -04:00
7fd39cb3dc
SH-395 FIX linux mesh-development teamcity build broken
...
rebuilt colladadom yet again, and confirmed that we're depending on the
correct version of pcre.
2010-10-29 18:03:41 -04:00
5b7679c71f
SH-395 FIX linux build broken for mesh-development
...
Trying to rebuild colladadom against an old version of pcre so that the
link step doesn't search for functions that don't exist.
2010-10-29 15:11:53 -04:00
2ee9d84f6d
SH-395 FIX linux opensource mesh viewer is broken on teamcity
...
Fixed the pcre autobuild scripts to include the resulting library files
and put them in the correct place. I think this should fix the build.
2010-10-29 12:11:41 -04:00
2115e63a85
SH-395 SH-396 WIP fix mac and linux builds for opensource mesh branch
...
MAC: naming problem on collada library files (.dylib). updated install.xml
to refer to the fixed package
LINUX: PCRE was too out of date for our collada implementation. Created a new
PCRE package and updated install.xml to match it.
2010-10-28 20:50:47 -04:00
32bcdd1199
SH-396 WIP fix mac opensource build for mesh viewer
...
Collada library file was being named incorrectly by autobuild,
resulting in the build being unable to find the library even though
it was downloaded. Updated the package, hopefully this will fix the linker error.
2010-10-28 11:44:10 -04:00
e39d616999
SH-329 WIP get mesh branch ready for opensource
...
adding windows convex decomp stub library.
2010-10-21 18:14:56 -04:00
dd0d5ffaa0
SH-329 WIP get mesh branch ready for open source
...
de-minimis change fixing install.xml to use the right capitalization of "lgpl"
so that the convex decomp stub library gets downloaded
2010-10-21 16:32:54 -04:00
7687653871
Automated merge up from viewer-development
2010-10-20 12:18:33 -04:00
500e8f2376
SH-329 SH-332 WIP BUILDFIX update linux colladadom
...
Verified my fix actually removes dependency on GLIBC 2.4 this time.
Sorry for thrashing on install.xml :)
2010-10-18 18:04:09 -04:00
4dc9875310
SH-329 SH-332 WIP update colladadom to work on linux
...
Trying again, this time with proper build flags so we don't run into
versioning issues, since the lib is built on ubuntu but has to link
on an older build machine
2010-10-18 13:30:43 -04:00
83677753bb
SH-332 SH-329 update colladadom for open source release
...
Trying to repackage colladadom for linux as static linking, test
impact on unresolved dependencies.
2010-10-18 12:29:32 -04:00
22edf673cf
merge
2010-10-15 19:51:28 -05:00
12bd7a40d6
Update llconvexdecomp
2010-10-15 19:51:00 -05:00
f670360d45
SH-329 WIP get branch ready for open source release
...
updated build config to strip havok debug symbols
also added mac convex decomp stub lib.
2010-10-15 19:29:31 -04:00
75c8a1c995
SH-331 SH-332 FIX SH-329 WIP fix: colladadom for mac/linux wip: decompstub
...
updating install.xml with the new packages for colladadom for mac & linux
updating install.xml with decomposition stub for linux (mac and win will come later)
2010-10-15 18:48:22 -04:00
997d66d348
Fix for various crashes on exit and leaks when using convex decomposition.
...
Make rendering of convex hullified prims work in physics shape display.
Reviewed by Falcon.
2010-10-15 16:33:22 -05:00
c0d882fbff
Updated colladadom.
2010-10-14 11:26:59 -05:00
26fc1c1755
SH-64 WIP update GLOD on mac
...
Trying again, this time adding SDK versions to GLOD's linker commands
as well as its compile command. Ugh.
2010-10-07 22:02:59 -04:00
1fc2b09b45
SH-64 WIP update GLOD on mac
...
Trying this again, attempting one more update to fix the issues of not
being able to run with GLOD on 10.5.
2010-10-07 21:15:41 -04:00
ca1f7828b2
Update convex decomp and physics shape display to include convex hulls for prims where appropriate.
2010-10-07 15:37:07 -05:00
6697a7179b
STORM-137 : Points install.xml to the newly built fmod libs
2010-10-07 17:11:17 -07:00
d0e32770d7
Merge
2010-09-30 13:36:04 -07:00
60f8c82790
Merge
2010-09-30 12:00:29 -07:00
462fc3ce2e
merge
2010-09-30 11:11:22 -04:00
836ca9145b
SH-64 FIX update GLOD on mac
...
built new glod against gcc 4.0 and SDK 10.4, so it should run on all OSX
systems back to 10.4. Updating install.xml with the new package.
2010-09-30 10:58:29 -04:00
af5d873719
SH-107 WIP fix broken Delaunay option in convex decomp
...
whoops. misspelled the address of the new package.
2010-09-29 11:29:59 -04:00
leyla_linden