diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2016-07-01 14:11:45 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2016-07-01 14:11:45 -0400 |
| commit | 8854f5ca29b73f20357c1afeade46e63798923a0 (patch) | |
| tree | 24e4859334832a0837da629794fc309da587bcc6 /indra/llcorehttp | |
| parent | 1a3fa64ecc3d88f42fb7abb99f854db0a4784b8b (diff) | |
| parent | 6f6c8fa5ff6619b123f368d9137c11ed679a5349 (diff) | |
Automated merge with ssh://bitbucket.org/nat_linden/viewer-mac-mainloop
Diffstat (limited to 'indra/llcorehttp')
| -rw-r--r-- | indra/llcorehttp/CMakeLists.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llcorehttp/CMakeLists.txt b/indra/llcorehttp/CMakeLists.txt index 0bb0348d26..6f362df921 100644 --- a/indra/llcorehttp/CMakeLists.txt +++ b/indra/llcorehttp/CMakeLists.txt @@ -213,7 +213,7 @@ endif (DARWIN) # The following come from LLAddBuildTest.cmake's INTEGRATION_TEST_xxxx target. set_target_properties(http_texture_load PROPERTIES - LINK_FLAGS "/debug /NODEFAULTLIB:LIBCMT /SUBSYSTEM:CONSOLE ${TCMALLOC_LINK_FLAGS}" + LINK_FLAGS "/debug /NODEFAULTLIB:LIBCMT /SUBSYSTEM:CONSOLE" LINK_FLAGS_DEBUG "/NODEFAULTLIB:\"LIBCMT;LIBCMTD;MSVCRT\" /INCREMENTAL:NO" LINK_FLAGS_RELEASE "" ) |