diff options
| author | don bright <hugh.m.bright@gmail.com> | 2012-07-04 06:04:16 (GMT) |
|---|---|---|
| committer | don bright <hugh.m.bright@gmail.com> | 2012-07-04 06:04:16 (GMT) |
| commit | 883c433e24e5f31791474d3f51925a3b55433ac8 (patch) | |
| tree | 8a769ccb3b91fa493c3b20af16434e0f0d04fe81 | |
| parent | 9b0f148d2d71ae0d975912e1b405650a45f6b042 (diff) | |
| parent | def43ad3169d4dfbbcc42de41ab405af35f7ec23 (diff) | |
Merge branch 'linbuilder' of git@github.com:openscad/openscad into linbuilder
| -rwxr-xr-x | scripts/linux-build-dependencies.sh | 2 | ||||
| -rw-r--r-- | scripts/setenv-linbuild.sh | 12 |
2 files changed, 8 insertions, 6 deletions
diff --git a/scripts/linux-build-dependencies.sh b/scripts/linux-build-dependencies.sh index 286399b..aef58b9 100755 --- a/scripts/linux-build-dependencies.sh +++ b/scripts/linux-build-dependencies.sh @@ -7,7 +7,7 @@ # Usage: linux-build-dependencies.sh # # Prerequisites: -# - wget +# - wget or curl # - Qt4 # - cmake 2.8 ( force build_cmake at bottom if yours is too old ) # diff --git a/scripts/setenv-linbuild.sh b/scripts/setenv-linbuild.sh index 8e3d76d..9719533 100644 --- a/scripts/setenv-linbuild.sh +++ b/scripts/setenv-linbuild.sh @@ -7,12 +7,14 @@ 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 +export PATH=$BASEDIR/bin:$PATH +export LD_LIBRARY_PATH=$DEPLOYDIR/lib:$DEPLOYDIR/lib64 +export LD_RUN_PATH=$DEPLOYDIR/lib:$DEPLOYDIR/lib64 +export OPENSCAD_LIBRARIES=$DEPLOYDIR +export GLEWDIR=$DEPLOYDIR +echo BASEDIR: $BASEDIR +echo DEPLOYDIR: $DEPLOYDIR echo PATH modified echo LD_LIBRARY_PATH modified echo LD_RUN_PATH modified |