Merge branch 'master' into Qt5.2_macx

2013-12-20 11:14:10 +01:00
parent caec886e22 927f8955e9
commit 3c38e21b25
7 changed files with 9 additions and 8 deletions
--- a/projects/mtg/wagic.pri
+++ b/projects/mtg/wagic.pri
@@ -27,6 +27,7 @@ windows{
 #        INCLUDEPATH += /usr/i686-w64-mingw32/sys-root/mingw/include/c++
 	LIBS += -L/usr/i686-w64-mingw32/sys-root/mingw/lib
        LIBS += -lwsock32
+        DEFINES += FORCE_GL2
    }
    *-msvc* {
        INCLUDEPATH += extra