Skip to content

Commit

Permalink
Fix windows build
Browse files Browse the repository at this point in the history
  • Loading branch information
Kwiboo committed Nov 17, 2016
1 parent 0ef8be5 commit c0db9ca
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 6 deletions.
2 changes: 1 addition & 1 deletion xbmc/cores/VideoRenderers/HwDecRender/DXVA.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion xbmc/cores/VideoRenderers/HwDecRender/DXVAHD.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
3 changes: 3 additions & 0 deletions xbmc/cores/VideoRenderers/VideoShaders/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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})
4 changes: 2 additions & 2 deletions xbmc/cores/VideoRenderers/VideoShaders/YUV2RGBShader.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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 )
Expand Down
4 changes: 2 additions & 2 deletions xbmc/cores/VideoRenderers/WinRenderer.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 ))
Expand Down

0 comments on commit c0db9ca

Please sign in to comment.