mirror of
https://github.com/AxioDL/boo.git
synced 2025-07-09 06:35:53 +00:00
Resolve conflicts with master
This commit is contained in:
commit
44a0743776
@ -1,3 +1,5 @@
|
||||
!contains(CONFIG,c++11):CONFIG += C++11
|
||||
|
||||
HEADERS += \
|
||||
$$PWD/include/boo.hpp \
|
||||
$$PWD/include/IContext.hpp \
|
||||
@ -13,12 +15,6 @@ mac:HEADERS += \
|
||||
win32:HEADERS += \
|
||||
$$PWD/include/CWGLContext.hpp \
|
||||
|
||||
|
||||
SOURCES += \
|
||||
$$PWD/src/CSurface.cpp \
|
||||
$$PWD/src/CCGLContext.cpp \
|
||||
$$PWD/src/CRetraceWaiter.cpp
|
||||
|
||||
unix:SOURCES += \
|
||||
$$PWD/src/CGLXContext.cpp \
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user