diff options
-rw-r--r-- | mingw-cross-env.pri | 7 | ||||
-rwxr-xr-x | 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 a447fd8..1ddce88 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 a9fb3b5..261905d 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 ;; *) |