Browse Source

Fix compilation errors in Fedora pipeline.

7.0
markus-bonk 4 years ago
committed by Wayne Stambaugh
parent
commit
f61c798295
  1. 3
      3d-viewer/3d_rendering/track_ball.cpp
  2. 5
      thirdparty/3dxware_sdk/inc/navlib/navlib_defines.h
  3. 1
      thirdparty/3dxware_sdk/inc/navlib/navlib_templates.h
  4. 11
      thirdparty/3dxware_sdk/inc/navlib/navlib_types.h

3
3d-viewer/3d_rendering/track_ball.cpp

@ -35,6 +35,9 @@
#include <glm/gtc/quaternion.hpp>
// stdlib
#include <algorithm>
TRACK_BALL::TRACK_BALL( float aInitialDistance ) :
CAMERA( aInitialDistance )
{

5
thirdparty/3dxware_sdk/inc/navlib/navlib_defines.h

@ -58,4 +58,9 @@
#else
#define _NAVLIB_DLLAPI
#endif
#if defined(__GNUC__) && !defined(__clang__)
#define __cdecl __attribute__((__cdecl__))
#endif
#endif // NAVLIB_DEFINES_H_INCLUDED_

1
thirdparty/3dxware_sdk/inc/navlib/navlib_templates.h

@ -23,6 +23,7 @@
* @file navlib_templates.h
* @brief templates used in the 3dconnexion interface.
*/
#if (defined _MSC_VER && _MSC_VER < 1900)
#define CONSTEXPR const
#else

11
thirdparty/3dxware_sdk/inc/navlib/navlib_types.h

@ -26,7 +26,9 @@
#include <navlib/navlib_defines.h>
#include <errno.h>
#if (defined(_MSC_VER) && _MSC_VER < 1600)
typedef __int8 int8_t;
typedef unsigned __int32 uint32_t;
typedef unsigned __int64 uint64_t;
#if _WIN64
@ -35,6 +37,7 @@ typedef unsigned __int64 size_t;
typedef unsigned int size_t;
#endif
#else
#include <stddef.h>
#include <stdint.h>
#endif
@ -66,9 +69,7 @@ public:
}
};
_NAVLIB_END
#else //__cplusplus
typedef __int8 bool;
#endif
#endif //__cplusplus
_NAVLIB_BEGIN
/// <summary>
@ -1322,7 +1323,11 @@ typedef struct tagNlCreateOptions {
/// true is to use multi-threading, false for single-threaded.
/// </summary>
/// <remarks>The default is false (single-threaded).</remarks>
#if __cplusplus
bool bMultiThreaded;
#else
int8_t bMultiThreaded;
#endif
/// <inheritdoc/>
nlOptions_t options;
} nlCreateOptions_t;

Loading…
Cancel
Save