Mercurial > hg > beaglert
diff scripts/build_project.sh @ 464:8fcfbfb32aa0 prerelease
Examples reorder with subdirectories. Added header to each project. Moved Doxygen to bottom of render.cpp.
| author | Robert Jack <robert.h.jack@gmail.com> |
|---|---|
| date | Mon, 20 Jun 2016 16:20:38 +0100 |
| parents | d9a4fc5357e7 |
| children | 67c45feec3c3 |
line wrap: on
line diff
--- a/scripts/build_project.sh Mon Jun 20 15:10:12 2016 +0100 +++ b/scripts/build_project.sh Mon Jun 20 16:20:38 2016 +0100 @@ -5,6 +5,19 @@ # The source files in this directory are copied to the board and compiled. # set defaults unless variables are already set +<<<<<<< mine +[ -z "$BBB_ADDRESS" ] && BBB_ADDRESS="root@192.168.7.2" +[ -z "$BBB_BELA_HOME" ] && BBB_BELA_HOME="~/Bela/" +[ -z "$BBB_SCREEN_NAME" ] && BBB_SCREEN_NAME="Bela" +[ -z "$RUN_PROJECT" ] && RUN_PROJECT=1 +[ -z "$COMMAND_ARGS" ] && COMMAND_ARGS= +[ -z "$RUN_IN_FOREGROUND" ] && RUN_IN_FOREGROUND=1 +[ -z "$RUN_WITHOUT_SCREEN" ] && RUN_WITHOUT_SCREEN=0 +[ -z "$BBB_PROJECT_HOME" ] && BBB_PROJECT_HOME="${BBB_BELA_HOME}/projects/" +[ -z "$BBB_DEFAULT_PROJECT_NAME" ] && BBB_DEFAULT_PROJECT_NAME="scriptUploadedProject" +[ -z "$BBB_PROJECT_NAME" ] && BBB_PROJECT_NAME=$BBB_DEFAULT_PROJECT_NAME +======= +>>>>>>> theirs SCRIPTDIR=$(dirname "$0") [ -z $SCRIPTDIR ] && SCRIPTDIR="./" || SCRIPTDIR=$SCRIPTDIR/