diff options
author | David Walter Seikel | 2013-04-19 17:12:36 +1000 |
---|---|---|
committer | David Walter Seikel | 2013-04-19 17:12:36 +1000 |
commit | 37301a51d2d2f3731ada3ad2170cb9ec91945b62 (patch) | |
tree | bab5dbd5234f9328833d46422e876651aab124d2 /linden | |
parent | Bump experimental version number. (diff) | |
download | meta-impy-37301a51d2d2f3731ada3ad2170cb9ec91945b62.zip meta-impy-37301a51d2d2f3731ada3ad2170cb9ec91945b62.tar.gz meta-impy-37301a51d2d2f3731ada3ad2170cb9ec91945b62.tar.bz2 meta-impy-37301a51d2d2f3731ada3ad2170cb9ec91945b62.tar.xz |
Allow the build scripts to build a configurable type, and make that type RelWithDebInfo.
Diffstat (limited to 'linden')
-rwxr-xr-x | linden/scripts/linux/1-get-libraries-from-SL | 2 | ||||
-rwxr-xr-x | linden/scripts/linux/3-compile-SL-source | 2 | ||||
-rw-r--r-- | linden/scripts/linux/config-SL-source | 2 |
3 files changed, 4 insertions, 2 deletions
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 | |||
65 | FATAL_WARNINGS="" | 65 | FATAL_WARNINGS="" |
66 | fi | 66 | fi |
67 | # Configure the sources and download the LL provided libraries: | 67 | # Configure the sources and download the LL provided libraries: |
68 | ./develop.py $os_extra --type=Release configure "$FATAL_WARNINGS" \ | 68 | ./develop.py $os_extra --type=$TYPE configure "$FATAL_WARNINGS" \ |
69 | -DCMAKE_C_FLAGS:STRING="$TUNE_FLAGS" -DCMAKE_CXX_FLAGS:STRING="$TUNE_FLAGS" \ | 69 | -DCMAKE_C_FLAGS:STRING="$TUNE_FLAGS" -DCMAKE_CXX_FLAGS:STRING="$TUNE_FLAGS" \ |
70 | -DCMAKE_C_FLAGS_DEBUG:STRING="-g $TUNE_FLAGS" -DCMAKE_CXX_FLAGS_DEBUG:STRING="-g $TUNE_FLAGS" \ | 70 | -DCMAKE_C_FLAGS_DEBUG:STRING="-g $TUNE_FLAGS" -DCMAKE_CXX_FLAGS_DEBUG:STRING="-g $TUNE_FLAGS" \ |
71 | -DCMAKE_C_FLAGS_RELEASE:STRING="$TUNE_FLAGS" -DCMAKE_CXX_FLAGS_RELEASE:STRING="$TUNE_FLAGS" \ | 71 | -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 | |||
54 | function compile() { | 54 | function compile() { |
55 | cd $PATH_TO_SOURCES/indra | 55 | cd $PATH_TO_SOURCES/indra |
56 | echo "Compiling the client into $TEMP_DIR..." | 56 | echo "Compiling the client into $TEMP_DIR..." |
57 | nice -n 19 $ionice ./develop.py $os_extra --type=Release build | 57 | nice -n 19 $ionice ./develop.py $os_extra --type=$TYPE build |
58 | } | 58 | } |
59 | 59 | ||
60 | ########### end of functions ########### | 60 | ########### 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" | |||
21 | TEMP_DIR="/tmp/SL-$USER" | 21 | TEMP_DIR="/tmp/SL-$USER" |
22 | mkdir -p $TEMP_DIR | 22 | mkdir -p $TEMP_DIR |
23 | 23 | ||
24 | TYPE="RelWithDebInfo" | ||
25 | |||
24 | USE_SYSTEM_GTK="no" | 26 | USE_SYSTEM_GTK="no" |
25 | USE_SYSTEM_SDL="no" | 27 | USE_SYSTEM_SDL="no" |
26 | USE_SYSTEM_SSL="no" | 28 | USE_SYSTEM_SSL="no" |