diff options
author | Don Kjer <don@lindenlab.com> | 2012-11-28 23:46:06 +0000 |
---|---|---|
committer | Don Kjer <don@lindenlab.com> | 2012-11-28 23:46:06 +0000 |
commit | 96ef49df75c0248e4843f9a5b53f010b819d59f3 (patch) | |
tree | 9f542fae939073bbb39464500d3fd477d1ed5fe5 /BuildParams | |
parent | dc71cae16b9c49a1d6b4d4a888c3a574049fd087 (diff) | |
parent | e0432f98ee515f9777604aa784d28b63d2abfe40 (diff) |
Automated merge
Diffstat (limited to 'BuildParams')
-rw-r--r-- | BuildParams | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/BuildParams b/BuildParams index 4567f72ede..246e1b7573 100644 --- a/BuildParams +++ b/BuildParams @@ -3,6 +3,7 @@ # Please refer to: # https://wiki.secondlife.com/wiki/Automated_Build_System + # Global setting for now... Darwin.symbolfiles = "newview/Release/secondlife-symbols-darwin.tar.bz2" CYGWIN.symbolfiles = "newview/Release/secondlife-symbols-windows.tar.bz2" @@ -25,8 +26,13 @@ codeticket_since = 3.3.0-release Linux.gcc_version = /usr/bin/gcc-4.6 Linux.cxx_version = /usr/bin/g++-4.6 +clean_on_success = false +run_tests = false +build_Darwin_Debug = false +build_Darwin_RelWithDebInfo = false + # ======================================== -# Viewer Development +# Viewer Development -- # ======================================== # Report changes since... @@ -63,6 +69,7 @@ viewer-release.build_debug_release_separately = true viewer-release.build_viewer_update_version_manager = true viewer-release.codeticket_add_context = false + # ======================================== # mesh-development # ======================================== @@ -120,17 +127,6 @@ viewer-mesh.viewer_grid = aditi viewer-mesh.email = shining@lists.lindenlab.com # ======================================== -# viewer-adult-check -# ======================================== - -viewer-adult-check.viewer_channel = "Project Viewer - AdultCheck" -viewer-adult-check.login_channel = "Project Viewer - AdultCheck" -viewer-adult-check.viewer_grid = agni -viewer-adult-check.build_debug_release_separately = true -viewer-adult-check.build_CYGWIN_Debug = false -viewer-adult-check.build_viewer_update_version_manager = false - -# ======================================== # viewer-pathfinding # ======================================== @@ -202,4 +198,5 @@ runway.build_debug_release_separately = true runway.build_CYGWIN_Debug = false runway.build_viewer_update_version_manager = false + # eof |