[cmake,qt4,ad_mad] Fix build on Raspberry Pi 4

mean00 · Feb 6, 2020 · aac9d5f · aac9d5f
1 parent 5843ad3
commit aac9d5f
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 2 deletions.
diff --git a/avidemux/qt4/ADM_userInterfaces/ADM_gui/Q_dummyWidget.cpp b/avidemux/qt4/ADM_userInterfaces/ADM_gui/Q_dummyWidget.cpp
@@ -2,6 +2,9 @@
 #include "config.h"
 #ifdef USE_OPENGL
 #include <QOpenGLWidget>
+#ifdef ADM_CPU_ARM64
+  #include "GL/gl.h" // not included via QOpenGLWidget on ES2 platforms
+#endif
 #include "Q_dummyWidget.h"
 #include "ADM_default.h"
 

diff --git a/avidemux_plugins/ADM_audioDecoders/ADM_ad_mad/CMakeLists.txt b/avidemux_plugins/ADM_audioDecoders/ADM_ad_mad/CMakeLists.txt
@@ -6,7 +6,7 @@ ENDIF(MSVC)
 
 IF (ADM_CPU_X86_32)
 	ADD_DEFINITIONS("-DFPM_INTEL")
-ELSEIF (ADM_CPU_X86_64)
+ELSEIF (ADM_CPU_X86_64 OR ADM_CPU_ARM64)
 	ADD_DEFINITIONS("-DFPM_DEFAULT")
 ELSEIF (ADM_CPU_PPC)
 	ADD_DEFINITIONS("-DFPM_PPC")

diff --git a/cmake/ADM_coreConfig.h.cmake b/cmake/ADM_coreConfig.h.cmake
@@ -9,6 +9,7 @@
 #cmakedefine ADM_BIG_ENDIAN
 #cmakedefine ADM_CPU_64BIT
 #cmakedefine ADM_CPU_ARMEL
+#cmakedefine ADM_CPU_ARM64
 #cmakedefine ADM_CPU_X86
 #cmakedefine ADM_CPU_X86_32
 #cmakedefine ADM_CPU_X86_64

diff --git a/cmake/admDetermineSystem.cmake b/cmake/admDetermineSystem.cmake
@@ -75,7 +75,7 @@ IF(NOT MSVC)
                                 PERFORM_SYSTEM_TEST(cpu_arm64_check.cpp "ARM64" ARM64_SUPPORTED)
 
                                 IF(ARM64_SUPPORTED)
-                                        set(adm_cpu_arm64 1)
+                                        set(ADM_CPU_ARM64 1)
                                 endif(ARM64_SUPPORTED)
                         ENDIF(ARMEL_SUPPORTED)
 	        ENDIF (X86_32_SUPPORTED)