diff options
| -rwxr-xr-x | build.sh | 6 | ||||
| -rw-r--r-- | indra/newview/CMakeLists.txt | 4 |
2 files changed, 6 insertions, 4 deletions
@@ -268,9 +268,11 @@ then else upload_item installer "$package" binary/octet-stream upload_item quicklink "$package" binary/octet-stream - gzip $build_dir/newview/secondlife-bin-$arch.MAP + mapfilepath=$build_dir/newview + gzip $mapfilepath/secondlife-bin.MAP mapfile=secondlife-bin-$arch.MAP.gz - upload_item mapfile "$build_dir/newview/$mapfile" binary/octet-stream + mv $mapfilepath/secondlife-bin.MAP.gz $mapfilepath/$mapfile + upload_item mapfile "$mapfilepath/$mapfile" binary/octet-stream echo "Uploaded mapfile" [ -f summary.json ] && upload_item installer summary.json text/plain diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index cb269fdfc1..4839631096 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 /MAP:secondlife-bin-win32.MAP /OPT:REF" + LINK_FLAGS_RELEASE "/FORCE:MULTIPLE /MAP:secondlife-bin.MAP /OPT:REF" ) if(USE_PRECOMPILED_HEADERS) set_target_properties( @@ -1759,7 +1759,7 @@ 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" + LINK_FLAGS_RELEASE "${LINK_FLAGS_RELEASE} -Wl,--Map=${VIEWER_BINARY_NAME}.MAP" ) endif (WINDOWS) |