Commit Graph

1001 Commits (aa2aa5e2da896a4ab96da41b878eb39e0dde8f35)

Author SHA1 Message Date
Nat Goodspeed aa2aa5e2da DRTVWR-418: Migrate HAVOK suppression from autobuild.xml to build.sh.
Turns out that without HAVOK, we can't build the PhysicsExtensions_TPV; but
the viewer's build.sh is unaware of CMake switches set in autobuild.xml.
Passing those CMake overrides in build.sh allows us to test that setting
elsewhere in build.sh to skip the PhysicsExtensions_TPV step -- instead of
failing the build.
2016-12-21 20:51:18 -05:00
Nat Goodspeed 546ead3d61 DRTVWR-418: Update to llphysicsextensions 501678, 501679 2016-12-21 16:02:31 -05:00
Nat Goodspeed 7359ec3ed8 DRTVWR-418: Temporarily suppress Havok in darwin64 builds. 2016-12-20 16:46:06 -05:00
Nat Goodspeed 8643954c70 DRTVWR-418: Update GLOD with build that's really 64-bit on Mac. 2016-12-20 15:11:20 -05:00
Nat Goodspeed 553f9843b0 DRTVWR-418: Update to darwin64 llceflib with libc++, not libstdc++. 2016-12-19 23:00:34 -05:00
Nat Goodspeed aa5a591aa7 Automated merge with ssh://bitbucket.org/lindenlab/viewer64 2016-12-16 08:55:38 -05:00
Callum Prentice c9f6905e60 Pull in an updated version of FMODEx with crash fixes (version 4.44.61 -> 4.44.64) 2016-12-15 16:24:50 -08:00
Nat Goodspeed 61fcda2c02 DRTVWR-418: Update to llceflib 501501 with darwin64 package 2016-12-15 09:12:22 -05:00
Nat Goodspeed 4ff2559458 DRTVWR-418: Update to breakpad 501475, first true 64-bit Mac build. 2016-12-12 20:02:11 -05:00
Nat Goodspeed b4902eb82a DRTVWR-418: Update to jsoncpp build 501464: actual darwin64 build 2016-12-12 15:14:03 -05:00
Nat Goodspeed 8a3ea42a21 DRTVWR-418: Fix autobuild.xml AGAIN 2016-12-09 15:45:49 -05:00
Nat Goodspeed 76f841c0f7 DRTVWR-418: Update to llphysicsextensions_* 501415, 501416 2016-12-09 15:16:55 -05:00
Nat Goodspeed e6513c1eee DRTVWR-418: Change Mac build_directory to build-darwin-x86_64
since we no longer support 32-bit Mac builds.

The old build-darwin-i386 directory name appeared in a shocking number of
files. Change CMake paths to use ${CMAKE_BINARY_DIR} -- or, when trying to
find the packages subdirectory, ${AUTOBUILD_INSTALL_DIR}. Change the rest to
at least look for build-darwin-*.
2016-12-08 12:31:30 -05:00
Callum Prentice 2337134497 update autobuild substitutions with {var} form 2016-12-05 13:58:14 -08:00
Callum Prentice 011d07f1e3 Pull in 64 bit version of vlc-bin for 64 bit viewer builds 2016-12-05 12:22:36 -08:00
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