From 3603621e010516de043e0811431ec37d59bc7104 Mon Sep 17 00:00:00 2001 From: fuzzard Date: Tue, 30 Apr 2019 20:26:09 +1000 Subject: [ios/build] rename core_system_name to darwin_embedded implement darwin_embedded CORE_SYSTEM_NAME and OS. This provides a single parent for ios/tvos common build code, and allows ios/tvos specific code via CORE_PLATFORM_NAME --- CMakeLists.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index 54e9bd7d49..c683b14334 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -300,6 +300,7 @@ set(OTHER_FILES cmake/README.md) # Subdirs core_add_subdirs_from_filelist(${CMAKE_SOURCE_DIR}/cmake/treedata/common/*.txt ${CMAKE_SOURCE_DIR}/cmake/treedata/common/${CORE_PLATFORM_NAME_LC}/*.txt + ${CMAKE_SOURCE_DIR}/cmake/treedata/${CORE_SYSTEM_NAME}/${CORE_PLATFORM_NAME_LC}/*.txt ${CMAKE_SOURCE_DIR}/cmake/treedata/${CORE_SYSTEM_NAME}/*.txt) core_add_optional_subdirs_from_filelist(${CMAKE_SOURCE_DIR}/cmake/treedata/optional/common/*.txt ${CMAKE_SOURCE_DIR}/cmake/treedata/optional/${CORE_SYSTEM_NAME}/*.txt) @@ -339,9 +340,9 @@ if(WIN32) endif() elseif(CORE_SYSTEM_NAME STREQUAL android) # Nothing -elseif(CORE_SYSTEM_NAME STREQUAL ios) +elseif(CORE_SYSTEM_NAME STREQUAL darwin_embedded) set_target_properties(${APP_NAME_LC} PROPERTIES OUTPUT_NAME ${APP_NAME} - MACOSX_BUNDLE_INFO_PLIST ${CMAKE_SOURCE_DIR}/xbmc/platform/darwin/ios/Info.plist.in) + MACOSX_BUNDLE_INFO_PLIST ${CMAKE_SOURCE_DIR}/xbmc/platform/darwin/${CORE_PLATFORM_NAME}/Info.plist.in) else() set_target_properties(${APP_NAME_LC} PROPERTIES SUFFIX ${APP_BINARY_SUFFIX}) endif() -- cgit v1.2.3