From 843e8b5f54e20277a29bb1f0ee5be93dd30360bd Mon Sep 17 00:00:00 2001 From: Shawn Hoffman Date: Sat, 5 Feb 2011 04:09:37 +0000 Subject: [PATCH] vs2010: fix videosoftware build by not requiring Cg dependency (through OGL...) git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7072 8ced0084-cf51-0410-be5f-012b33b47a6e --- .../Plugins/Plugin_VideoSoftware/Plugin_VideoSoftware.vcxproj | 4 ++-- Source/Plugins/Plugin_VideoSoftware/Src/EfbCopy.cpp | 2 +- Source/Plugins/Plugin_VideoSoftware/Src/HwRasterizer.cpp | 2 +- Source/Plugins/Plugin_VideoSoftware/Src/HwRasterizer.h | 2 +- Source/Plugins/Plugin_VideoSoftware/Src/SWRenderer.cpp | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Source/Plugins/Plugin_VideoSoftware/Plugin_VideoSoftware.vcxproj b/Source/Plugins/Plugin_VideoSoftware/Plugin_VideoSoftware.vcxproj index 85648c828b..b557b63c1b 100644 --- a/Source/Plugins/Plugin_VideoSoftware/Plugin_VideoSoftware.vcxproj +++ b/Source/Plugins/Plugin_VideoSoftware/Plugin_VideoSoftware.vcxproj @@ -92,7 +92,7 @@ Level3 Disabled - ..\..\Core\Common\Src;..\..\Core\Core\Src;..\..\Core\VideoCommon\Src;..\..\..\Externals\GLew\include;..\..\..\Externals\wxWidgets\Include;%(AdditionalIncludeDirectories) + ..\..\Core\Common\Src;..\..\Core\Core\Src;..\..\Core\VideoCommon\Src;..\..\Core\VideoUICommon\Src;..\..\..\Externals\GLew\include;..\..\..\Externals\wxWidgets\Include;%(AdditionalIncludeDirectories) MultiThreadedDebug _SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) stdafx.h @@ -109,7 +109,7 @@ Level3 Disabled - ..\..\Core\Common\Src;..\..\Core\Core\Src;..\..\Core\VideoCommon\Src;..\..\..\Externals\GLew\include;..\..\..\Externals\wxWidgets\Include;%(AdditionalIncludeDirectories) + ..\..\Core\Common\Src;..\..\Core\Core\Src;..\..\Core\VideoCommon\Src;..\..\Core\VideoUICommon\Src;..\..\..\Externals\GLew\include;..\..\..\Externals\wxWidgets\Include;%(AdditionalIncludeDirectories) MultiThreadedDebug _SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) stdafx.h diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/EfbCopy.cpp b/Source/Plugins/Plugin_VideoSoftware/Src/EfbCopy.cpp index 62f00b22b8..985a2af1a3 100644 --- a/Source/Plugins/Plugin_VideoSoftware/Src/EfbCopy.cpp +++ b/Source/Plugins/Plugin_VideoSoftware/Src/EfbCopy.cpp @@ -25,7 +25,7 @@ #include "DebugUtil.h" #include "HwRasterizer.h" #include "SWCommandProcessor.h" -#include "../../Plugin_VideoOGL/Src/GLUtil.h" +#include "SWGLUtil.h" #include "HW/Memmap.h" #include "Core.h" diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/HwRasterizer.cpp b/Source/Plugins/Plugin_VideoSoftware/Src/HwRasterizer.cpp index 0974141444..f4053ac547 100644 --- a/Source/Plugins/Plugin_VideoSoftware/Src/HwRasterizer.cpp +++ b/Source/Plugins/Plugin_VideoSoftware/Src/HwRasterizer.cpp @@ -22,7 +22,7 @@ #include "BPMemLoader.h" #include "HwRasterizer.h" -#include "../../Plugin_VideoOGL/Src/GLUtil.h" +#include "SWGLUtil.h" #include "NativeVertexFormat.h" #include "DebugUtil.h" diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/HwRasterizer.h b/Source/Plugins/Plugin_VideoSoftware/Src/HwRasterizer.h index 568c313215..21b002e737 100644 --- a/Source/Plugins/Plugin_VideoSoftware/Src/HwRasterizer.h +++ b/Source/Plugins/Plugin_VideoSoftware/Src/HwRasterizer.h @@ -21,7 +21,7 @@ #include #include "BPMemLoader.h" -#include "../../Plugin_VideoOGL/Src/GLUtil.h" +#include "SWGLUtil.h" struct OutputVertexData; diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/SWRenderer.cpp b/Source/Plugins/Plugin_VideoSoftware/Src/SWRenderer.cpp index 276628bf4c..80ca257803 100644 --- a/Source/Plugins/Plugin_VideoSoftware/Src/SWRenderer.cpp +++ b/Source/Plugins/Plugin_VideoSoftware/Src/SWRenderer.cpp @@ -18,7 +18,7 @@ #include "Common.h" #include "Core.h" -#include "../../Plugin_VideoOGL/Src/GLUtil.h" +#include "SWGLUtil.h" #include "SWRenderer.h" #include "SWStatistics.h" #include "../../Plugin_VideoOGL/Src/RasterFont.h"