diff options
author | Nat Goodspeed <nat@lindenlab.com> | 2016-12-19 18:55:31 -0500 |
---|---|---|
committer | Nat Goodspeed <nat@lindenlab.com> | 2016-12-19 18:55:31 -0500 |
commit | f130b648b4856663481f124711afc285babd5614 (patch) | |
tree | 48e6bf7ff99b9916352fb12d4f0b1538c5e4c8fa /indra/cmake/00-COMPILE-LINK-RUN.txt | |
parent | 40fb9d3e58fcb28778c57a835795ff4a1ef90b98 (diff) |
DRTVWR-418: Use $LL_BUILD to set most switches in 00-Common.cmake.
Going forward, the intention is to set in 00-Common.cmake only switches not
already set for ALL viewer-related libraries in
https://bitbucket.org/lindenlab/viewer-build-variables/src/tip/variables.
To that end, remove all switches redundant with settings from that file.
Remove redundancies within 00-Common.cmake.
Remove cruft testing for gcc versions older than 4.3.
Diffstat (limited to 'indra/cmake/00-COMPILE-LINK-RUN.txt')
-rw-r--r-- | indra/cmake/00-COMPILE-LINK-RUN.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/cmake/00-COMPILE-LINK-RUN.txt b/indra/cmake/00-COMPILE-LINK-RUN.txt index 162b22865c..1933072a6d 100644 --- a/indra/cmake/00-COMPILE-LINK-RUN.txt +++ b/indra/cmake/00-COMPILE-LINK-RUN.txt @@ -48,8 +48,8 @@ Compilation LL_WINDOWS=1 " " UNICODE " " _UNICODE " " - WINVER=0x0501 " " - _WIN32_WINNT=0x0501 " " + WINVER=0x0600 " " + _WIN32_WINNT=0x0600 " " LL_OS_DRAGDROP_ENABLED=1 " " LIB_NDOF=1 " " |