summaryrefslogtreecommitdiff
path: root/BuildParams
diff options
context:
space:
mode:
authorcallum_linden <none@none>2013-04-17 13:38:04 -0700
committercallum_linden <none@none>2013-04-17 13:38:04 -0700
commit88eff41649b13f00f636e54e093fd5b8becf5f8c (patch)
treef099a81df2c66e9940aa85ad1f47cc982a5eecc1 /BuildParams
parent010c87788d5c698d6cfe5782ac02d9a3924124cf (diff)
parentfac6ee27f2d3277494f011271064b0e5e7e02554 (diff)
Merge with viewer-development
Diffstat (limited to 'BuildParams')
-rw-r--r--BuildParams17
1 files changed, 17 insertions, 0 deletions
diff --git a/BuildParams b/BuildParams
index c8edfeaa2f..c929c2d90d 100644
--- a/BuildParams
+++ b/BuildParams
@@ -21,6 +21,11 @@ email_status_this_is_os = true
# Limit extent of codeticket updates to revisions after...
codeticket_since = 3.3.0-release
+# Override build system default toolchain
+# Note that this will only affect automated builds.
+Linux.gcc_version = /usr/bin/gcc-4.6
+Linux.cxx_version = /usr/bin/g++-4.6
+
# ========================================
# Viewer Development
# ========================================
@@ -127,6 +132,18 @@ viewer-pathfinding.build_debug_release_separately = true
viewer-pathfinding.build_CYGWIN_Debug = false
viewer-pathfinding.build_viewer_update_version_manager = false
+# ========================================
+# viewer-chui
+#
+# ========================================
+
+viewer-chui.viewer_channel = "Project Viewer - CHUI"
+viewer-chui.login_channel = "Project Viewer - CHUI"
+viewer-chui.viewer_grid = agni
+viewer-chui.build_debug_release_separately = true
+viewer-chui.build_CYGWIN_Debug = false
+viewer-chui.build_viewer_update_version_manager = false
+
# =================================================================
# asset delivery 2010 projects
# =================================================================