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

fixed conflicting macx qmake rules

This commit is contained in:
Jack Andersen 2015-04-18 13:56:57 -10:00
parent 6e766bfe5e
commit 41ae47c14a
4 changed files with 38 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/CCGLContext.hpp
View File

@ -8,8 +8,11 @@ class CCGLContext final : public IContext
{ {
public: public:
CCGLContext(); CCGLContext();
virtual ~CCGLContext() {} virtual ~CCGLContext();
bool create();
void setMinVersion (const int& min) override;
void setMajorVersion(const int& maj) override;
const std::string version() const override; const std::string version() const override;
const std::string name() const override; const std::string name() const override;
int depthSize() const override; int depthSize() const override;

19
libBoo.pri
View File

@ -6,26 +6,27 @@ HEADERS += \
$$PWD/include/ISurface.hpp \ $$PWD/include/ISurface.hpp \
$$PWD/include/IRetraceWaiter.hpp $$PWD/include/IRetraceWaiter.hpp
unix:HEADERS += \ unix:!macx:HEADERS += \
$$PWD/include/CGLXContext.hpp \
mac:HEADERS -= \
$$PWD/include/CGLXContext.hpp $$PWD/include/CGLXContext.hpp
mac:HEADERS += \ mac:HEADERS += \
$$PWD/include/CCGLContext.hpp $$PWD/include/CCGLContext.hpp
win32:HEADERS += \ win32:HEADERS += \
$$PWD/include/CWGLContext.hpp \ $$PWD/include/CWGLContext.hpp
unix:SOURCES += \ SOURCES += \
$$PWD/src/CGLXContext.cpp \ $$PWD/src/CSurface.cpp \
$$PWD/src/CCGLContext.cpp \
$$PWD/src/CRetraceWaiter.cpp
mac:SOURCES -= \ unix:!macx:SOURCES += \
$$PWD/src/CGLXContext.cpp $$PWD/src/CGLXContext.cpp
mac:OBJECTIVE_SOURCES += \ mac:OBJECTIVE_SOURCES += \
$$PWD/src/CCGLCocoaView.mm $$PWD/src/CCGLCocoaView.mm
win32:SOURCES += \ win32:SOURCES += \
$$PWD/src/CWGLContext.cpp \ $$PWD/src/CWGLContext.cpp
INCLUDEPATH += $$PWD/include INCLUDEPATH += $$PWD/include

4
libBoo.pro
View File

@ -1,8 +1,8 @@
CONFIG -= Qt CONFIG -= Qt
CONFIG += app c++11 CONFIG += app c++11
unix:CONFIG += link_pkgconfig unix:!macx:CONFIG += link_pkgconfig
unix:PKGCONFIG += x11 unix:!macx:PKGCONFIG += x11
include(libBoo.pri) include(libBoo.pri)
include(test/test.pri) include(test/test.pri)

22
src/CCGLContext.cpp
View File

@ -2,10 +2,32 @@
#include <iostream> #include <iostream>
CCGLContext::CCGLContext() CCGLContext::CCGLContext()
: m_majVersion(3),
m_minVersion(3)
{ {
std::cout << "Hello from CGL" << std::endl; std::cout << "Hello from CGL" << std::endl;
} }
CCGLContext::~CCGLContext()
{
}
bool CCGLContext::create()
{
return true;
}
void CCGLContext::setMinVersion(const int& min)
{
m_minVersion = min;
}
void CCGLContext::setMajorVersion(const int& maj)
{
m_majVersion = maj;
}
const std::string CCGLContext::version() const const std::string CCGLContext::version() const
{ {
return "Invalid version"; return "Invalid version";