diff options
| -rw-r--r-- | project/VS2010Express/XBMC.vcxproj | 2 | ||||
| -rw-r--r-- | xbmc/cores/AudioRenderers/Win32DirectSound.cpp | 2 | ||||
| -rw-r--r-- | xbmc/rendering/dx/RenderSystemDX.h | 4 | ||||
| -rw-r--r-- | xbmc/system.h | 4 | ||||
| -rw-r--r-- | xbmc/win32/pch.h | 4 | ||||
| -rw-r--r-- | xbmc/windowing/windows/WinSystemWin32DX.h | 3 |
6 files changed, 17 insertions, 2 deletions
diff --git a/project/VS2010Express/XBMC.vcxproj b/project/VS2010Express/XBMC.vcxproj index 24f3ea6aee..3ffda726c4 100644 --- a/project/VS2010Express/XBMC.vcxproj +++ b/project/VS2010Express/XBMC.vcxproj @@ -256,7 +256,7 @@ </ClCompile> <Link> <AdditionalOptions>/MACHINE:I386 /IGNORE:4089 /ignore:4254 %(AdditionalOptions)</AdditionalOptions> - <AdditionalDependencies>SDL.lib;D3D9.lib;D3DX9.lib;DInput8.lib;DSound.lib;winmm.lib;ws2_32.lib;Mpr.lib;Iphlpapi.lib;PowrProf.lib;setupapi.lib;dwmapi.lib;yajl.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>SDL.lib;D3D9.lib;DInput8.lib;DSound.lib;winmm.lib;ws2_32.lib;Mpr.lib;Iphlpapi.lib;PowrProf.lib;setupapi.lib;dwmapi.lib;yajl.lib;%(AdditionalDependencies)</AdditionalDependencies> <OutputFile>$(OutDir)XBMC.exe</OutputFile> <AdditionalLibraryDirectories>..\..\lib\libSDL-WIN32\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <IgnoreSpecificDefaultLibraries>libc;msvcrt;libcmt;msvcrtd;msvcprtd;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries> diff --git a/xbmc/cores/AudioRenderers/Win32DirectSound.cpp b/xbmc/cores/AudioRenderers/Win32DirectSound.cpp index e6d4a12859..4a6640b1e4 100644 --- a/xbmc/cores/AudioRenderers/Win32DirectSound.cpp +++ b/xbmc/cores/AudioRenderers/Win32DirectSound.cpp @@ -31,7 +31,9 @@ #include "utils/TimeUtils.h" #include "utils/CharsetConverter.h" +#ifdef HAS_DX #pragma comment(lib, "dxguid.lib") +#endif DEFINE_GUID( _KSDATAFORMAT_SUBTYPE_IEEE_FLOAT, WAVE_FORMAT_IEEE_FLOAT, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71 ); DEFINE_GUID( _KSDATAFORMAT_SUBTYPE_PCM, WAVE_FORMAT_PCM, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71 ); diff --git a/xbmc/rendering/dx/RenderSystemDX.h b/xbmc/rendering/dx/RenderSystemDX.h index dc8e44dc24..e98c343683 100644 --- a/xbmc/rendering/dx/RenderSystemDX.h +++ b/xbmc/rendering/dx/RenderSystemDX.h @@ -22,6 +22,8 @@ #ifndef RENDER_SYSTEM_DX_H #define RENDER_SYSTEM_DX_H +#ifdef HAS_DX + #pragma once #include <vector> @@ -151,4 +153,6 @@ protected: bool m_inScene; ///< True if we're in a BeginScene()/EndScene() block }; +#endif + #endif // RENDER_SYSTEM_DX diff --git a/xbmc/system.h b/xbmc/system.h index 889eed9270..d9c571e0ba 100644 --- a/xbmc/system.h +++ b/xbmc/system.h @@ -184,8 +184,12 @@ #define LPDIRECTSOUND8 LPDIRECTSOUND #undef GetFreeSpace #include "PlatformInclude.h" +#ifdef HAS_DX #include "D3D9.h" // On Win32, we're always using DirectX for something, whether it be the actual rendering #include "D3DX9.h" // or the reference video clock. +#else +#include <d3d9types.h> +#endif #ifdef HAS_SDL #include "SDL\SDL.h" #endif diff --git a/xbmc/win32/pch.h b/xbmc/win32/pch.h index abc32d3d2f..1278c7fb2d 100644 --- a/xbmc/win32/pch.h +++ b/xbmc/win32/pch.h @@ -15,8 +15,12 @@ #define DIRECTINPUT_VERSION 0x0800 #include "DInput.h" #include "DSound.h" +#ifdef HAS_DX #include "D3D9.h" #include "D3DX9.h" +#else +#include <d3d9types.h> +#endif #include "boost/shared_ptr.hpp" #include "boost/thread/condition_variable.hpp" #include "boost/thread/recursive_mutex.hpp" diff --git a/xbmc/windowing/windows/WinSystemWin32DX.h b/xbmc/windowing/windows/WinSystemWin32DX.h index 61375fe69a..ac75708a22 100644 --- a/xbmc/windowing/windows/WinSystemWin32DX.h +++ b/xbmc/windowing/windows/WinSystemWin32DX.h @@ -22,6 +22,8 @@ #ifndef WIN_SYSTEM_WIN32_DX_H #define WIN_SYSTEM_WIN32_DX_H +#ifdef HAS_DX + #pragma once #include <d3d9.h> @@ -31,7 +33,6 @@ #include "rendering/dx/RenderSystemDX.h" #include "utils/GlobalsHandling.h" -#ifdef HAS_DX class CWinSystemWin32DX : public CWinSystemWin32, public CRenderSystemDX { |