summaryrefslogtreecommitdiff
path: root/indra/llinventory/llinventory.cpp
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2016-11-15 15:53:24 -0500
committerNat Goodspeed <nat@lindenlab.com>2016-11-15 15:53:24 -0500
commit6c7a97286113b1d3335d585d0d7cbc047baae021 (patch)
treea2d7bf9ca5e338ab2c423831691cd90dd5e5f826 /indra/llinventory/llinventory.cpp
parent944c497090b09e30377a67d60049c641b5e10e55 (diff)
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.
Diffstat (limited to 'indra/llinventory/llinventory.cpp')
0 files changed, 0 insertions, 0 deletions