diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-04-12 16:00:10 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-04-12 16:00:10 -0500 |
| commit | 48285958d051a56ffeca0a2bfeb8b4464982c4f1 (patch) | |
| tree | 32cfc25291a97f8fb32989182fd7ac323e2f9128 /indra/newview | |
| parent | c0163bb2e63b9c2bea5d3f6def2f41d98498a389 (diff) | |
| parent | c77d1b3a657061cef70ebb9c5ccabb23ef61b242 (diff) | |
Automated merge with https://bitbucket.org/seraph/mesh-development-vs2010
Diffstat (limited to 'indra/newview')
| -rwxr-xr-x | indra/newview/CMakeLists.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index 991669d271..24bd3299f1 100755 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -1455,7 +1455,7 @@ if (WINDOWS) PROPERTIES # *TODO -reenable this once we get server usage sorted out #LINK_FLAGS "/debug /NODEFAULTLIB:LIBCMT /SUBSYSTEM:WINDOWS /INCLUDE:\"__tcmalloc\"" - LINK_FLAGS "/debug /NODEFAULTLIB:LIBCMT /SUBSYSTEM:WINDOWS" + LINK_FLAGS "/debug /NODEFAULTLIB:LIBCMT /SUBSYSTEM:WINDOWS /INCLUDE:__tcmalloc" LINK_FLAGS_DEBUG "/NODEFAULTLIB:\"LIBCMT;LIBCMTD;MSVCRT\" /INCREMENTAL:NO" LINK_FLAGS_RELEASE "" ) |