diff options
| author | Todd Stinson <stinson@lindenlab.com> | 2012-06-14 18:48:48 -0700 |
|---|---|---|
| committer | Todd Stinson <stinson@lindenlab.com> | 2012-06-14 18:48:48 -0700 |
| commit | ac2c4da12e9af67318d472ca0b4e3117727d7d31 (patch) | |
| tree | fecb1013e2f5cd652088ac932b77496f94e943d3 /indra | |
| parent | 8a1c557cbffcc4608f0c3b2c69dedef69bb7f3f3 (diff) | |
| parent | e76fe073df81d4fd2b25d09f7c0ccd0566c2e966 (diff) | |
Pull and merge from ssh://hg@bitbucket.org/stinson_linden/viewer-development-havokai.
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/CMakeLists.txt | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index 4d295ac5e5..cb269fdfc1 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -1550,7 +1550,7 @@ if (WINDOWS) #LINK_FLAGS "/debug /NODEFAULTLIB:LIBCMT /SUBSYSTEM:WINDOWS /INCLUDE:\"__tcmalloc\"" LINK_FLAGS "/debug /NODEFAULTLIB:LIBCMT /SUBSYSTEM:WINDOWS /INCLUDE:__tcmalloc " LINK_FLAGS_DEBUG "/NODEFAULTLIB:\"LIBCMT;LIBCMTD;MSVCRT\" /INCREMENTAL:NO" - LINK_FLAGS_RELEASE "/FORCE:MULTIPLE" + LINK_FLAGS_RELEASE "/FORCE:MULTIPLE /MAP:secondlife-bin-win32.MAP /OPT:REF" ) if(USE_PRECOMPILED_HEADERS) set_target_properties( @@ -1755,6 +1755,12 @@ if (WINDOWS) #${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/event_host.tar.bz2) endif (PACKAGE) +else (WINDOWS) + # Linux and Darwin + set_target_properties(${VIEWER_BINARY_NAME} + PROPERTIES + LINK_FLAGS_RELEASE "${LINK_FLAGS_RELEASE} -Wl,--Map=${VIEWER_BINARY_NAME}-${ARCH}.MAP" + ) endif (WINDOWS) # *NOTE - this list is very sensitive to ordering, test carefully on all |