From b874d8dadfb2f1194fa4d5b2c1fb7323c0f81ed2 Mon Sep 17 00:00:00 2001 From: Jonas Karlman Date: Wed, 16 Nov 2016 20:36:53 +0100 Subject: [PATCH 1/5] [cmake] fix build error when version tag is empty --- project/cmake/scripts/common/Macros.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/cmake/scripts/common/Macros.cmake b/project/cmake/scripts/common/Macros.cmake index 71c39ef5f903e..2716fe6900a9b 100644 --- a/project/cmake/scripts/common/Macros.cmake +++ b/project/cmake/scripts/common/Macros.cmake @@ -595,9 +595,9 @@ macro(core_find_versions) set(APP_VERSION ${APP_VERSION_MAJOR}.${APP_VERSION_MINOR}) if(APP_VERSION_TAG) set(APP_VERSION ${APP_VERSION}-${APP_VERSION_TAG}) + string(TOLOWER ${APP_VERSION_TAG} APP_VERSION_TAG_LC) endif() string(REPLACE "." "," FILE_VERSION ${APP_ADDON_API}.0) - string(TOLOWER ${APP_VERSION_TAG} APP_VERSION_TAG_LC) file(STRINGS ${CORE_SOURCE_DIR}/xbmc/addons/kodi-addon-dev-kit/include/kodi/libKODI_guilib.h guilib_version REGEX "^.*GUILIB_API_VERSION (.*)$") string(REGEX REPLACE ".*\"(.*)\"" "\\1" guilib_version ${guilib_version}) file(STRINGS ${CORE_SOURCE_DIR}/xbmc/addons/kodi-addon-dev-kit/include/kodi/libKODI_guilib.h guilib_version_min REGEX "^.*GUILIB_MIN_API_VERSION (.*)$") From bb4d9a6fbf40fa77bdf9f0c250420ee1512282ab Mon Sep 17 00:00:00 2001 From: Jonas Karlman Date: Wed, 16 Nov 2016 20:36:53 +0100 Subject: [PATCH 2/5] [cmake] use app name target for application manifest --- project/cmake/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/cmake/CMakeLists.txt b/project/cmake/CMakeLists.txt index a8787b31e84f9..742b4e765bdbf 100644 --- a/project/cmake/CMakeLists.txt +++ b/project/cmake/CMakeLists.txt @@ -336,7 +336,7 @@ 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(kodi PRIVATE ${CORE_SOURCE_DIR}/xbmc/platform/win32/app.manifest) + target_sources(${APP_NAME_LC} PRIVATE ${CORE_SOURCE_DIR}/xbmc/platform/win32/app.manifest) elseif(CORE_SYSTEM_NAME STREQUAL android) # Nothing else() From 19c79cd4585fe9900a6ba2f2d5f6084fafa9d868 Mon Sep 17 00:00:00 2001 From: Jonas Karlman Date: Wed, 16 Nov 2016 20:36:53 +0100 Subject: [PATCH 3/5] [win32] fix build when optical is disabled --- xbmc/storage/windows/Win32StorageProvider.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/xbmc/storage/windows/Win32StorageProvider.cpp b/xbmc/storage/windows/Win32StorageProvider.cpp index a469b2a48b57e..cbdf67bf13572 100644 --- a/xbmc/storage/windows/Win32StorageProvider.cpp +++ b/xbmc/storage/windows/Win32StorageProvider.cpp @@ -37,12 +37,14 @@ void CWin32StorageProvider::Initialize() else CLog::Log(LOGDEBUG, "%s: No optical drive found.", __FUNCTION__); +#ifdef HAS_DVD_DRIVE // Can be removed once the StorageHandler supports optical media VECSOURCES::const_iterator it; for(it=vShare.begin();it!=vShare.end();++it) if(g_mediaManager.GetDriveStatus(it->strPath) == DRIVE_CLOSED_MEDIA_PRESENT) CJobManager::GetInstance().AddJob(new CDetectDisc(it->strPath, false), NULL); // remove end +#endif } void CWin32StorageProvider::GetLocalDrives(VECSOURCES &localDrives) @@ -95,6 +97,7 @@ CDetectDisc::CDetectDisc(const std::string &strPath, const bool bautorun) bool CDetectDisc::DoWork() { +#ifdef HAS_DVD_DRIVE CLog::Log(LOGDEBUG, "%s: Optical media found in drive %s", __FUNCTION__, m_strPath.c_str()); CMediaSource share; share.strPath = m_strPath; @@ -108,5 +111,6 @@ bool CDetectDisc::DoWork() share.m_ignore = true; share.m_iDriveType = CMediaSource::SOURCE_TYPE_DVD; g_mediaManager.AddAutoSource(share, m_bautorun); +#endif return true; } From 2eae90267cfabf99a6d677f3661ce0a998e402a3 Mon Sep 17 00:00:00 2001 From: Jonas Karlman Date: Wed, 16 Nov 2016 20:36:53 +0100 Subject: [PATCH 4/5] [win32] fix linking when airtunes or upnp is disabled --- xbmc/system.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/xbmc/system.h b/xbmc/system.h index 07dfe87e4a01a..9383e86af5586 100644 --- a/xbmc/system.h +++ b/xbmc/system.h @@ -102,8 +102,6 @@ #define HAS_FILESYSTEM_SMB #define HAS_ZEROCONF #define HAS_MDNS -#define HAS_AIRTUNES -#define HAS_UPNP #define DECLARE_UNUSED(a,b) a b; #endif From daafecf1317bc50ee5ed84c27ae5cca21ce13ae8 Mon Sep 17 00:00:00 2001 From: Jonas Karlman Date: Wed, 16 Nov 2016 20:36:53 +0100 Subject: [PATCH 5/5] [win32] remove unused has audio define --- xbmc/system.h | 1 - 1 file changed, 1 deletion(-) diff --git a/xbmc/system.h b/xbmc/system.h index 9383e86af5586..a7452bd59cf14 100644 --- a/xbmc/system.h +++ b/xbmc/system.h @@ -96,7 +96,6 @@ #if defined(TARGET_WINDOWS) #define HAS_WIN32_NETWORK #define HAS_IRSERVERSUITE -#define HAS_AUDIO #define HAS_WEB_SERVER #define HAS_WEB_INTERFACE #define HAS_FILESYSTEM_SMB