From 106136afd696f6f1a96c7ba76f55869e2ad63023 Mon Sep 17 00:00:00 2001 From: Geoffrey McRae Date: Fri, 15 Dec 2017 09:51:23 +1100 Subject: [PATCH] [host] corrections to build with VC++ --- host/Capture/DXGI.cpp | 2 +- host/Capture/DXGI.h | 20 ++++++++++---------- host/Capture/NvFBC.cpp | 4 ++++ host/Capture/NvFBC.h | 2 +- host/looking-glass-host.vcxproj | 8 ++++---- 5 files changed, 20 insertions(+), 16 deletions(-) diff --git a/host/Capture/DXGI.cpp b/host/Capture/DXGI.cpp index 572c3315..0eaaf099 100644 --- a/host/Capture/DXGI.cpp +++ b/host/Capture/DXGI.cpp @@ -266,7 +266,7 @@ GrabStatus DXGI::GrabFrame(FrameInfo & frame) m_lastMouseVis = frameInfo.PointerPosition.Visible; } - frame.cursor.visible = m_lastMouseVis; + frame.cursor.visible = m_lastMouseVis == TRUE; } // if the pointer shape has changed diff --git a/host/Capture/DXGI.h b/host/Capture/DXGI.h index 8a82a5d7..6f582029 100644 --- a/host/Capture/DXGI.h +++ b/host/Capture/DXGI.h @@ -28,16 +28,16 @@ Place, Suite 330, Boston, MA 02111-1307 USA #include #include -_COM_SMARTPTR_TYPEDEF(IDXGIFactory1, IID_IDXGIFactory1); -_COM_SMARTPTR_TYPEDEF(ID3D11Device, IID_ID3D11Device); -_COM_SMARTPTR_TYPEDEF(ID3D11DeviceContext, IID_ID3D11DeviceContext); -_COM_SMARTPTR_TYPEDEF(IDXGIOutput1, IID_IDXGIOutput1); -_COM_SMARTPTR_TYPEDEF(IDXGIOutput, IID_IDXGIOutput); -_COM_SMARTPTR_TYPEDEF(IDXGIAdapter1, IID_IDXGIAdapter1); -_COM_SMARTPTR_TYPEDEF(IDXGIOutputDuplication, IID_IDXGIOutputDuplication); -_COM_SMARTPTR_TYPEDEF(ID3D11Texture2D, IID_ID3D11Texture2D); -_COM_SMARTPTR_TYPEDEF(IDXGIResource, IID_IDXGIResource); -_COM_SMARTPTR_TYPEDEF(IDXGISurface1, IID_IDXGISurface1); +_COM_SMARTPTR_TYPEDEF(IDXGIFactory1 , __uuidof(IDXGIFactory1 )); +_COM_SMARTPTR_TYPEDEF(ID3D11Device , __uuidof(ID3D11Device )); +_COM_SMARTPTR_TYPEDEF(ID3D11DeviceContext , __uuidof(ID3D11DeviceContext )); +_COM_SMARTPTR_TYPEDEF(IDXGIOutput1 , __uuidof(IDXGIOutput1 )); +_COM_SMARTPTR_TYPEDEF(IDXGIOutput , __uuidof(IDXGIOutput )); +_COM_SMARTPTR_TYPEDEF(IDXGIAdapter1 , __uuidof(IDXGIAdapter1 )); +_COM_SMARTPTR_TYPEDEF(IDXGIOutputDuplication, __uuidof(IDXGIOutputDuplication)); +_COM_SMARTPTR_TYPEDEF(ID3D11Texture2D , __uuidof(ID3D11Texture2D )); +_COM_SMARTPTR_TYPEDEF(IDXGIResource , __uuidof(IDXGIResource )); +_COM_SMARTPTR_TYPEDEF(IDXGISurface1 , __uuidof(IDXGISurface1 )); namespace Capture { diff --git a/host/Capture/NvFBC.cpp b/host/Capture/NvFBC.cpp index be4dcc85..2e2e2da4 100644 --- a/host/Capture/NvFBC.cpp +++ b/host/Capture/NvFBC.cpp @@ -17,6 +17,8 @@ this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#if CONFIG_CAPTURE_NVFBC + #include "NvFBC.h" using namespace Capture; @@ -311,3 +313,5 @@ enum GrabStatus NvFBC::GrabFrame(struct FrameInfo & frame) DEBUG_ERROR("Failed to grab frame"); return GRAB_STATUS_ERROR; } + +#endif// CONFIG_CAPTURE_NVFBC diff --git a/host/Capture/NvFBC.h b/host/Capture/NvFBC.h index 07050034..8304715f 100644 --- a/host/Capture/NvFBC.h +++ b/host/Capture/NvFBC.h @@ -71,4 +71,4 @@ namespace Capture }; }; -#endif +#endif //CONFIG_CAPTURE_NVFBC diff --git a/host/looking-glass-host.vcxproj b/host/looking-glass-host.vcxproj index 58ae5cc4..87386fb6 100644 --- a/host/looking-glass-host.vcxproj +++ b/host/looking-glass-host.vcxproj @@ -97,7 +97,7 @@ Windows true - kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;setupapi.lib;d3d11.lib;dxgi.lib;%(AdditionalDependencies) + kernel32.lib;shlwapi.lib;dxgi.lib;d3d11.lib;setupapi.lib;uuid.lib;%(AdditionalDependencies) %(AdditionalLibraryDirectories) @@ -117,7 +117,7 @@ Windows true - kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;setupapi.lib;d3d11.lib;dxgi.lib;%(AdditionalDependencies) + kernel32.lib;shlwapi.lib;dxgi.lib;d3d11.lib;setupapi.lib;uuid.lib;%(AdditionalDependencies) %(AdditionalLibraryDirectories) @@ -141,7 +141,7 @@ true true true - kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;setupapi.lib;d3d11.lib;dxgi.lib;%(AdditionalDependencies) + kernel32.lib;shlwapi.lib;dxgi.lib;d3d11.lib;setupapi.lib;uuid.lib;%(AdditionalDependencies) %(AdditionalLibraryDirectories) @@ -165,7 +165,7 @@ true true true - kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;setupapi.lib;d3d11.lib;dxgi.lib;%(AdditionalDependencies) + kernel32.lib;shlwapi.lib;dxgi.lib;d3d11.lib;setupapi.lib;uuid.lib;%(AdditionalDependencies) %(AdditionalLibraryDirectories)