From 9e3ddef95d7f36bedd19e2f6beaf3ea9cb6ca2b0 Mon Sep 17 00:00:00 2001
From: Jonas Karlman <jonas@kwiboo.se>
Date: Tue, 5 Jul 2016 07:34:05 +0200
Subject: [PATCH] Fix windows build

---
 xbmc/cores/VideoRenderers/HwDecRender/DXVA.cpp         | 2 +-
 xbmc/cores/VideoRenderers/HwDecRender/DXVAHD.cpp       | 2 +-
 xbmc/cores/VideoRenderers/VideoShaders/CMakeLists.txt  | 3 +++
 xbmc/cores/VideoRenderers/VideoShaders/YUV2RGBShader.h | 4 ++--
 xbmc/cores/VideoRenderers/WinRenderer.h                | 4 ++--
 5 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/xbmc/cores/VideoRenderers/HwDecRender/DXVA.cpp b/xbmc/cores/VideoRenderers/HwDecRender/DXVA.cpp
index 7a8590d2e..cd8eb48e7 100644
--- a/xbmc/cores/VideoRenderers/HwDecRender/DXVA.cpp
+++ b/xbmc/cores/VideoRenderers/HwDecRender/DXVA.cpp
@@ -33,7 +33,7 @@
 #include "utils/StringUtils.h"
 #include "settings/AdvancedSettings.h"
 #include "cores/VideoRenderers/RenderManager.h"
-#include "RenderFlags.h"
+#include "../RenderFlags.h"
 #include "win32/WIN32Util.h"
 #include "utils/Log.h"
 
diff --git a/xbmc/cores/VideoRenderers/HwDecRender/DXVAHD.cpp b/xbmc/cores/VideoRenderers/HwDecRender/DXVAHD.cpp
index 4d0ddfae0..201424c01 100644
--- a/xbmc/cores/VideoRenderers/HwDecRender/DXVAHD.cpp
+++ b/xbmc/cores/VideoRenderers/HwDecRender/DXVAHD.cpp
@@ -37,7 +37,7 @@
 #include "utils/StringUtils.h"
 #include "settings/AdvancedSettings.h"
 #include "cores/VideoRenderers/RenderManager.h"
-#include "RenderFlags.h"
+#include "../RenderFlags.h"
 #include "win32/WIN32Util.h"
 #include "utils/Log.h"
 
diff --git a/xbmc/cores/VideoRenderers/VideoShaders/CMakeLists.txt b/xbmc/cores/VideoRenderers/VideoShaders/CMakeLists.txt
index fa5b14086..5dd17d7a3 100644
--- a/xbmc/cores/VideoRenderers/VideoShaders/CMakeLists.txt
+++ b/xbmc/cores/VideoRenderers/VideoShaders/CMakeLists.txt
@@ -2,4 +2,7 @@ find_all_sources(. shaders_SRCS)
 if(NOT TARGET_WIN32)
 	list(REMOVE_ITEM shaders_SRCS ./WinVideoFilter.cpp)
 endif()
+if(TARGET_WIN32)
+	list(REMOVE_ITEM shaders_SRCS ./GLSLOutput.cpp)
+endif()
 add_sources(${shaders_SRCS})
diff --git a/xbmc/cores/VideoRenderers/VideoShaders/YUV2RGBShader.h b/xbmc/cores/VideoRenderers/VideoShaders/YUV2RGBShader.h
index e390ce1ba..2b65f22c8 100644
--- a/xbmc/cores/VideoRenderers/VideoShaders/YUV2RGBShader.h
+++ b/xbmc/cores/VideoRenderers/VideoShaders/YUV2RGBShader.h
@@ -22,8 +22,6 @@
 #include "guilib/TransformMatrix.h"
 #include "cores/VideoRenderers/RenderFormats.h"
 
-#include "GLSLOutput.h"
-
 void CalculateYUVMatrix(TransformMatrix &matrix
                         , unsigned int  flags
                         , ERenderFormat format
@@ -33,6 +31,8 @@ void CalculateYUVMatrix(TransformMatrix &matrix
 
 #if defined(HAS_GL) || HAS_GLES == 2
 
+#include "GLSLOutput.h"
+
 #ifndef __GNUC__
 #pragma warning( push )
 #pragma warning( disable : 4250 )
diff --git a/xbmc/cores/VideoRenderers/WinRenderer.h b/xbmc/cores/VideoRenderers/WinRenderer.h
index a80395c1d..22f49325f 100644
--- a/xbmc/cores/VideoRenderers/WinRenderer.h
+++ b/xbmc/cores/VideoRenderers/WinRenderer.h
@@ -27,8 +27,8 @@
 #include "guilib/D3DResource.h"
 #include "RenderCapture.h"
 #include "settings/VideoSettings.h"
-#include "DXVA.h"
-#include "DXVAHD.h"
+#include "HwDecRender/DXVA.h"
+#include "HwDecRender/DXVAHD.h"
 
 #define ALIGN(value, alignment) (((value)+((alignment)-1))&~((alignment)-1))
 #define CLAMP(a, min, max) ((a) > (max) ? (max) : ( (a) < (min) ? (min) : a ))