diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-04-11 17:50:40 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-04-11 17:50:40 -0500 |
| commit | 8f01b70ff20f67501df0e6eab4c0965f210336c0 (patch) | |
| tree | 2ae3becaa1cdba6cda0f2611a483be1222379a0c /indra/newview | |
| parent | 0e2df0277510fc05d6038838ddf283dbd2e5124e (diff) | |
Fix for bad merge concerning incremental linking options.
Diffstat (limited to 'indra/newview')
| -rwxr-xr-x | indra/newview/CMakeLists.txt | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index d70f3ec337..991669d271 100755 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -1451,6 +1451,14 @@ set(PACKAGE ON CACHE BOOL "Add a package target that builds an installer package.") if (WINDOWS) + set_target_properties(${VIEWER_BINARY_NAME} + 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;LIBCMTD;MSVCRT\" /INCREMENTAL:NO" + LINK_FLAGS_RELEASE "" + ) if(USE_PRECOMPILED_HEADERS) set_target_properties( ${VIEWER_BINARY_NAME} |