mirror of
https://github.com/AxioDL/boo.git
synced 2025-12-16 08:27:10 +00:00
Resolve conflicts with master
This commit is contained in:
@@ -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 \
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user