Skip to content
This repository was archived by the owner on Aug 27, 2025. It is now read-only.

Commit f97b1af

Browse files
committed
Revert "Add MMAL and MMAL_APPS to 64bit builds"
This reverts commit 7d3c6b9.
1 parent f4bccc3 commit f97b1af

File tree

3 files changed

+14
-14
lines changed

3 files changed

+14
-14
lines changed

CMakeLists.txt

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,13 @@ SET(PROJECT_VER_PATCH 0)
88
SET(PROJECT_VER "${PROJECT_VER_MAJOR}.${PROJECT_VER_MINOR}.${PROJECT_VER_PATCH}")
99
SET(PROJECT_APIVER "${PROJECT_VER}")
1010

11-
set(BUILD_MMAL TRUE)
12-
set(BUILD_MMAL_APPS TRUE)
13-
11+
if(ARM64)
12+
set(BUILD_MMAL FALSE)
13+
set(BUILD_MMAL_APPS FALSE)
14+
else()
15+
set(BUILD_MMAL TRUE)
16+
set(BUILD_MMAL_APPS TRUE)
17+
endif()
1418
set(vmcs_root ${PROJECT_SOURCE_DIR})
1519
get_filename_component(VIDEOCORE_ROOT . ABSOLUTE)
1620

@@ -74,11 +78,9 @@ if(BUILD_MMAL)
7478
endif()
7579

7680
# VidTex supports Android and Linux
77-
if(NOT ARM64)
78-
if(BUILD_MMAL_APPS)
79-
add_subdirectory(host_applications/android/apps/vidtex)
80-
endif(BUILD_MMAL_APPS)
81-
endif()
81+
if(BUILD_MMAL_APPS)
82+
add_subdirectory(host_applications/android/apps/vidtex)
83+
endif(BUILD_MMAL_APPS)
8284

8385
if(NOT ARM64)
8486
add_subdirectory(middleware/openmaxil)

host_applications/linux/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ add_subdirectory(libs/bcm_host)
44
add_subdirectory(apps/gencmd)
55
add_subdirectory(apps/tvservice)
66
add_subdirectory(apps/vcmailbox)
7-
add_subdirectory(apps/raspicam)
8-
add_subdirectory(libs/sm)
97
if(NOT ARM64)
8+
add_subdirectory(apps/raspicam)
9+
add_subdirectory(libs/sm)
1010
add_subdirectory(apps/smem)
1111
endif()
1212
add_subdirectory(libs/debug_sym)

interface/mmal/CMakeLists.txt

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,8 @@ add_subdirectory(core)
1111
add_subdirectory(util)
1212
add_subdirectory(vc)
1313
add_subdirectory(components)
14-
if(NOT ARM64)
15-
add_subdirectory(openmaxil)
16-
add_subdirectory(client)
17-
endif()
14+
add_subdirectory(openmaxil)
15+
add_subdirectory(client)
1816

1917
target_link_libraries(mmal mmal_core mmal_util mmal_vc_client vcos mmal_components)
2018

0 commit comments

Comments
 (0)