diff options
| author | Marius Kintel <marius@kintel.net> | 2013-05-25 19:21:17 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2013-05-25 19:21:17 (GMT) |
| commit | 9740232b080ac3d2fe87309fb51a892faf6ea913 (patch) | |
| tree | 974ac256413de1111a085d12cad7bc3f755792dd /mingw-cross-env.pri | |
| parent | fef8dba56bae76f6e876656cee603fc895fa0955 (diff) | |
| parent | e60744776193d5dc3f22e7a4a9f3afa8b8664e30 (diff) | |
Merge branch 'master' into issue364
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 } - - |