Merge pull request #75 from hreuver0183/arm64-build

Arm64 build
bdbcat · Mar 14, 2020 · 593178e · 593178e
2 parents 19b9e62 + 39da805
commit 593178e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/cmake/PluginPackage.cmake b/cmake/PluginPackage.cmake
@@ -82,7 +82,11 @@ IF(UNIX AND NOT APPLE)
 
 
   IF (CMAKE_SYSTEM_PROCESSOR MATCHES "arm*")
-    SET (ARCH "armhf")
+    IF (CMAKE_SIZEOF_VOID_P MATCHES "8")
+      SET (ARCH "arm64")
+    ELSE ()
+      SET (ARCH "armhf")
+    ENDIF ()
     # don't bother with rpm on armhf
     SET(CPACK_GENERATOR "DEB;TGZ")
   ELSE ()

diff --git a/src/oesenc_pi.cpp b/src/oesenc_pi.cpp
@@ -3836,6 +3836,7 @@ void androidGetDeviceName()
 bool IsDongleAvailable()
 {
 #ifndef __OCPN__ANDROID__    
+#ifndef OCPN_ARM64  // SGlock is not supported for ARM64
     wxString cmd = g_sencutil_bin;
     cmd += _T(" -s ");                  // Available?
 
@@ -3873,6 +3874,7 @@ bool IsDongleAvailable()
     }
 
     //g_sencutil_bin.Clear();
+#endif
 #endif
 
     return false;