AxioDL
/
boo
mirror of https://github.com/AxioDL/boo.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Resolve conflicts with master

This commit is contained in:
Phillip Stephens 2015-04-18 16:14:00 -07:00
parent fd3a3d7f25 55b170e5e7
commit 44a0743776
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libBoo.pri
View File

@ -1,3 +1,5 @@
!contains(CONFIG,c++11):CONFIG += C++11
HEADERS += \ HEADERS += \
$$PWD/include/boo.hpp \ $$PWD/include/boo.hpp \
$$PWD/include/IContext.hpp \ $$PWD/include/IContext.hpp \
@ -13,12 +15,6 @@ mac:HEADERS += \
win32:HEADERS += \ win32:HEADERS += \
$$PWD/include/CWGLContext.hpp \ $$PWD/include/CWGLContext.hpp \
SOURCES += \
$$PWD/src/CSurface.cpp \
$$PWD/src/CCGLContext.cpp \
$$PWD/src/CRetraceWaiter.cpp
unix:SOURCES += \ unix:SOURCES += \
$$PWD/src/CGLXContext.cpp \ $$PWD/src/CGLXContext.cpp \