diff options
| author | Marius Kintel <marius@kintel.net> | 2013-12-31 06:28:23 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2013-12-31 06:28:23 (GMT) |
| commit | 1bf5f443793db69f846e4f44479c435dff017e84 (patch) | |
| tree | ea00a7841487b29f53986b0aa522b1a8143af49c | |
| parent | df731159d4abb15cc6d5f1c153beb498421789c3 (diff) | |
| parent | 7fb88e6c140d7f47b13d32cbfc6272af9c5df9f1 (diff) | |
Merge branch 'master' of github.com:openscad/openscad
| -rw-r--r-- | mingw-cross-env.pri | 2 | ||||
| -rwxr-xr-x | scripts/builder.sh | 12 |
2 files changed, 14 insertions, 0 deletions
diff --git a/mingw-cross-env.pri b/mingw-cross-env.pri index 07a0fc1..ab5b956 100644 --- a/mingw-cross-env.pri +++ b/mingw-cross-env.pri @@ -12,6 +12,8 @@ CONFIG(mingw-cross-env) { LIBS += mingw-cross-env/lib/libmpfr.a LIBS += mingw-cross-env/lib/libgmp.a LIBS += mingw-cross-env/lib/libCGAL.a + LIBS += mingw-cross-env/lib/libintl.a + LIBS += mingw-cross-env/lib/libiconv.a QMAKE_CXXFLAGS += -fpermissive WINSTACKSIZE = 8388608 # 8MB # github issue 116 QMAKE_CXXFLAGS += -Wl,--stack,$$WINSTACKSIZE diff --git a/scripts/builder.sh b/scripts/builder.sh index ca7e5b2..f1a253e 100755 --- a/scripts/builder.sh +++ b/scripts/builder.sh @@ -99,6 +99,12 @@ build_win32() . ./scripts/setenv-mingw-xbuild.sh ./scripts/mingw-x-build-dependencies.sh ./scripts/release-common.sh mingw32 + if [ "`echo $? | grep 0`" ]; then + echo build of win32 stage over + else + echo build of win32 failed. exiting + exit 1 + fi DATECODE=`date +"%Y.%m.%d"` export DATECODE } @@ -109,6 +115,12 @@ build_win64() . ./scripts/setenv-mingw-xbuild.sh 64 ./scripts/mingw-x-build-dependencies.sh 64 ./scripts/release-common.sh mingw64 + if [ "`echo $? | grep 0`" ]; then + echo build of win64 stage over + else + echo build of win64 failed. exiting + exit 1 + fi DATECODE=`date +"%Y.%m.%d"` export DATECODE } |