xbmc · AlwinEsch · Feb 21, 2020
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -6,12 +6,12 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR})
 find_package(Kodi REQUIRED)
 find_package(glm REQUIRED)
 
-if(APP_RENDER_SYSTEM STREQUAL "gl" OR NOT APP_RENDER_SYSTEM)
+if(NOT WIN32 AND (APP_RENDER_SYSTEM STREQUAL "gl" OR NOT APP_RENDER_SYSTEM))
   find_package(OpenGl REQUIRED)
   set(DEPLIBS ${OPENGL_LIBRARIES})
   set(includes ${OPENGL_INCLUDE_DIR})
   add_definitions(${OPENGL_DEFINITIONS})
-elseif(APP_RENDER_SYSTEM STREQUAL "gles")
+else()
   find_package(OpenGLES REQUIRED)
   set(DEPLIBS ${OPENGLES_LIBRARIES})
   set(includes ${OPENGLES_INCLUDE_DIR})

diff --git a/FindOpenGLES.cmake b/FindOpenGLES.cmake
@@ -9,46 +9,61 @@
 # OPENGLES_INCLUDE_DIRS - the OpenGLES include directory
 # OPENGLES_LIBRARIES - the OpenGLES libraries
 # OPENGLES_DEFINITIONS - the OpenGLES definitions
+#
+# Note:
+# On Windows with angle the *_INCLUDE_DIRS and
+# *_DEFINITIONS are undefined, but are set
+# global by the kodi-angle package.
 
-if(CORE_PLATFORM_NAME_LC STREQUAL rbpi)
-    set(_brcmprefix brcm)
-endif()
+if(WIN32)
+  # defined here and not on addon to have it free of OS related 'if'
+  # and this file as standard for addons where need it
+  find_package(kodi-angle REQUIRED)
+  set(OPENGLES_LIBRARIES kodi::angle::libGLESv2 kodi::angle::libEGL)
+  set(OPENGLES_FOUND ${kodi-angle_FOUND})
+  set(OPENGLES_DEFINITIONS -DHAS_GLES=3)
+else()
+  if(CORE_PLATFORM_NAME_LC STREQUAL rbpi)
+      set(_brcmprefix brcm)
+  endif()
 
-if(PKG_CONFIG_FOUND)
-  pkg_check_modules(PC_OPENGLES ${_brcmprefix}glesv2 QUIET)
-endif()
+  if(PKG_CONFIG_FOUND)
+    pkg_check_modules(PC_OPENGLES ${_brcmprefix}glesv2 QUIET)
+  endif()
 
-if(NOT CORE_SYSTEM_NAME STREQUAL darwin_embedded AND NOT CORE_SYSTEM_NAME STREQUAL ios)
-  find_path(OPENGLES_INCLUDE_DIR GLES2/gl2.h
-                                 PATHS ${PC_OPENGLES_INCLUDEDIR})
-  find_library(OPENGLES_gl_LIBRARY NAMES ${_brcmprefix}GLESv2
-                                   PATHS ${PC_OPENGLES_LIBDIR})
-else()
-  find_library(OPENGLES_gl_LIBRARY NAMES OpenGLES
-                                   PATHS ${CMAKE_OSX_SYSROOT}/System/Library
-                                   PATH_SUFFIXES Frameworks
-                                   NO_DEFAULT_PATH)
-  set(OPENGLES_INCLUDE_DIR ${OPENGLES_gl_LIBRARY}/Headers)
-endif()
+  if(NOT CORE_SYSTEM_NAME STREQUAL ios AND
+     NOT CORE_SYSTEM_NAME STREQUAL darwin_embedded)
+    find_path(OPENGLES_INCLUDE_DIR GLES2/gl2.h
+                                   PATHS ${PC_OPENGLES_INCLUDEDIR})
+    find_library(OPENGLES_gl_LIBRARY NAMES ${_brcmprefix}GLESv2
+                                     PATHS ${PC_OPENGLES_LIBDIR})
+  else()
+    find_library(OPENGLES_gl_LIBRARY NAMES OpenGLES
+                                     PATHS ${CMAKE_OSX_SYSROOT}/System/Library
+                                     PATH_SUFFIXES Frameworks
+                                     NO_DEFAULT_PATH)
+    set(OPENGLES_INCLUDE_DIR ${OPENGLES_gl_LIBRARY}/Headers)
+  endif()
 
-find_path(OPENGLES3_INCLUDE_DIR GLES3/gl3.h)
+  find_path(OPENGLES3_INCLUDE_DIR GLES3/gl3.h)
 
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(OpenGLES
-                                  REQUIRED_VARS OPENGLES_gl_LIBRARY OPENGLES_INCLUDE_DIR)
+  include(FindPackageHandleStandardArgs)
+  find_package_handle_standard_args(OpenGLES
+                                    REQUIRED_VARS OPENGLES_gl_LIBRARY OPENGLES_INCLUDE_DIR)
 
-find_path(OPENGLES3_INCLUDE_DIR GLES3/gl3.h
-                                PATHS ${PC_OPENGLES_INCLUDEDIR})
+  find_path(OPENGLES3_INCLUDE_DIR GLES3/gl3.h
+                                  PATHS ${PC_OPENGLES_INCLUDEDIR})
 
-if(OPENGLES_FOUND)
-  set(OPENGLES_LIBRARIES ${OPENGLES_gl_LIBRARY})
-  if(OPENGLES3_INCLUDE_DIR)
-    set(OPENGLES_INCLUDE_DIRS ${OPENGLES_INCLUDE_DIR} ${OPENGLES3_INCLUDE_DIR})
-    set(OPENGLES_DEFINITIONS -DHAS_GLES=3)
-    mark_as_advanced(OPENGLES_INCLUDE_DIR OPENGLES3_INCLUDE_DIR OPENGLES_gl_LIBRARY)
-  else()
-    set(OPENGLES_INCLUDE_DIRS ${OPENGLES_INCLUDE_DIR})
-    set(OPENGLES_DEFINITIONS -DHAS_GLES=2)
-    mark_as_advanced(OPENGLES_INCLUDE_DIR OPENGLES_gl_LIBRARY)
+  if(OPENGLES_FOUND)
+    set(OPENGLES_LIBRARIES ${OPENGLES_gl_LIBRARY})
+    if(OPENGLES3_INCLUDE_DIR)
+      set(OPENGLES_INCLUDE_DIRS ${OPENGLES_INCLUDE_DIR} ${OPENGLES3_INCLUDE_DIR})
+      set(OPENGLES_DEFINITIONS -DHAS_GLES=3)
+      mark_as_advanced(OPENGLES_INCLUDE_DIR OPENGLES3_INCLUDE_DIR OPENGLES_gl_LIBRARY)
+    else()
+      set(OPENGLES_INCLUDE_DIRS ${OPENGLES_INCLUDE_DIR})
+      set(OPENGLES_DEFINITIONS -DHAS_GLES=2)
+      mark_as_advanced(OPENGLES_INCLUDE_DIR OPENGLES_gl_LIBRARY)
+    endif()
   endif()
 endif()
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -1 +1 @@
-buildPlugin(version: "Matrix", platforms: ['android-armv7', 'android-aarch64', 'ios-armv7', 'ios-aarch64', 'osx-x86_64', 'ubuntu-ppa'])
+buildPlugin(version: "Matrix")
diff --git a/README.md b/README.md
@@ -3,6 +3,8 @@
 This is a [Kodi](http://kodi.tv) screensaver addon.
 
 [![Build Status](https://travis-ci.org/xbmc/screensaver.cpblobs.svg?branch=Matrix)](https://travis-ci.org/xbmc/screensaver.cpblobs/branches)
+[![Build Status](https://dev.azure.com/teamkodi/binary-addons/_apis/build/status/xbmc.screensaver.cpblobs?branchName=Matrix)](https://dev.azure.com/teamkodi/binary-addons/_build/latest?definitionId=43&branchName=Matrix)
+<!--- [![Build Status](https://ci.appveyor.com/api/projects/status/github/xbmc/screensaver.cpblobs?branch=Matrix&svg=true)](https://ci.appveyor.com/project/xbmc/screensaver-cpblobs?branch=Matrix) -->
 
 ## Build instructions
 

diff --git a/appveyor.yml b/appveyor.yml
@@ -0,0 +1,35 @@
+version: BuildNr.{build}
+
+image: Visual Studio 2017
+
+shallow_clone: true
+
+clone_folder: c:\projects\screensaver.cpblobs
+
+environment:
+  app_id: screensaver.cpblobs
+
+  matrix:
+    - GENERATOR: "Visual Studio 15"
+      CONFIG: Release
+      CMAKE_DEFINES: -DCMAKE_SYSTEM_NAME=Windows -DCMAKE_SYSTEM_VERSION="10.0.17763.0"
+    - GENERATOR: "Visual Studio 15 Win64"
+      CONFIG: Release
+      CMAKE_DEFINES: -DCMAKE_SYSTEM_NAME=Windows -DCMAKE_SYSTEM_VERSION="10.0.17763.0"
+    - GENERATOR: "Visual Studio 15 Win64"
+      CONFIG: Release
+      CMAKE_DEFINES: -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION="10.0.17763.0"
+    - GENERATOR: "Visual Studio 15 ARM"
+      CONFIG: Release
+      CMAKE_DEFINES: -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION="10.0.17763.0"
+
+build_script:
+  - cd ..
+  - git clone --branch master --depth=1 https://github.com/xbmc/xbmc.git
+  - cd %app_id%
+  - mkdir build
+  - cd build
+  - mkdir -p definition\%app_id%
+  - echo %app_id% %APPVEYOR_BUILD_FOLDER% %APPVEYOR_REPO_COMMIT% > definition\%app_id%\%app_id%.txt
+  - cmake -T host=x64 -G "%GENERATOR%" %CMAKE_DEFINES% -DADDONS_TO_BUILD=%app_id% -DCMAKE_BUILD_TYPE=%CONFIG% -DADDONS_DEFINITION_DIR=%APPVEYOR_BUILD_FOLDER%/build/definition -DADDON_SRC_PREFIX=../.. -DCMAKE_INSTALL_PREFIX=../../xbmc/addons -DPACKAGE_ZIP=1 ../../xbmc/cmake/addons
+  - cmake --build . --config %CONFIG% --target %app_id%
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		buildPlugin(version: "Matrix", platforms: ['android-armv7', 'android-aarch64', 'ios-armv7', 'ios-aarch64', 'osx-x86_64', 'ubuntu-ppa'])
		buildPlugin(version: "Matrix")