Skip to content

fix: add arm64 preprocessor directives #35

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
aminya wants to merge 1 commit into
base: 7.x
Choose a base branch
from
Open

fix: add arm64 preprocessor directives #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion opennurbs_file_utilities.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
#pragma ON_PRAGMA_WARNING_BEFORE_DIRTY_INCLUDE
#include <Shlobj.h>
#pragma ON_PRAGMA_WARNING_AFTER_DIRTY_INCLUDE
#if defined(_M_X64) && defined(WIN32) && defined(WIN64)
#if (defined(_M_X64) || defined(_M_ARM64)) && defined(WIN32) && defined(WIN64)
// Shlwapi.h, Shlobj.h and perhaps others, unconditionally define WIN32
#undef WIN32
#endif
Expand Down
20 changes: 10 additions & 10 deletions opennurbs_precompiledheader.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@
#error Incorrect _M_... setting for x64 build
#endif

#if !defined(_M_X64)
#if !defined(_M_X64) && !defined(_M_ARM64)
// This should be automatically defined by the compiler
#error _M_X64 should be defined for x64 builds
#error _M_X64 or _M_ARM64 should be defined for x64 or ARM64 builds
#endif

// All opennurbs code uses the "offical" _M_X64. Unfortunately,
Expand All @@ -43,9 +43,9 @@
// _M_X64 and _M_AMD64 for the WIN64 platform. If it doesn't,
// then we have a serious problem because some system header
// files will not be correctly preprocessed.
#if !defined(_M_AMD64)
#if !defined(_M_AMD64) && !defined(_M_ARM64)
// This should be automatically defined by the compiler
#error _M_AMD64 should be defined for x64 builds
#error _M_AMD64 or _M_ARM64 should be defined for x64 or ARM64 builds
#endif

#endif
Expand All @@ -57,7 +57,7 @@
#error Microsoft defines _WIN32 for all Windows builds
#endif

#if defined(_M_IA64) || defined(_M_X64) || defined(_M_AMD64)
#if defined(_M_IA64) || defined(_M_X64) || defined(_M_AMD64) || defined(_M_ARM64)
#error Incorrect _M_... setting for 32 bit Windows build.
#endif

Expand Down Expand Up @@ -108,9 +108,9 @@
#error Incorrect _M_... setting for x64 build
#endif

#if !defined(_M_X64)
#if !defined(_M_X64) && !defined(_M_ARM64)
// This should be automatically defined by the compiler
#error _M_X64 should be defined for x64 builds
#error _M_X64 or _M_ARM64 should be defined for x64 or ARM64 builds
#endif

// All opennurbs code uses the "offical" _M_X64. Unfortunately,
Expand All @@ -119,9 +119,9 @@
// _M_X64 and _M_AMD64 for the WIN64 platform. If it doesn't,
// then we have a serious problem because some system header
// files will not be correctly preprocessed.
#if !defined(_M_AMD64)
#if !defined(_M_AMD64) && !defined(_M_ARM64)
// This should be automatically defined by the compiler
#error _M_AMD64 should be defined for x64 builds
#error _M_AMD64 or _M_ARM64 should be defined for x64 or ARM6 builds
#endif

#endif
Expand All @@ -133,7 +133,7 @@
#error Microsoft defines _WIN32 for all Windows builds
#endif

#if defined(_M_IA64) || defined(_M_X64) || defined(_M_AMD64)
#if defined(_M_IA64) || defined(_M_X64) || defined(_M_AMD64) || defined(_M_ARM64)
#error Incorrect _M_... setting for 32 bit Windows build.
#endif

Expand Down
4 changes: 2 additions & 2 deletions opennurbs_system.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -383,7 +383,7 @@ typedef ON__UINT32 wchar_t;
*/


#if defined(_M_X64) && defined(WIN32) && defined(WIN64)
#if (defined(_M_X64) || defined(_M_ARM64)) && defined(WIN32) && defined(WIN64)
// 23 August 2007 Dale Lear

#if defined(_INC_WINDOWS)
Expand All @@ -406,7 +406,7 @@ typedef ON__UINT32 wchar_t;
#pragma ON_PRAGMA_WARNING_AFTER_DIRTY_INCLUDE
#endif

#if defined(_M_X64) && defined(WIN32) && defined(WIN64)
#if (defined(_M_X64) || defined(_M_ARM64)) && defined(WIN32) && defined(WIN64)
// 23 August 2007 Dale Lear
// windows.h unconditionally defines WIN32 This is a bug
// and the hope is this simple undef will let us continue.
Expand Down
4 changes: 2 additions & 2 deletions opennurbs_system_runtime.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@
#define ON_RUNTIME_WIN_WINOS
#endif

#if defined(_M_X64) || defined(_WIN64)
#if defined(_M_X64) || defined(_M_ARM64) || defined(_WIN64)
#define ON_64BIT_RUNTIME
#elif defined(_M_X86) || defined(_WIN32)
#define ON_32BIT_RUNTIME
Expand All @@ -146,7 +146,7 @@
#endif

#if !defined(ON_LITTLE_ENDIAN)
#if (defined(_M_X64) || defined(_M_IX86) || defined (__i386__) || defined( __x86_64__ ))
#if (defined(_M_X64) || defined(_M_ARM64) || defined(_M_IX86) || defined(__i386__) || defined(__x86_64__))
#define ON_LITTLE_ENDIAN
#endif
#endif
Expand Down