Updating viewer build process to also generate a secondlife-bin.MAP file, tar it, and upload it.
parent
9252ad10fd
commit
8b2ad982d7
4
build.sh
4
build.sh
|
|
@ -268,6 +268,10 @@ then
|
|||
else
|
||||
upload_item installer "$package" binary/octet-stream
|
||||
upload_item quicklink "$package" binary/octet-stream
|
||||
gzip $build_dir/newview/secondlife-bin-$arch.MAP
|
||||
mapfile=secondlife-bin-$arch.MAP.gz
|
||||
upload_item mapfile "$build_dir/newview/$mapfile" binary/octet-stream
|
||||
echo "Uploaded mapfile"
|
||||
[ -f summary.json ] && upload_item installer summary.json text/plain
|
||||
|
||||
# Upload crash reporter files.
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Reference in New Issue