Add MMAL and MMAL_APPS to 64bit builds

Drops
host_applications/android/apps/vidtex
interface/mmal/openmaxil
interface/mmal/client(/brcmjpeg)
as they aren't directly supported and need further fixup for 64bit.
This commit is contained in:
Dave Stevenson
2019-10-24 17:42:40 +01:00
committed by popcornmix
parent 76c0680083
commit 7d3c6b9f4c
3 changed files with 14 additions and 14 deletions

View File

@@ -8,13 +8,9 @@ SET(PROJECT_VER_PATCH 0)
SET(PROJECT_VER "${PROJECT_VER_MAJOR}.${PROJECT_VER_MINOR}.${PROJECT_VER_PATCH}")
SET(PROJECT_APIVER "${PROJECT_VER}")
if(ARM64)
set(BUILD_MMAL FALSE)
set(BUILD_MMAL_APPS FALSE)
else()
set(BUILD_MMAL TRUE)
set(BUILD_MMAL_APPS TRUE)
endif()
set(vmcs_root ${PROJECT_SOURCE_DIR})
get_filename_component(VIDEOCORE_ROOT . ABSOLUTE)
@@ -78,9 +74,11 @@ if(BUILD_MMAL)
endif()
# VidTex supports Android and Linux
if(NOT ARM64)
if(BUILD_MMAL_APPS)
add_subdirectory(host_applications/android/apps/vidtex)
endif(BUILD_MMAL_APPS)
endif()
if(NOT ARM64)
add_subdirectory(middleware/openmaxil)

View File

@@ -4,9 +4,9 @@ add_subdirectory(libs/bcm_host)
add_subdirectory(apps/gencmd)
add_subdirectory(apps/tvservice)
add_subdirectory(apps/vcmailbox)
if(NOT ARM64)
add_subdirectory(apps/raspicam)
add_subdirectory(libs/sm)
if(NOT ARM64)
add_subdirectory(apps/smem)
endif()
add_subdirectory(libs/debug_sym)

View File

@@ -11,8 +11,10 @@ add_subdirectory(core)
add_subdirectory(util)
add_subdirectory(vc)
add_subdirectory(components)
if(NOT ARM64)
add_subdirectory(openmaxil)
add_subdirectory(client)
endif()
target_link_libraries(mmal mmal_core mmal_util mmal_vc_client vcos mmal_components)