mirror of
https://github.com/overte-org/overte.git
synced 2025-08-11 00:02:57 +02:00
Need to reorder includes due to HANDLE definition conflict.
This commit is contained in:
parent
ecb54600eb
commit
8d69eff867
1 changed files with 5 additions and 4 deletions
|
@ -10,14 +10,15 @@
|
||||||
|
|
||||||
#include <SharedUtil.h>
|
#include <SharedUtil.h>
|
||||||
|
|
||||||
#ifdef HAVE_VISAGE
|
|
||||||
#include <VisageTracker2.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#include "Application.h"
|
#include "Application.h"
|
||||||
#include "Visage.h"
|
#include "Visage.h"
|
||||||
#include "renderer/FBXReader.h"
|
#include "renderer/FBXReader.h"
|
||||||
|
|
||||||
|
// this has to go after our normal includes, because its definition of HANDLE conflicts with Qt's
|
||||||
|
#ifdef HAVE_VISAGE
|
||||||
|
#include <VisageTracker2.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
namespace VisageSDK {
|
namespace VisageSDK {
|
||||||
#ifdef WIN32
|
#ifdef WIN32
|
||||||
void __declspec(dllimport) initializeLicenseManager(char* licenseKeyFileName);
|
void __declspec(dllimport) initializeLicenseManager(char* licenseKeyFileName);
|
||||||
|
|
Loading…
Reference in a new issue