Skip to content

Commit

Permalink
Merge pull request #136 from phunkyfish/remove-p8platform
Browse files Browse the repository at this point in the history
Remove p8-platform
  • Loading branch information
phunkyfish committed Oct 17, 2020
2 parents db226bc + 0503af9 commit aef0b5b
Show file tree
Hide file tree
Showing 20 changed files with 1,661 additions and 184 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ env:
matrix:
include:
- os: linux
dist: xenial
dist: binoic
sudo: required
compiler: gcc
- os: linux
dist: xenial
dist: bionic
sudo: required
compiler: clang
- os: linux
Expand Down
13 changes: 5 additions & 8 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@ project(pvr.vdr.vnsi)
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR})

find_package(Kodi REQUIRED)
find_package(p8-platform REQUIRED)

set(CMAKE_CXX_STANDARD 17)

if(NOT WIN32 AND (APP_RENDER_SYSTEM STREQUAL "gl" OR NOT APP_RENDER_SYSTEM))
find_package(OpenGl REQUIRED)
Expand All @@ -19,15 +20,9 @@ else()
endif()

include_directories(${INCLUDES}
${p8-platform_INCLUDE_DIRS}
${PROJECT_SOURCE_DIR}/lib
${KODI_INCLUDE_DIR}/..) # Hack way with "/..", need bigger Kodi cmake rework to match right include ways

list(APPEND DEPLIBS ${p8-platform_LIBRARIES})
if(WIN32)
list(APPEND DEPLIBS ws2_32)
add_definitions(-D_CRT_NONSTDC_NO_DEPRECATE)
endif()

list(APPEND VDR_SOURCES src/Addon.cpp
src/Channels.cpp
src/ClientInstance.cpp
Expand All @@ -39,6 +34,7 @@ list(APPEND VDR_SOURCES src/Addon.cpp
src/ResponsePacket.cpp
src/Session.cpp
src/Settings.cpp
src/TCPSocket.cpp
src/Tools.cpp)

list(APPEND VDR_HEADERS src/Addon.h
Expand All @@ -52,6 +48,7 @@ list(APPEND VDR_HEADERS src/Addon.h
src/ResponsePacket.h
src/Session.h
src/Settings.h
src/TCPSocket.h
src/Tools.h
src/vnsicommand.h)

Expand Down
5 changes: 2 additions & 3 deletions debian/control
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
Source: kodi-pvr-vdr-vnsi
Priority: extra
Maintainer: Nobody <nobody@kodi.tv>
Build-Depends: debhelper (>= 9.0.0), cmake, libtinyxml-dev,
libp8-platform-dev, kodi-addon-dev,
libgles2-mesa-dev [arm], libgl1-mesa-dev [i386 amd64], pkg-config
Build-Depends: debhelper (>= 9.0.0), cmake, kodi-addon-dev,
libgles2-mesa-dev [arm], libgl1-mesa-dev [i386 amd64]
Standards-Version: 4.1.2
Section: libs
Homepage: http://kodi.tv
Expand Down
1 change: 0 additions & 1 deletion depends/common/p8-platform/p8-platform.txt

This file was deleted.

1 change: 0 additions & 1 deletion depends/windowsstore/p8-platform/p8-platform.txt

This file was deleted.

Loading

0 comments on commit aef0b5b

Please sign in to comment.