Fix compilation errors in Fedora pipeline.
This commit is contained in:
parent
c99a4f4d85
commit
f61c798295
|
@ -35,6 +35,9 @@
|
||||||
|
|
||||||
#include <glm/gtc/quaternion.hpp>
|
#include <glm/gtc/quaternion.hpp>
|
||||||
|
|
||||||
|
// stdlib
|
||||||
|
#include <algorithm>
|
||||||
|
|
||||||
TRACK_BALL::TRACK_BALL( float aInitialDistance ) :
|
TRACK_BALL::TRACK_BALL( float aInitialDistance ) :
|
||||||
CAMERA( aInitialDistance )
|
CAMERA( aInitialDistance )
|
||||||
{
|
{
|
||||||
|
|
|
@ -58,4 +58,9 @@
|
||||||
#else
|
#else
|
||||||
#define _NAVLIB_DLLAPI
|
#define _NAVLIB_DLLAPI
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#if defined(__GNUC__) && !defined(__clang__)
|
||||||
|
#define __cdecl __attribute__((__cdecl__))
|
||||||
|
#endif
|
||||||
|
|
||||||
#endif // NAVLIB_DEFINES_H_INCLUDED_
|
#endif // NAVLIB_DEFINES_H_INCLUDED_
|
||||||
|
|
|
@ -23,6 +23,7 @@
|
||||||
* @file navlib_templates.h
|
* @file navlib_templates.h
|
||||||
* @brief templates used in the 3dconnexion interface.
|
* @brief templates used in the 3dconnexion interface.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#if (defined _MSC_VER && _MSC_VER < 1900)
|
#if (defined _MSC_VER && _MSC_VER < 1900)
|
||||||
#define CONSTEXPR const
|
#define CONSTEXPR const
|
||||||
#else
|
#else
|
||||||
|
|
|
@ -26,7 +26,9 @@
|
||||||
|
|
||||||
#include <navlib/navlib_defines.h>
|
#include <navlib/navlib_defines.h>
|
||||||
|
|
||||||
|
#include <errno.h>
|
||||||
#if (defined(_MSC_VER) && _MSC_VER < 1600)
|
#if (defined(_MSC_VER) && _MSC_VER < 1600)
|
||||||
|
typedef __int8 int8_t;
|
||||||
typedef unsigned __int32 uint32_t;
|
typedef unsigned __int32 uint32_t;
|
||||||
typedef unsigned __int64 uint64_t;
|
typedef unsigned __int64 uint64_t;
|
||||||
#if _WIN64
|
#if _WIN64
|
||||||
|
@ -35,6 +37,7 @@ typedef unsigned __int64 size_t;
|
||||||
typedef unsigned int size_t;
|
typedef unsigned int size_t;
|
||||||
#endif
|
#endif
|
||||||
#else
|
#else
|
||||||
|
#include <stddef.h>
|
||||||
#include <stdint.h>
|
#include <stdint.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -66,9 +69,7 @@ public:
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
_NAVLIB_END
|
_NAVLIB_END
|
||||||
#else //__cplusplus
|
#endif //__cplusplus
|
||||||
typedef __int8 bool;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
_NAVLIB_BEGIN
|
_NAVLIB_BEGIN
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
@ -1322,7 +1323,11 @@ typedef struct tagNlCreateOptions {
|
||||||
/// true is to use multi-threading, false for single-threaded.
|
/// true is to use multi-threading, false for single-threaded.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <remarks>The default is false (single-threaded).</remarks>
|
/// <remarks>The default is false (single-threaded).</remarks>
|
||||||
|
#if __cplusplus
|
||||||
bool bMultiThreaded;
|
bool bMultiThreaded;
|
||||||
|
#else
|
||||||
|
int8_t bMultiThreaded;
|
||||||
|
#endif
|
||||||
/// <inheritdoc/>
|
/// <inheritdoc/>
|
||||||
nlOptions_t options;
|
nlOptions_t options;
|
||||||
} nlCreateOptions_t;
|
} nlCreateOptions_t;
|
||||||
|
|
Loading…
Reference in New Issue