diff options
| author | David Walter Seikel | 2013-07-15 03:59:58 +1000 |
|---|---|---|
| committer | David Walter Seikel | 2013-07-15 03:59:58 +1000 |
| commit | c7f06e9e63a54874696fe89e2ef24c809bef51f3 (patch) | |
| tree | 3eb207f344435fbeb82b142000980416d50690cd /linden/scripts/linux/1-get-libraries-from-SL | |
| parent | More Windlight refactoring, including moving the new stuff back to lightshare.c. (diff) | |
| parent | Fix Align tool conflicts with Edit Linked Parts - http://redmine.kokuaviewer.... (diff) | |
| download | meta-impy-c7f06e9e63a54874696fe89e2ef24c809bef51f3.zip meta-impy-c7f06e9e63a54874696fe89e2ef24c809bef51f3.tar.gz meta-impy-c7f06e9e63a54874696fe89e2ef24c809bef51f3.tar.bz2 meta-impy-c7f06e9e63a54874696fe89e2ef24c809bef51f3.tar.xz | |
Merge remote-tracking branch 'origin/next' into WL-refactor
Diffstat (limited to '')
| -rwxr-xr-x | linden/scripts/linux/1-get-libraries-from-SL | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/linden/scripts/linux/1-get-libraries-from-SL b/linden/scripts/linux/1-get-libraries-from-SL index 9ba61f4..99a4367 100755 --- a/linden/scripts/linux/1-get-libraries-from-SL +++ b/linden/scripts/linux/1-get-libraries-from-SL | |||
| @@ -53,7 +53,7 @@ source config-SL-source | |||
| 53 | cd $PATH_TO_SOURCES/indra | 53 | cd $PATH_TO_SOURCES/indra |
| 54 | 54 | ||
| 55 | # Do a clean build | 55 | # Do a clean build |
| 56 | ./develop.py clean | 56 | #./develop.py $os_extra clean |
| 57 | 57 | ||
| 58 | # Force the vectorization use if we chose so. | 58 | # Force the vectorization use if we chose so. |
| 59 | if [ "$FORCE_VECTORIZE" == "yes" ] ; then | 59 | if [ "$FORCE_VECTORIZE" == "yes" ] ; then |
| @@ -65,7 +65,8 @@ 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 --type=Release configure "$FATAL_WARNINGS" \ | 68 | ./develop.py $os_extra --type=$TYPE configure "$FATAL_WARNINGS" \ |
| 69 | -DCMAKE_C_FLAGS:STRING="-O2 $TUNE_FLAGS" -DCMAKE_CXX_FLAGS:STRING="-O2 $TUNE_FLAGS" \ | 69 | -DCMAKE_C_FLAGS:STRING="$TUNE_FLAGS" -DCMAKE_CXX_FLAGS:STRING="$TUNE_FLAGS" \ |
| 70 | -DCMAKE_C_FLAGS_RELEASE:STRING="-O2 $TUNE_FLAGS" -DCMAKE_CXX_FLAGS_RELEASE:STRING="-O2 $TUNE_FLAGS" \ | 70 | -DCMAKE_C_FLAGS_DEBUG:STRING="-g $TUNE_FLAGS" -DCMAKE_CXX_FLAGS_DEBUG:STRING="-g $TUNE_FLAGS" \ |
| 71 | -DCMAKE_C_FLAGS_RELWITHDEBINFO:STRING="-g -O2 $TUNE_FLAGS" -DCMAKE_CXX_FLAGS_RELWITHDEBINFO:STRING="-g -O2 $TUNE_FLAGS" | 71 | -DCMAKE_C_FLAGS_RELEASE:STRING="$TUNE_FLAGS" -DCMAKE_CXX_FLAGS_RELEASE:STRING="$TUNE_FLAGS" \ |
| 72 | -DCMAKE_C_FLAGS_RELWITHDEBINFO:STRING="-g $TUNE_FLAGS" -DCMAKE_CXX_FLAGS_RELWITHDEBINFO:STRING="-g $TUNE_FLAGS" -DPACKAGE:BOOL=ON | ||