From 7d68cb0232d15950275b22836652238625eb9ae2 Mon Sep 17 00:00:00 2001 From: don bright Date: Sat, 18 May 2013 18:39:48 +0200 Subject: [PATCH] improve mingw build, make rm silent --- mingw-cross-env.pri | 7 ++++--- scripts/release-common.sh | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/mingw-cross-env.pri b/mingw-cross-env.pri index a447fd8c..1ddce88b 100644 --- a/mingw-cross-env.pri +++ b/mingw-cross-env.pri @@ -4,15 +4,16 @@ CONFIG(mingw-cross-env) { LIBS += mingw-cross-env/lib/libglut.a LIBS += mingw-cross-env/lib/libopengl32.a LIBS += mingw-cross-env/lib/libGLEW.a - exists( mingw-cross-env/lib/libglaux.a ) { - LIBS += mingw-cross-env/lib/libglaux.a - } +# exists( mingw-cross-env/lib/libglaux.a ) { +# LIBS += mingw-cross-env/lib/libglaux.a +# } LIBS += mingw-cross-env/lib/libglu32.a LIBS += mingw-cross-env/lib/libopencsg.a LIBS += mingw-cross-env/lib/libmpfr.a LIBS += mingw-cross-env/lib/libgmp.a LIBS += mingw-cross-env/lib/libCGAL.a QMAKE_CXXFLAGS += -fpermissive + QMAKE_DEL_FILE = rm -f } diff --git a/scripts/release-common.sh b/scripts/release-common.sh index a9fb3b53..261905dd 100755 --- a/scripts/release-common.sh +++ b/scripts/release-common.sh @@ -160,7 +160,7 @@ esac case $OS in LINXWIN) cd $DEPLOYDIR - make -s clean ## comment out for test-run + make clean ## comment out for test-run cd $OPENSCADDIR ;; *)