diff options
| author | don bright <hugh.m.bright@gmail.com> | 2012-08-02 04:14:34 (GMT) |
|---|---|---|
| committer | don bright <hugh.m.bright@gmail.com> | 2012-08-02 04:14:34 (GMT) |
| commit | 0b77c6af81356d736eea2e50f875f4b92a2a5b25 (patch) | |
| tree | 3dad84810ea601d0c6145817a20b381025354e76 | |
| parent | e9e97af0a104b6dd2b4ef6bac95a5ea3e6ebeddb (diff) | |
bugfixes, update README
| -rw-r--r-- | README.md | 5 | ||||
| -rwxr-xr-x | scripts/mingw-x-build-dependencies.sh | 9 | ||||
| -rwxr-xr-x | scripts/mingw-x-build-openscad.sh | 17 |
3 files changed, 14 insertions, 17 deletions
@@ -177,8 +177,9 @@ Then run the script to download & compile all the prerequisite libraries above: ./scripts/mingw-x-build-dependencies.sh -After that, follow the Compilation instructions that are printed at the -end of the script (not the ones below). +After that (it may take several hours), run the Compilation script: + + ./scripts/mingw-x-build-openscad.sh ### Compilation diff --git a/scripts/mingw-x-build-dependencies.sh b/scripts/mingw-x-build-dependencies.sh index 405b7e8..6856ba1 100755 --- a/scripts/mingw-x-build-dependencies.sh +++ b/scripts/mingw-x-build-dependencies.sh @@ -67,12 +67,3 @@ fi echo "linking mxe to" $DEPLOYDIR/mingw-cross-env ln -s $MXEDIR/usr/i686-pc-mingw32/ $DEPLOYDIR/mingw-cross-env -echo -echo "now copy/paste the following to cross-build openscad in" $DEPLOYDIR -echo -echo cd $DEPLOYDIR -echo "i686-pc-mingw32-qmake CONFIG+=mingw-cross-env ../openscad.pro" -#echo "make -j$NUMCPU" # causes parser_yacc.hpp errors -echo "make" -echo cd $OPENSCADDIR -echo diff --git a/scripts/mingw-x-build-openscad.sh b/scripts/mingw-x-build-openscad.sh index 5f27960..59065ce 100755 --- a/scripts/mingw-x-build-openscad.sh +++ b/scripts/mingw-x-build-openscad.sh @@ -24,19 +24,24 @@ if [ ! -e $BASEDIR/lib ]; then echo "please run the mingw-x-build-dependencies.sh script first" fi -echo cd $DEPLOYDIR -echo "i686-pc-mingw32-qmake CONFIG+=mingw-cross-env ../openscad.pro" -#echo "make -j$NUMCPU" # causes parser_yacc.hpp errors -echo "make" +echo "entering $DEPLOYDIR" +cd $DEPLOYDIR +i686-pc-mingw32-qmake CONFIG+=mingw-cross-env ../openscad.pro +#"make -j$NUMCPU" # causes parser_yacc.hpp errors +make +echo "leaving $DEPLOYDIR" + +echo "entering $OPENSCADDIR" +cd $OPENSCADDIR OPENSCAD_EXE=$DEPLOYDIR/release/openscad.exe if [ -e $OPENSCAD_EXE ] ; then + echo Build finished. Executable: echo - echo $OPENSCAD_EXE built in $DEPLOYDIR/release + echo " "$OPENSCAD_EXE echo else echo Cannot find $OPENSCAD_EXE. The build appears to have had an error. fi -echo cd $OPENSCADDIR |