Skip to content

Commit

Permalink
Revert "Add MMAL and MMAL_APPS to 64bit builds"
Browse files Browse the repository at this point in the history
This reverts commit 7d3c6b9.
  • Loading branch information
popcornmix committed May 28, 2020
1 parent f4bccc3 commit f97b1af
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 14 deletions.
18 changes: 10 additions & 8 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,13 @@ SET(PROJECT_VER_PATCH 0)
SET(PROJECT_VER "${PROJECT_VER_MAJOR}.${PROJECT_VER_MINOR}.${PROJECT_VER_PATCH}")
SET(PROJECT_APIVER "${PROJECT_VER}")

set(BUILD_MMAL TRUE)
set(BUILD_MMAL_APPS TRUE)

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)

Expand Down Expand Up @@ -74,11 +78,9 @@ 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(BUILD_MMAL_APPS)
add_subdirectory(host_applications/android/apps/vidtex)
endif(BUILD_MMAL_APPS)

if(NOT ARM64)
add_subdirectory(middleware/openmaxil)
Expand Down
4 changes: 2 additions & 2 deletions host_applications/linux/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ add_subdirectory(libs/bcm_host)
add_subdirectory(apps/gencmd)
add_subdirectory(apps/tvservice)
add_subdirectory(apps/vcmailbox)
add_subdirectory(apps/raspicam)
add_subdirectory(libs/sm)
if(NOT ARM64)
add_subdirectory(apps/raspicam)
add_subdirectory(libs/sm)
add_subdirectory(apps/smem)
endif()
add_subdirectory(libs/debug_sym)
Expand Down
6 changes: 2 additions & 4 deletions interface/mmal/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,8 @@ add_subdirectory(core)
add_subdirectory(util)
add_subdirectory(vc)
add_subdirectory(components)
if(NOT ARM64)
add_subdirectory(openmaxil)
add_subdirectory(client)
endif()
add_subdirectory(openmaxil)
add_subdirectory(client)

target_link_libraries(mmal mmal_core mmal_util mmal_vc_client vcos mmal_components)

Expand Down

0 comments on commit f97b1af

Please sign in to comment.