Merge pull request #272 from AlwinEsch/Leia-change

[Leia] update CMakeLists.txt to 3.5, change header include and increase version to 3.7.2

CMakeLists.txt

@@ -1,11 +1,8 @@
+cmake_minimum_required(VERSION 3.5)
 project(pvr.iptvsimple)
 
-cmake_minimum_required(VERSION 2.6)
-
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR})
 
-enable_language(CXX)
-
 find_package(Kodi REQUIRED)
 find_package(kodiplatform REQUIRED)
 find_package(p8-platform REQUIRED)
@@ -14,7 +11,7 @@ find_package(ZLIB REQUIRED)
 
 include_directories(${kodiplatform_INCLUDE_DIRS}
                     ${p8-platform_INCLUDE_DIRS}
-                    ${KODI_INCLUDE_DIR}
+                    ${KODI_INCLUDE_DIR}/.. # Hack way with "/..", need bigger Kodi cmake rework to match right include ways
                     ${RAPIDXML_INCLUDE_DIRS}
                     ${ZLIB_INCLUDE_DIRS})
 

README.md

@@ -1,9 +1,10 @@
-[![Build Status](https://travis-ci.org/kodi-pvr/pvr.iptvsimple.svg?branch=master)](https://travis-ci.org/kodi-pvr/pvr.iptvsimple)
+[![Build Status](https://travis-ci.org/kodi-pvr/pvr.iptvsimple.svg?branch=Leia)](https://travis-ci.org/kodi-pvr/pvr.iptvsimple/branches)
+[![Build Status](https://ci.appveyor.com/api/projects/status/github/kodi-pvr/pvr.iptvsimple?branch=Leia&svg=true)](https://ci.appveyor.com/project/kodi-pvr/pvr-iptvsimple?branch=Leia)
 [![Coverity Scan Build Status](https://scan.coverity.com/projects/5120/badge.svg)](https://scan.coverity.com/projects/5120)
 
 # IPTV Simple PVR
 
-IPTV Live TV and Radio PVR client addon for [Kodi](http://kodi.tv)
+IPTV Live TV and Radio PVR client addon for [Kodi](https://kodi.tv)
 
 ## Build instructions
 
@@ -57,7 +58,7 @@ The following steps can be followed manually instead of using the `build-install
 **To rebuild the addon after changes**
 
 1. `rm tools/depends/target/binary-addons/.installed-macosx*`
-2. `make -j$(getconf _NPROCESSORS_ONLN) -C tools/depends/target/binary-addons ADDONS="pvr.vuplus" ADDON_SRC_PREFIX=$HOME`
+2. `make -j$(getconf _NPROCESSORS_ONLN) -C tools/depends/target/binary-addons ADDONS="pvr.iptvsimple" ADDON_SRC_PREFIX=$HOME`
 
 or
 
@@ -66,5 +67,5 @@ or
 
 **Copy the addon to the Kodi addon directory on Mac**
 
-1. `rm -rf "$HOME/Library/Application Support/Kodi/addons/pvr.vuplus"`
-2. `cp -rf $HOME/xbmc-addon/addons/pvr.vuplus "$HOME/Library/Application Support/Kodi/addons"`
+1. `rm -rf "$HOME/Library/Application Support/Kodi/addons/pvr.iptvsimple"`
+2. `cp -rf $HOME/xbmc-addon/addons/pvr.iptvsimple "$HOME/Library/Application Support/Kodi/addons"`

pvr.iptvsimple/addon.xml.in

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <addon
   id="pvr.iptvsimple"
-  version="3.7.1"
+  version="3.7.2"
   name="PVR IPTV Simple Client"
   provider-name="nightik">
   <requires>@ADDON_DEPENDS@</requires>

pvr.iptvsimple/changelog.txt

@@ -1,3 +1,8 @@
+v3.7.2
+- Update build system version
+- Change header include way
+- Add AppVeyor for Windows related build tests
+
 v3.7.1
 - Fix OSX build script
 

src/PVRIptvData.h

@@ -26,7 +26,7 @@
 #include <map>
 #include <vector>
 #include "p8-platform/os.h"
-#include "libXBMC_pvr.h"
+#include "kodi/libXBMC_pvr.h"
 #include "p8-platform/threads/threads.h"
 
 struct PVRIptvEpgEntry

src/client.cpp

@@ -23,7 +23,7 @@
  */
 
 #include "client.h"
-#include "xbmc_pvr_dll.h"
+#include "kodi/xbmc_pvr_dll.h"
 #include "PVRIptvData.h"
 #include "p8-platform/util/util.h"
 

src/client.h

@@ -23,8 +23,8 @@
  *
  */
 
-#include "libXBMC_addon.h"
-#include "libXBMC_pvr.h"
+#include "kodi/libXBMC_addon.h"
+#include "kodi/libXBMC_pvr.h"
 
 #define M3U_FILE_NAME          "iptv.m3u.cache"
 #define TVG_FILE_NAME          "xmltv.xml.cache"