From 5837475de1f8a4cc0b444362dc4c01a5d05d84e3 Mon Sep 17 00:00:00 2001 From: Dale Stammen Date: Fri, 2 Jun 2017 16:44:23 +0300 Subject: [win10] add uwp to cmake --- CMakeLists.txt | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index c3a91b5486..acee78f7b3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -128,6 +128,11 @@ endif() if(CORE_SYSTEM_NAME STREQUAL android) list(APPEND required_deps Zip) endif() +if(CORE_SYSTEM_NAME STREQUAL windowsstore) + #uses header only version of Fmt + list(REMOVE_ITEM required_deps Fmt) + list(REMOVE_ITEM required_deps LibDvd) +endif() # Optional dependencies. Keep in alphabetical order please set(optional_deps Alsa @@ -270,7 +275,7 @@ set_target_properties(pack-skins PROPERTIES FOLDER "Build Utilities") file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/system/players/VideoPlayer) set(LIBCEC_SONAME "${CEC_SONAME}") -if(NOT CORE_SYSTEM_NAME STREQUAL windows AND NOT CORE_SYSTEM_NAME STREQUAL android) +if(NOT CORE_SYSTEM_NAME STREQUAL windows AND NOT CORE_SYSTEM_NAME STREQUAL android AND NOT CORE_SYSTEM_NAME STREQUAL windowsstore) configure_file(${CMAKE_SOURCE_DIR}/xbmc/DllPaths_generated.h.in ${CORE_BUILD_DIR}/DllPaths_generated.h @ONLY) elseif(CORE_SYSTEM_NAME STREQUAL android) @@ -280,8 +285,12 @@ endif() # main library (used for main binary and tests) add_library(lib${APP_NAME_LC} STATIC $) +if (CORE_SYSTEM_NAME STREQUAL windowsstore) + add_dependencies(lib${APP_NAME_LC} libcpluff ffmpeg) +else() + add_dependencies(lib${APP_NAME_LC} libcpluff ffmpeg dvdnav crossguid ${PLATFORM_GLOBAL_TARGET_DEPS}) +endif() set_target_properties(lib${APP_NAME_LC} PROPERTIES PREFIX "") -add_dependencies(lib${APP_NAME_LC} libcpluff ffmpeg dvdnav crossguid ${PLATFORM_GLOBAL_TARGET_DEPS}) # Other files (IDE) set(OTHER_FILES cmake/README.md) @@ -302,6 +311,9 @@ endif() # main binary if(NOT CORE_SYSTEM_NAME STREQUAL android) + if(CORE_SYSTEM_NAME STREQUAL windowsstore) + winstore_add_target_properties(${APP_NAME_LC}) + endif() add_executable(${APP_NAME_LC} ${CORE_MAIN_SOURCE} "${RESOURCES}" ${OTHER_FILES}) set_target_properties(${APP_NAME_LC} PROPERTIES ENABLE_EXPORTS ON) else() @@ -316,7 +328,11 @@ unset(_MAIN_LIBRARIES) if(WIN32) set_target_properties(${APP_NAME_LC} PROPERTIES WIN32_EXECUTABLE ON) set_property(DIRECTORY PROPERTY VS_STARTUP_PROJECT ${APP_NAME_LC}) - target_sources(${APP_NAME_LC} PRIVATE ${CMAKE_SOURCE_DIR}/xbmc/platform/win32/app.manifest) + if(NOT CORE_SYSTEM_NAME STREQUAL windowsstore) + target_sources(${APP_NAME_LC} PRIVATE ${CMAKE_SOURCE_DIR}/xbmc/platform/win32/app.manifest) + else() + set_target_properties(${APP_NAME_LC} PROPERTIES VS_USER_PROPS ${VCPROJECT_PROPS_FILE}) + endif() elseif(CORE_SYSTEM_NAME STREQUAL android) # Nothing elseif(CORE_SYSTEM_NAME STREQUAL ios) -- cgit v1.2.3