Commit Graph

986 Commits (8a67aaa009f99b858e750433cfbd7901341afad8)

Author SHA1 Message Date
Nat Goodspeed 4ca084f7a0 DRTVWR-418: Another round (hopefully the last) of fixing $variables. 2016-12-05 10:49:47 -05:00
Callum Prentice cda19375cb Pull in the new Havok source package that pulls includes the new Havok Libs package with corrected Win64 libs that are properly built for VS2013 2016-12-02 16:52:24 -08:00
Callum Prentice 40dd1e637a Pull in fixed FMODEX package with 64 bit fmodex DLL correctly named (fmodex64.dll vs fmodex.dll) 2016-12-02 16:39:29 -08:00
Nat Goodspeed 55ce854a0c DRTVWR-418: Once again, undo inappropriate autobuild.xml expansions. 2016-11-30 16:18:01 -05:00
Nat Goodspeed f9d9294419 DRTVWR-418: Merge Callum's KDU update 2016-11-30 16:15:58 -05:00
Nat Goodspeed 7e8e86dc21 DRTVWR-418: Update to KDU build 501106. 2016-11-30 16:08:32 -05:00
Callum Prentice 7b2cf53f78 Pull in new version of KDU third party package that is build (correctly) as a static library vs. a stub library/DLL 2016-11-30 12:21:05 -08:00
Nat Goodspeed 5bea9b6985 DRTVWR-418: Update llceflib to build 501109. 2016-11-30 13:54:49 -05:00
Nat Goodspeed a2067761bb DRTVWR-418: Revert unintentional expansion of $vars in autobuild.xml. 2016-11-29 17:31:47 -05:00
Nat Goodspeed c5e6a960fb DRTVWR-418: Update to openjpeg build 501102 2016-11-29 16:43:57 -05:00
Nat Goodspeed 4d859d58bb DRTVWR-418: Rename darwin platform to darwin64.
We never intend to support 32-bit Mac builds any more.

This change eliminates the autobuild warning about not finding darwin64 and
therefore falling back on plain darwin.
2016-11-29 16:19:46 -05:00
Nat Goodspeed f9e0af1441 DRTVWR-418: Update to SDL build 501092. 2016-11-23 12:50:05 -05:00
Nat Goodspeed 3cffbd0330 DRTVWR-418: Update to llphysicsextensions_stub build 501069 2016-11-23 09:35:18 -05:00
Nat Goodspeed 1adf8756f3 DRTVWR-418: Use build-vc120-32 vs. build-vc120-64 on Windows. 2016-11-22 11:02:14 -05:00
Nat Goodspeed 2c8ad717fd DRTVWR-418: Update viewer to openssl 501051, curl 501064 2016-11-22 08:32:56 -05:00
Nat Goodspeed 5eda71f98d DRTVWR-418: Remove obsolete quotes from autobuild.xml.
With the new autobuild command infrastructure, the quotes that used to be
necessary for correct command-line parsing are now actually undesirable: they
are passed literally to the command in question, causing (e.g.) cmake to
complain that although it knows of a generator called Xcode, there's no
generator called 'Xcode'.
2016-11-16 15:47:21 -05:00
Nat Goodspeed 934b94e74a DRTVWR-418: pull in new viewer-release via viewer64 2016-11-16 10:56:05 -05:00
Nat Goodspeed af349febb3 Automated merge with ssh://bitbucket.org/lindenlab/viewer-release 2016-11-16 09:17:44 -05:00
Nat Goodspeed 6c7a972861 DRTVWR-418: Fold windows64 into windows platform with new autobuild.
autobuild 1.1 now supports expanding $variables within a config file --
support that was explicitly added to address this very problem. So now the
windows platform in autobuild.xml uses $AUTOBUILD_ADDRSIZE,
$AUTOBUILD_WIN_VSPLATFORM and $AUTOBUILD_WIN_CMAKE_GEN, which should handle
most of the deltas between the windows platform and windows64.

This permits removing the windows64 platform definition from autobuild.xml.

The one remaining delta between the windows64 and windows platform definitions
was -DLL_64BIT_BUILD=TRUE. But we can handle that instead by checking
ADDRESS_SIZE. Change all existing references to WORD_SIZE to ADDRESS_SIZE
instead, and set ADDRESS_SIZE to $AUTOBUILD_ADDRSIZE. Change the one existing
LL_64BIT_BUILD reference to test (ADDRESS_SIZE EQUAL 64) instead.
2016-11-15 15:53:24 -05:00
Nat Goodspeed 222d5621fd DRTVWR-418: Use separate XML string elements for command arguments.
autobuild now passes a vector of arguments to the commands it executes,
instead of smashing everything together into a single string only to have
cmd.exe parse it back into individual arguments again. In general, this is a
good thing and more robust than before.

However, it surfaces the fact that sometimes people were lazy and encoded
things like "-configuration Release" or "-j 12" as single <string> elements in
the XML. When such things are handed to the command as a single argument string
containing a space, it can get confused.

Code (e.g.) <string>-configuration</string><string>Release</string> instead.
2016-11-08 22:22:39 -08:00
Nat Goodspeed bdd9777505 DRTVWR-418: Update to KDU build 500948. 2016-11-04 09:50:23 -04:00
Nat Goodspeed 0413e40d82 DRTVWR-418: Update KDU and llimagej2ckdu* with certain clang fixes. 2016-11-03 20:48:41 -04:00
Nat Goodspeed 6cc4a8dcd2 Automated merge with ssh://bitbucket.org/lindenlab/viewer-release 2016-11-03 09:31:15 -04:00
pavelkproductengine 07e78807a8 MAINT-6810 win10, 4k monitor and UI scale of 2.0 makes most web content too small to read 2016-10-27 19:48:59 +03:00
AndreyL ProductEngine 4617e07b37 Merged in lindenlab/viewer-release 2016-10-10 23:26:58 +03:00
Callum Prentice 4a95c4b36c Restore version of CEF that has the correct Y flipping enabled - (2526/chrome47 version - soon to be replaced with 2704/chrome 51) 2016-09-07 16:13:09 -07:00
Nat Goodspeed 1bbc523b04 MAINT-5011: Revert to googlemock built on squeeze 2016-08-31 17:22:04 -04:00
Nat Goodspeed 3d0383fd14 Backed out changeset 8c0e52a212bb - revert to googlemock 297460 2016-08-31 17:21:53 -04:00
Nat Goodspeed ae214e382b MAINT-5011: Revert to llceflib built on squeeze 2016-08-31 17:21:00 -04:00
Nat Goodspeed 6076f69591 Backed out changeset 538a5b77f08e - revert to llceflib 311349 2016-08-31 17:20:45 -04:00
Nat Goodspeed 9a0acaef36 MAINT-5011: Revert to colladadom built on squeeze 2016-08-31 17:19:45 -04:00
Nat Goodspeed b32ae58e4c Backed out changeset c494a6e0b619 - revert to colladadom 297450 2016-08-31 17:19:31 -04:00
Nat Goodspeed d24f7ed33d MAINT-5011: Revert to boost built on squeeze 2016-08-31 17:18:41 -04:00
Nat Goodspeed 3ce48210ff Backed out changeset 4cf5551a22a6 - revert to boost 297445 2016-08-31 17:17:48 -04:00
Nat Goodspeed 6b24122857 Automated merge with ssh://bitbucket.org/lindenlab/viewer-vlc 2016-08-29 17:06:12 -04:00
Nat Goodspeed 1d2360ef7c Update to googlemock build 319024 2016-08-25 13:53:51 -04:00
Nat Goodspeed 12379fc8d3 Update to llceflib build 319030 2016-08-25 13:51:45 -04:00
Nat Goodspeed 91501eaa93 Update to colladadom build 319021 2016-08-25 13:44:14 -04:00
Nat Goodspeed 2f85899bfd Update to boost build 318979 2016-08-25 12:02:02 -04:00
Nat Goodspeed b240c494c4 Re-delete VSTool.exe invocations from autobuild.xml.
The CMake invocations are controlled by UNATTENDED -- these were not. Let
CMake do it if it must be done.
2016-08-16 11:03:03 -04:00
Nat Goodspeed 454da876dc Backed out changeset e187a6b45ce6: restored VSTool et al. 2016-08-15 17:12:37 -04:00
Nat Goodspeed b25ee9095d Remove VSTool, its build info and all invocations.
VSTool manipulates the SecondLife.sln solution file for the convenience of a
developer subsequently running Visual Studio interactively. But the cost of
having it sometimes break TeamCity automated builds is too high -- especially
since we never expect to run Visual Studio interactively on a TC build host.

Also remove the CMake UNATTENDED variable that controlled it.
2016-08-15 14:13:56 -04:00
Callum Linden db76562aa7 Missed updated version of LLCEFLib with flipped mouse Y input - perils of using local files 2016-07-21 13:41:42 -07:00
Callum Linden 8a25489591 MAINT-6578 Broken texture batching - fixed along with misc LibVLC plugin additions (status, titles, looping) 2016-07-20 19:54:54 -07:00
Callum Linden 0870ee4d74 MAINT-6578: pick up version of LLCEFLib that has output Y flipped to match updated viewer setting 2016-07-19 12:33:28 -07:00
Nat Goodspeed 6d10327308 DRTVWR-418: Update to llceflib build 317829 2016-07-18 16:10:01 -04:00
Nat Goodspeed 761f5e2184 DRTVWR-418: Update to googlemock build 317828 2016-07-18 15:55:55 -04:00
Nat Goodspeed 60ee4eaa52 DRTVWR-418: Update to colladadom build 317826 2016-07-18 15:51:11 -04:00
Nat Goodspeed 905c470f7f DRTVWR-418: Update to boost build 317807 2016-07-18 15:06:10 -04:00
callum_linden 247c99f678 Automated merge with tip of viewer-release 2016-07-07 09:16:51 -07:00