From 37301a51d2d2f3731ada3ad2170cb9ec91945b62 Mon Sep 17 00:00:00 2001 From: David Walter Seikel Date: Fri, 19 Apr 2013 17:12:36 +1000 Subject: Allow the build scripts to build a configurable type, and make that type RelWithDebInfo. --- linden/scripts/linux/1-get-libraries-from-SL | 2 +- linden/scripts/linux/3-compile-SL-source | 2 +- linden/scripts/linux/config-SL-source | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) (limited to 'linden') diff --git a/linden/scripts/linux/1-get-libraries-from-SL b/linden/scripts/linux/1-get-libraries-from-SL index 87ad39c..99a4367 100755 --- a/linden/scripts/linux/1-get-libraries-from-SL +++ b/linden/scripts/linux/1-get-libraries-from-SL @@ -65,7 +65,7 @@ else FATAL_WARNINGS="" fi # Configure the sources and download the LL provided libraries: -./develop.py $os_extra --type=Release configure "$FATAL_WARNINGS" \ +./develop.py $os_extra --type=$TYPE configure "$FATAL_WARNINGS" \ -DCMAKE_C_FLAGS:STRING="$TUNE_FLAGS" -DCMAKE_CXX_FLAGS:STRING="$TUNE_FLAGS" \ -DCMAKE_C_FLAGS_DEBUG:STRING="-g $TUNE_FLAGS" -DCMAKE_CXX_FLAGS_DEBUG:STRING="-g $TUNE_FLAGS" \ -DCMAKE_C_FLAGS_RELEASE:STRING="$TUNE_FLAGS" -DCMAKE_CXX_FLAGS_RELEASE:STRING="$TUNE_FLAGS" \ diff --git a/linden/scripts/linux/3-compile-SL-source b/linden/scripts/linux/3-compile-SL-source index c932340..4ac80a7 100755 --- a/linden/scripts/linux/3-compile-SL-source +++ b/linden/scripts/linux/3-compile-SL-source @@ -54,7 +54,7 @@ source config-SL-source function compile() { cd $PATH_TO_SOURCES/indra echo "Compiling the client into $TEMP_DIR..." - nice -n 19 $ionice ./develop.py $os_extra --type=Release build + nice -n 19 $ionice ./develop.py $os_extra --type=$TYPE build } ########### end of functions ########### diff --git a/linden/scripts/linux/config-SL-source b/linden/scripts/linux/config-SL-source index 200f957..80ae27a 100644 --- a/linden/scripts/linux/config-SL-source +++ b/linden/scripts/linux/config-SL-source @@ -21,6 +21,8 @@ PATH_TO_PATCHES="$PWD/../../patches" TEMP_DIR="/tmp/SL-$USER" mkdir -p $TEMP_DIR +TYPE="RelWithDebInfo" + USE_SYSTEM_GTK="no" USE_SYSTEM_SDL="no" USE_SYSTEM_SSL="no" -- cgit v1.1