haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix build issues macOS and msys2 

Added #if USE_DECLSPEC_PROPERTY condition to control use of
__declspec(property). The -fdeclspec now is not needed to compile using
clang.

Removed use of the IS_INTRESOURCE() macro to the inline method bool
IsIntResource() as the former depends on Windows.h.
This commit is contained in:
markus-bonk 2021-07-02 10:18:21 +02:00 committed by Wayne Stambaugh
parent 87d7bdbd5e
commit b9a27a8fab
4 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
thirdparty/3dxware_sdk/inc/SpaceMouse/CActionNode.hpp vendored
View File

@ -201,7 +201,7 @@ public:
base_type::next = next.release(); base_type::next = next.release();
} }
#if !defined(__GNUC__) || defined(__clang__) #if USE_DECLSPEC_PROPERTY
/// <summary> /// <summary>
/// The <see cref="SiActionNodeEx_t"/> properties. /// The <see cref="SiActionNodeEx_t"/> properties.
/// </summary> /// </summary>

2
thirdparty/3dxware_sdk/inc/SpaceMouse/CHitTest.hpp vendored
View File

@ -44,7 +44,7 @@ public:
CHitTest() : m_aperture(1), m_dirty(false), m_selectionOnly(false) { CHitTest() : m_aperture(1), m_dirty(false), m_selectionOnly(false) {
} }
#if !defined(__GNUC__) || defined(__clang__) #if USE_DECLSPEC_PROPERTY
/// <summary> /// <summary>
/// Property accessors /// Property accessors
/// </summary> /// </summary>

24
thirdparty/3dxware_sdk/inc/SpaceMouse/CImage.hpp vendored
View File

@ -25,6 +25,7 @@
*/ */
// stdlib // stdlib
#include <cstdint>
#include <string> #include <string>
#include <sstream> #include <sstream>
@ -39,9 +40,22 @@
#endif #endif
#endif #endif
#ifndef _WIN32 /// <summary>
#define IS_INTRESOURCE(x) false /// Determines whether a value is an integer identifier for a resource.
/// </summary>
/// <param name="id">
/// The pointer to be tested whether it contains an integer resource identifier.
/// </param>
/// <returns>
/// true when id is an integer identifier for a resource, otherwise false when
/// it is typically a pointer to a string </returns>
__inline bool IsIntResource(const char *id) {
#ifdef _WIN32
return ((reinterpret_cast<uintptr_t>(id)) >> 16) == 0;
#else
return false;
#endif #endif
}
namespace TDx { namespace TDx {
/// <summary> /// <summary>
@ -85,7 +99,7 @@ public:
} }
} }
#if !defined(__GNUC__) || defined(__clang__) #if USE_DECLSPEC_PROPERTY
/// <summary> /// <summary>
/// Gets or sets the image id. /// Gets or sets the image id.
/// </summary> /// </summary>
@ -181,7 +195,7 @@ public:
std::string r_id; std::string r_id;
if (resourceId != nullptr) { if (resourceId != nullptr) {
if (IS_INTRESOURCE(resourceId)) { if (IsIntResource(resourceId)) {
std::ostringstream stream; std::ostringstream stream;
stream << "#" << reinterpret_cast<uintptr_t>(resourceId); stream << "#" << reinterpret_cast<uintptr_t>(resourceId);
r_id = stream.str(); r_id = stream.str();
@ -192,7 +206,7 @@ public:
std::string r_type; std::string r_type;
if (resourceType != nullptr) { if (resourceType != nullptr) {
if (IS_INTRESOURCE(resourceType)) { if (IsIntResource(resourceType)) {
std::ostringstream stream; std::ostringstream stream;
stream << "#" << reinterpret_cast<uintptr_t>(resourceType); stream << "#" << reinterpret_cast<uintptr_t>(resourceType);
r_type = stream.str(); r_type = stream.str();

2
thirdparty/3dxware_sdk/inc/SpaceMouse/CNavigation3D.hpp vendored
View File

@ -106,7 +106,7 @@ public:
virtual ~CNavigation3D() { virtual ~CNavigation3D() {
} }
#if !defined(__GNUC__) || defined(__clang__) #if USE_DECLSPEC_PROPERTY
/// <summary> /// <summary>
/// Gets or sets a value indicating whether the 3DMouse navigation is enabled. /// Gets or sets a value indicating whether the 3DMouse navigation is enabled.
/// </summary> /// </summary>