Merge branch 'master' into ci_upload_binaries

Fixed Windows compilation.
This commit is contained in:
xawotihs
2013-12-07 22:08:54 +01:00
41 changed files with 1353 additions and 624 deletions

View File

@@ -9,7 +9,7 @@ DEFINES += SDL_CONFIG
#
QT -= core gui opengl network declarative
unix|windows:QMAKE_CXXFLAGS += -std=c++11
#unix|windows:QMAKE_CXXFLAGS += -std=c++11
INCLUDEPATH += ../../JGE/Dependencies/SDL/include
unix:INCLUDEPATH += /usr/include/GL