CMake integration and refactor

This commit is contained in:
Jack Andersen
2015-08-18 08:00:24 -10:00
parent cf9e12c650
commit 3d1e6a554a
50 changed files with 82 additions and 331 deletions

View File

@@ -1,36 +0,0 @@
#ifndef CQTOPENGLWINDOW_HPP
#define CQTOPENGLWINDOW_HPP
#include <QWindow>
#include <QOpenGLFunctions>
#include <ISurface.hpp>
class CQtOpenGLWindow : public QWindow, ISurface
{
Q_OBJECT
public:
explicit CQtOpenGLWindow(QWindow *parent = 0);
CQtOpenGLWindow();
virtual void render();
virtual void initialize();
public slots:
void renderLater();
void renderNow();
protected:
bool event(QEvent *event) Q_DECL_OVERRIDE;
void exposeEvent(QExposeEvent *event) Q_DECL_OVERRIDE;
private:
bool m_update_pending;
bool m_animating;
QOpenGLContext *m_context;
};
#endif // CQTOPENGLWINDOW_HPP

View File

@@ -3,11 +3,11 @@
#include <set>
#include <mutex>
#include <stdexcept>
#include "CDeviceToken.hpp"
#include "DeviceToken.hpp"
#include "IHIDListener.hpp"
#include "SDeviceSignature.hpp"
#include "DeviceSignature.hpp"
#include <string.h>
#include <stdio.h>
#ifdef _WIN32
#define _WIN32_LEAN_AND_MEAN 1
@@ -95,7 +95,10 @@ public:
: m_listener(NULL)
{
if (skDevFinder)
throw std::runtime_error("only one instance of CDeviceFinder may be constructed");
{
fprintf(stderr, "only one instance of CDeviceFinder may be constructed");
abort();
}
skDevFinder = this;
for (const char* typeName : types)
{

View File

@@ -2,8 +2,8 @@
#define CDEVICETOKEN
#include <string>
#include "CDeviceBase.hpp"
#include "SDeviceSignature.hpp"
#include "DeviceBase.hpp"
#include "DeviceSignature.hpp"
namespace boo
{

View File

@@ -2,7 +2,7 @@
#define CDOLPHINSMASHADAPTER_HPP
#include <stdint.h>
#include "CDeviceBase.hpp"
#include "DeviceBase.hpp"
namespace boo
{

View File

@@ -1,7 +1,7 @@
#ifndef CGENERICPAD_HPP
#define CGENERICPAD_HPP
#include "CDeviceBase.hpp"
#include "DeviceBase.hpp"
namespace boo
{

View File

@@ -3,7 +3,7 @@
#include <unordered_map>
#include <mutex>
#include "CDeviceToken.hpp"
#include "DeviceToken.hpp"
namespace boo
{