raspi/userland
1
0
Fork 0
mirror of https://github.com/raspberrypi/userland.git synced 2025-12-06 04:49:12 +00:00
Code Issues Projects Releases Wiki Activity

Revert "Add MMAL and MMAL_APPS to 64bit builds"

Browse Source 
This reverts commit 7d3c6b9f4c.
This commit is contained in:
popcornmix
2020-05-28 14:34:53 +01:00
parent f4bccc38f9
commit f97b1af1b3
3 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
CMakeLists.txt
View File

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

4
host_applications/linux/CMakeLists.txt
View File

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

6
interface/mmal/CMakeLists.txt
View File

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