diff options
| author | Marius Kintel <marius@kintel.net> | 2013-05-22 03:04:22 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2013-05-22 03:04:22 (GMT) |
| commit | ef9d8a853be1a6d6ca48239fcc79106ba374ee21 (patch) | |
| tree | 041fe3424e663a40986208e6829df5e955838e33 /mingw-cross-env.pri | |
| parent | 470588b296aea880c84071ee53a23f055f9c5bf0 (diff) | |
| parent | 71ab237aada8db602045063f0f1c6082ef06972a (diff) | |
Merge branch 'master' into issue304
Diffstat (limited to 'mingw-cross-env.pri')
| -rw-r--r-- | mingw-cross-env.pri | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/mingw-cross-env.pri b/mingw-cross-env.pri index 9b808c0..e696b56 100644 --- a/mingw-cross-env.pri +++ b/mingw-cross-env.pri @@ -4,13 +4,15 @@ 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 - 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 + QMAKE_CXXFLAGS_WARN_ON += -Wno-unused-local-typedefs #eigen3 } - - |