diff options
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/linux-build-dependencies.sh | 18 | ||||
| -rw-r--r-- | scripts/setenv-linbuild.sh | 16 |
2 files changed, 21 insertions, 13 deletions
diff --git a/scripts/linux-build-dependencies.sh b/scripts/linux-build-dependencies.sh index 7727c4e..a789e9d 100755 --- a/scripts/linux-build-dependencies.sh +++ b/scripts/linux-build-dependencies.sh @@ -7,12 +7,9 @@ # Usage: linux-build-dependencies.sh # # Prerequisites: -# - curl -# -- you can uncomment 'build_curl' at the bottom -# -- and add $BASEDIR/bin to your PATH, i.e. in .bash_profile +# - wget # - Qt4 -# - cmake 2.8 -# -- you can uncomment 'build_cmake' at the bottom +# - cmake 2.8 ( force build_cmake at bottom if yours is too old ) # BASEDIR=$HOME/openscad_deps @@ -209,9 +206,9 @@ mkdir -p $SRCDIR $DEPLOYDIR export PATH=$BASEDIR/bin:$PATH export LD_LIBRARY_PATH=$DEPLOYDIR/lib:$DEPLOYDIR/lib64:$LD_LIBRARY_PATH export LD_RUN_PATH=$DEPLOYDIR/lib:$DEPLOYDIR/lib64:$LD_RUN_PATH -echo "PATH modified" -echo "LD_LIBRARY_PATH modified" -echo "LD_RUN_PATH modified" +echo "PATH modified temporarily" +echo "LD_LIBRARY_PATH modified temporarily" +echo "LD_RUN_PATH modified temporarily" if [ ! "`command -v curl`" ]; then build_curl 7.26.0 @@ -232,8 +229,3 @@ build_glew 1.7.0 build_opencsg 1.3.2 echo "OpenSCAD dependencies built in " $BASEDIR -echo "To build OpenSCAD, copy/paste these lines to your shell prompt: " -echo "export LD_LIBRARY_PATH=$DEPLOYDIR/lib:$DEPLOYDIR/lib64" -echo "GLEWDIR=$DEPLOYDIR OPENSCAD_LIBRARIES=$DEPLOYDIR qmake-qt4" -echo "make -j$NUMCPU" - diff --git a/scripts/setenv-linbuild.sh b/scripts/setenv-linbuild.sh new file mode 100644 index 0000000..a61b55a --- /dev/null +++ b/scripts/setenv-linbuild.sh @@ -0,0 +1,16 @@ +# BASEDIR and DEPLOYDIR must be the same as in linux-build-dependencies.sh +BASEDIR=$HOME/openscad_deps +DEPLOYDIR=$BASEDIR + +PATH=$BASEDIR/bin:$PATH +LD_LIBRARY_PATH=$DEPLOYDIR/lib:$DEPLOYDIR/lib64 +LD_RUN_PATH=$DEPLOYDIR/lib:$DEPLOYDIR/lib64 +OPENSCAD_LIBRARIES=$DEPLOYDIR +GLEWDIR=$DEPLOYDIR + +echo PATH modified +echo LD_LIBRARY_PATH modified +echo LD_RUN_PATH modified +echo OPENSCAD_LIBRARIES modified +echo GLEWDIR modified + |