Skip to content

Commit

Permalink
cleanup win32 includes so as to reduce issues with guilib/ utils/ inc…
Browse files Browse the repository at this point in the history 
…lude paths across platforms
  • Loading branch information
Jonathan Marshall committed Mar 29, 2011
1 parent ed1bda2 commit bb4fb0b
Show file tree
Hide file tree
Showing 26 changed files with 44 additions and 44 deletions.
8 changes: 4 additions & 4 deletions project/VS2010Express/XBMC.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@
<InlineFunctionExpansion>Default</InlineFunctionExpansion>
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
<OmitFramePointers>true</OmitFramePointers>
<AdditionalIncludeDirectories>..\..\;..\..\xbmc\;..\..\xbmc\cores;..\..\xbmc\cores\dvdplayer;..\..\xbmc\dialogs;..\..\xbmc\FileSystem;..\..\xbmc\guilib\;..\..\xbmc\utils;..\..\xbmc\win32;..\..\xbmc\windowing;..\..\lib;..\..\lib\ffmpeg;..\..\lib\ffmpeg\include-xbmc-win32;..\..\lib\freetype\include;..\..\lib\jsoncpp\jsoncpp\include;..\..\lib\liblame\include;..\..\lib\libUPnP\Platinum\Source\Devices\MediaRenderer;..\..\lib\libUPnP\Platinum\Source\Devices\MediaConnect;..\..\lib\libUPnP\Platinum\Source\Devices\MediaServer;..\..\lib\libUPnP\Platinum\Source\Platinum;..\..\lib\libUPnP\Platinum\Source\Core;..\..\lib\libUPnP\Neptune\Source\Core;..\..\lib\libUPnP\Neptune\Source\System\Win32;..\..\lib\Python\PC;..\..\lib\win32\boost;..\..\lib\win32\libbluray_win32;..\..\lib\win32\libcdio\include;..\..\lib\win32\libiconv\include;..\..\lib\win32\libmicrohttpd_win32\include;..\..\lib\win32\libsamplerate\src;..\..\lib\win32\libssh_win32\include;..\..\lib\win32\libwavpack;..\..\lib\win32\pcre;..\..\lib\win32\sqlite;..\..\lib\win32\vorbisfile\libvorbis\include;..\..\lib\win32\vorbisfile\ogg\include;..\..\lib\jsoncpp\include</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\..\;..\..\xbmc\;..\..\xbmc\win32\;..\..\xbmc\cores\dvdplayer;..\..\lib;..\..\lib\ffmpeg;..\..\lib\ffmpeg\include-xbmc-win32;..\..\lib\freetype\include;..\..\lib\jsoncpp\jsoncpp\include;..\..\lib\liblame\include;..\..\lib\libUPnP\Platinum\Source\Devices\MediaRenderer;..\..\lib\libUPnP\Platinum\Source\Devices\MediaConnect;..\..\lib\libUPnP\Platinum\Source\Devices\MediaServer;..\..\lib\libUPnP\Platinum\Source\Platinum;..\..\lib\libUPnP\Platinum\Source\Core;..\..\lib\libUPnP\Neptune\Source\Core;..\..\lib\libUPnP\Neptune\Source\System\Win32;..\..\lib\Python\PC;..\..\lib\win32\boost;..\..\lib\win32\libbluray_win32;..\..\lib\win32\libcdio\include;..\..\lib\win32\libiconv\include;..\..\lib\win32\libmicrohttpd_win32\include;..\..\lib\win32\libsamplerate\src;..\..\lib\win32\libssh_win32\include;..\..\lib\win32\libwavpack;..\..\lib\win32\pcre;..\..\lib\win32\sqlite;..\..\lib\win32\vorbisfile\libvorbis\include;..\..\lib\win32\vorbisfile\ogg\include;..\..\lib\jsoncpp\include</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_WINDOWS;_MSVC;WIN32;NDEBUG;_WIN32_WINNT=0x0501;WINVER=0x0500;NOMINMAX;_USE_32BIT_TIME_T;HAS_GL;__STDC_CONSTANT_MACROS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>false</StringPooling>
<MinimalRebuild>false</MinimalRebuild>
Expand Down Expand Up @@ -146,7 +146,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug (DirectX)|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\..\;..\..\xbmc\;..\..\xbmc\cores;..\..\xbmc\cores\dvdplayer;..\..\xbmc\dialogs;..\..\xbmc\FileSystem;..\..\xbmc\guilib\;..\..\xbmc\utils;..\..\xbmc\win32;..\..\xbmc\windowing;..\..\lib;..\..\lib\ffmpeg;..\..\lib\ffmpeg\include-xbmc-win32;..\..\lib\freetype\include;..\..\lib\jsoncpp\jsoncpp\include;..\..\lib\liblame\include;..\..\lib\libUPnP\Platinum\Source\Devices\MediaRenderer;..\..\lib\libUPnP\Platinum\Source\Devices\MediaConnect;..\..\lib\libUPnP\Platinum\Source\Devices\MediaServer;..\..\lib\libUPnP\Platinum\Source\Platinum;..\..\lib\libUPnP\Platinum\Source\Core;..\..\lib\libUPnP\Neptune\Source\Core;..\..\lib\libUPnP\Neptune\Source\System\Win32;..\..\lib\Python\PC;..\..\lib\win32\boost;..\..\lib\win32\libbluray_win32;..\..\lib\win32\libcdio\include;..\..\lib\win32\libiconv\include;..\..\lib\win32\libmicrohttpd_win32\include;..\..\lib\win32\libsamplerate\src;..\..\lib\win32\libssh_win32\include;..\..\lib\win32\libwavpack;..\..\lib\win32\pcre;..\..\lib\win32\sqlite;..\..\lib\win32\vorbisfile\libvorbis\include;..\..\lib\win32\vorbisfile\ogg\include;..\..\lib\jsoncpp\include</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\..\;..\..\xbmc\;..\..\xbmc\win32\;..\..\xbmc\cores\dvdplayer;..\..\lib;..\..\lib\ffmpeg;..\..\lib\ffmpeg\include-xbmc-win32;..\..\lib\freetype\include;..\..\lib\jsoncpp\jsoncpp\include;..\..\lib\liblame\include;..\..\lib\libUPnP\Platinum\Source\Devices\MediaRenderer;..\..\lib\libUPnP\Platinum\Source\Devices\MediaConnect;..\..\lib\libUPnP\Platinum\Source\Devices\MediaServer;..\..\lib\libUPnP\Platinum\Source\Platinum;..\..\lib\libUPnP\Platinum\Source\Core;..\..\lib\libUPnP\Neptune\Source\Core;..\..\lib\libUPnP\Neptune\Source\System\Win32;..\..\lib\Python\PC;..\..\lib\win32\boost;..\..\lib\win32\libbluray_win32;..\..\lib\win32\libcdio\include;..\..\lib\win32\libiconv\include;..\..\lib\win32\libmicrohttpd_win32\include;..\..\lib\win32\libsamplerate\src;..\..\lib\win32\libssh_win32\include;..\..\lib\win32\libwavpack;..\..\lib\win32\pcre;..\..\lib\win32\sqlite;..\..\lib\win32\vorbisfile\libvorbis\include;..\..\lib\win32\vorbisfile\ogg\include;..\..\lib\jsoncpp\include</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_WINDOWS;_MSVC;WIN32;_DEBUG;_WIN32_WINNT=0x0501;WINVER=0x0500;NOMINMAX;_USE_32BIT_TIME_T;HAS_DX;Py_NO_ENABLE_SHARED;D3D_DEBUG_INFO;__STDC_CONSTANT_MACROS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<ExceptionHandling>Async</ExceptionHandling>
Expand Down Expand Up @@ -192,7 +192,7 @@
<InlineFunctionExpansion>Default</InlineFunctionExpansion>
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
<OmitFramePointers>true</OmitFramePointers>
<AdditionalIncludeDirectories>..\..\;..\..\xbmc\;..\..\xbmc\cores;..\..\xbmc\cores\dvdplayer;..\..\xbmc\dialogs;..\..\xbmc\FileSystem;..\..\xbmc\guilib\;..\..\xbmc\utils;..\..\xbmc\win32;..\..\xbmc\windowing;..\..\lib;..\..\lib\ffmpeg;..\..\lib\ffmpeg\include-xbmc-win32;..\..\lib\freetype\include;..\..\lib\jsoncpp\jsoncpp\include;..\..\lib\liblame\include;..\..\lib\libUPnP\Platinum\Source\Devices\MediaRenderer;..\..\lib\libUPnP\Platinum\Source\Devices\MediaConnect;..\..\lib\libUPnP\Platinum\Source\Devices\MediaServer;..\..\lib\libUPnP\Platinum\Source\Platinum;..\..\lib\libUPnP\Platinum\Source\Core;..\..\lib\libUPnP\Neptune\Source\Core;..\..\lib\libUPnP\Neptune\Source\System\Win32;..\..\lib\Python\PC;..\..\lib\win32\boost;..\..\lib\win32\libbluray_win32;..\..\lib\win32\libcdio\include;..\..\lib\win32\libiconv\include;..\..\lib\win32\libmicrohttpd_win32\include;..\..\lib\win32\libsamplerate\src;..\..\lib\win32\libssh_win32\include;..\..\lib\win32\libwavpack;..\..\lib\win32\pcre;..\..\lib\win32\sqlite;..\..\lib\win32\vorbisfile\libvorbis\include;..\..\lib\win32\vorbisfile\ogg\include;..\..\lib\jsoncpp\include</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\..\;..\..\xbmc\;..\..\xbmc\win32\;..\..\xbmc\cores\dvdplayer;..\..\lib;..\..\lib\ffmpeg;..\..\lib\ffmpeg\include-xbmc-win32;..\..\lib\freetype\include;..\..\lib\jsoncpp\jsoncpp\include;..\..\lib\liblame\include;..\..\lib\libUPnP\Platinum\Source\Devices\MediaRenderer;..\..\lib\libUPnP\Platinum\Source\Devices\MediaConnect;..\..\lib\libUPnP\Platinum\Source\Devices\MediaServer;..\..\lib\libUPnP\Platinum\Source\Platinum;..\..\lib\libUPnP\Platinum\Source\Core;..\..\lib\libUPnP\Neptune\Source\Core;..\..\lib\libUPnP\Neptune\Source\System\Win32;..\..\lib\Python\PC;..\..\lib\win32\boost;..\..\lib\win32\libbluray_win32;..\..\lib\win32\libcdio\include;..\..\lib\win32\libiconv\include;..\..\lib\win32\libmicrohttpd_win32\include;..\..\lib\win32\libsamplerate\src;..\..\lib\win32\libssh_win32\include;..\..\lib\win32\libwavpack;..\..\lib\win32\pcre;..\..\lib\win32\sqlite;..\..\lib\win32\vorbisfile\libvorbis\include;..\..\lib\win32\vorbisfile\ogg\include;..\..\lib\jsoncpp\include</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_WINDOWS;_MSVC;WIN32;NDEBUG;_WIN32_WINNT=0x0501;WINVER=0x0500;NOMINMAX;_USE_32BIT_TIME_T;HAS_DX;__STDC_CONSTANT_MACROS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>false</StringPooling>
<MinimalRebuild>true</MinimalRebuild>
Expand Down Expand Up @@ -235,7 +235,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug (OpenGL)|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\..\;..\..\xbmc\;..\..\xbmc\cores;..\..\xbmc\cores\dvdplayer;..\..\xbmc\dialogs;..\..\xbmc\FileSystem;..\..\xbmc\guilib\;..\..\xbmc\utils;..\..\xbmc\win32;..\..\xbmc\windowing;..\..\lib;..\..\lib\ffmpeg;..\..\lib\ffmpeg\include-xbmc-win32;..\..\lib\freetype\include;..\..\lib\jsoncpp\jsoncpp\include;..\..\lib\liblame\include;..\..\lib\libUPnP\Platinum\Source\Devices\MediaRenderer;..\..\lib\libUPnP\Platinum\Source\Devices\MediaConnect;..\..\lib\libUPnP\Platinum\Source\Devices\MediaServer;..\..\lib\libUPnP\Platinum\Source\Platinum;..\..\lib\libUPnP\Platinum\Source\Core;..\..\lib\libUPnP\Neptune\Source\Core;..\..\lib\libUPnP\Neptune\Source\System\Win32;..\..\lib\Python\PC;..\..\lib\win32\boost;..\..\lib\win32\libbluray_win32;..\..\lib\win32\libcdio\include;..\..\lib\win32\libiconv\include;..\..\lib\win32\libmicrohttpd_win32\include;..\..\lib\win32\libsamplerate\src;..\..\lib\win32\libssh_win32\include;..\..\lib\win32\libwavpack;..\..\lib\win32\pcre;..\..\lib\win32\sqlite;..\..\lib\win32\vorbisfile\libvorbis\include;..\..\lib\win32\vorbisfile\ogg\include;..\..\lib\jsoncpp\include</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\..\;..\..\xbmc\;..\..\xbmc\win32\;..\..\xbmc\cores\dvdplayer;..\..\lib;..\..\lib\ffmpeg;..\..\lib\ffmpeg\include-xbmc-win32;..\..\lib\freetype\include;..\..\lib\jsoncpp\jsoncpp\include;..\..\lib\liblame\include;..\..\lib\libUPnP\Platinum\Source\Devices\MediaRenderer;..\..\lib\libUPnP\Platinum\Source\Devices\MediaConnect;..\..\lib\libUPnP\Platinum\Source\Devices\MediaServer;..\..\lib\libUPnP\Platinum\Source\Platinum;..\..\lib\libUPnP\Platinum\Source\Core;..\..\lib\libUPnP\Neptune\Source\Core;..\..\lib\libUPnP\Neptune\Source\System\Win32;..\..\lib\Python\PC;..\..\lib\win32\boost;..\..\lib\win32\libbluray_win32;..\..\lib\win32\libcdio\include;..\..\lib\win32\libiconv\include;..\..\lib\win32\libmicrohttpd_win32\include;..\..\lib\win32\libsamplerate\src;..\..\lib\win32\libssh_win32\include;..\..\lib\win32\libwavpack;..\..\lib\win32\pcre;..\..\lib\win32\sqlite;..\..\lib\win32\vorbisfile\libvorbis\include;..\..\lib\win32\vorbisfile\ogg\include;..\..\lib\jsoncpp\include</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_WINDOWS;_MSVC;WIN32;_DEBUG;_WIN32_WINNT=0x0501;WINVER=0x0500;NOMINMAX;_USE_32BIT_TIME_T;HAS_GL;Py_NO_ENABLE_SHARED;__STDC_CONSTANT_MACROS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<ExceptionHandling>Async</ExceptionHandling>
Expand Down
4 changes: 2 additions & 2 deletions xbmc/cores/AudioRenderers/Win32DirectSound.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@
#include <initguid.h>
#include <Mmreg.h>
#include "threads/SingleLock.h"
#include "SystemInfo.h"
#include "utils/SystemInfo.h"
#include "utils/log.h"
#include "utils/TimeUtils.h"
#include "CharsetConverter.h"
#include "utils/CharsetConverter.h"

#pragma comment(lib, "dxguid.lib")

Expand Down
4 changes: 2 additions & 2 deletions xbmc/cores/AudioRenderers/Win32WASAPI.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,10 @@
#include "guilib/AudioContext.h"
#include "settings/Settings.h"
#include "threads/SingleLock.h"
#include "SystemInfo.h"
#include "utils/SystemInfo.h"
#include "utils/log.h"
#include "utils/TimeUtils.h"
#include "CharsetConverter.h"
#include "utils/CharsetConverter.h"

#pragma comment(lib, "Avrt.lib")

Expand Down
6 changes: 3 additions & 3 deletions xbmc/cores/DllLoader/Win32DllLoader.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@
#include "Win32DllLoader.h"
#include "DllLoader.h"
#include "DllLoaderContainer.h"
#include "StdString.h"
#include "utils/StdString.h"
#include "Util.h"
#include "utils/log.h"
#include "FileSystem/SpecialProtocol.h"
#include "CharsetConverter.h"
#include "filesystem/SpecialProtocol.h"
#include "utils/CharsetConverter.h"

#include "dll_tracker_library.h"
#include "dll_tracker_file.h"
Expand Down
2 changes: 1 addition & 1 deletion xbmc/cores/DllLoader/Win32DllLoader.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
*/

#include "LibraryLoader.h"
#include "StdString.h"
#include "utils/StdString.h"

class Win32DllLoader : public LibraryLoader
{
Expand Down
2 changes: 1 addition & 1 deletion xbmc/cores/VideoRenderers/OverlayRendererDX.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
#include "Application.h"
#include "windowing/WindowingFactory.h"
#include "settings/Settings.h"
#include "MathUtils.h"
#include "utils/MathUtils.h"
#include "RenderManager.h"

#ifdef HAS_DX
Expand Down
4 changes: 2 additions & 2 deletions xbmc/cores/VideoRenderers/WinRenderer.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@
#include "settings/AdvancedSettings.h"
#include "threads/SingleLock.h"
#include "utils/log.h"
#include "FileSystem/File.h"
#include "MathUtils.h"
#include "filesystem/File.h"
#include "utils/MathUtils.h"
#include "cores/dvdplayer/DVDCodecs/Video/DXVA.h"
#include "VideoShaders/WinVideoFilter.h"
#include "DllSwScale.h"
Expand Down
2 changes: 1 addition & 1 deletion xbmc/cores/dvdplayer/DVDCodecs/Video/DXVA.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
#include "../../../VideoRenderers/WinRenderer.h"
#include "settings/Settings.h"
#include "boost/shared_ptr.hpp"
#include "AutoPtrHandle.h"
#include "utils/AutoPtrHandle.h"
#include "settings/AdvancedSettings.h"

#define ALLOW_ADDING_SURFACES 0
Expand Down
2 changes: 1 addition & 1 deletion xbmc/guilib/D3DResource.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
#pragma once

#ifdef HAS_DX
#include "StdString.h"
#include "utils/StdString.h"
#include <map>

class ID3DResource
Expand Down
2 changes: 1 addition & 1 deletion xbmc/input/windows/IRServerSuite.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
#include "IRServerSuite.h"
#include "IrssMessage.h"
#include "input/ButtonTranslator.h"
#include "log.h"
#include "utils/log.h"
#include "settings/AdvancedSettings.h"
#include "utils/TimeUtils.h"
#include <Ws2tcpip.h>
Expand Down
2 changes: 1 addition & 1 deletion xbmc/input/windows/IRServerSuite.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
*/

#include <winsock2.h>
#include "StdString.h"
#include "utils/StdString.h"
#include "IrssMessage.h"
#include "threads/Thread.h"

Expand Down
2 changes: 1 addition & 1 deletion xbmc/input/windows/IrssMessage.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
*
*/

#include "StdString.h"
#include "utils/StdString.h"

/// <summary>
/// Type of message.
Expand Down
4 changes: 2 additions & 2 deletions xbmc/network/windows/NetworkWin32.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@
#include <errno.h>
#include "PlatformDefs.h"
#include "NetworkWin32.h"
#include "log.h"
#include "utils/log.h"
#include "threads/SingleLock.h"
#include "CharsetConverter.h"
#include "utils/CharsetConverter.h"

// undefine if you want to build without the wlan stuff
// might be needed for VS2003
Expand Down
4 changes: 2 additions & 2 deletions xbmc/network/windows/NetworkWin32.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@
*/

#include <vector>
#include "StdString.h"
#include "utils/StdString.h"
#include "network/Network.h"
#include "Iphlpapi.h"
#include "stopwatch.h"
#include "utils/stopwatch.h"
#include "threads/CriticalSection.h"

class CNetworkWin32;
Expand Down
2 changes: 1 addition & 1 deletion xbmc/storage/IoSupport.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
#ifdef _WIN32
#include "my_ntddcdrm.h"
#include "WIN32Util.h"
#include "CharsetConverter.h"
#include "utils/CharsetConverter.h"
#endif
#if defined (_LINUX) && !defined(__APPLE__)
#include <linux/limits.h>
Expand Down
4 changes: 2 additions & 2 deletions xbmc/storage/windows/Win32StorageProvider.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
*/
#include "Win32StorageProvider.h"
#include "WIN32Util.h"
#include "LocalizeStrings.h"
#include "SpecialProtocol.h"
#include "guilib/LocalizeStrings.h"
#include "filesystem/SpecialProtocol.h"

bool CWin32StorageProvider::event = false;

Expand Down
2 changes: 1 addition & 1 deletion xbmc/threads/Thread.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
#include "Thread.h"
#ifndef _LINUX
#include <process.h>
#include "win32exception.h"
#include "utils/win32exception.h"
#ifndef _MT
#pragma message( "Please compile using multithreaded run-time libraries" )
#endif
Expand Down
6 changes: 3 additions & 3 deletions xbmc/win32/WIN32Util.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,16 +28,16 @@
#include "WindowHelper.h"
#include "Application.h"
#include <shlobj.h>
#include "SpecialProtocol.h"
#include "filesystem/SpecialProtocol.h"
#include "my_ntddscsi.h"
#if _MSC_VER > 1400
#include "Setupapi.h"
#endif
#include "storage/MediaManager.h"
#include "windowing/WindowingFactory.h"
#include "guilib/LocalizeStrings.h"
#include "log.h"
#include "StringUtils.h"
#include "utils/log.h"
#include "utils/StringUtils.h"
#include "DllPaths_win32.h"
#include "FileSystem/File.h"

Expand Down
4 changes: 2 additions & 2 deletions xbmc/win32/WINDirectSound.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@
#include "system.h"
#include "WINDirectSound.h"
#include "threads/SingleLock.h"
#include "log.h"
#include "CharsetConverter.h"
#include "utils/log.h"
#include "utils/CharsetConverter.h"


BOOL CALLBACK direct_sound_enumerator_callback( LPGUID lpGuid, LPCTSTR lpcstrDescription, LPCTSTR lpcstrModule, LPVOID lpContext)
Expand Down
2 changes: 1 addition & 1 deletion xbmc/win32/WINDirectSound.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
*/

#include "threads/CriticalSection.h"
#include "StdString.h"
#include "utils/StdString.h"

struct DSDeviceInfo
{
Expand Down
4 changes: 2 additions & 2 deletions xbmc/win32/WINFileSMB.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@

#include <sys/stat.h>
#include <io.h>
#include "log.h"
#include "CharsetConverter.h"
#include "utils/log.h"
#include "utils/CharsetConverter.h"
#include "utils/URIUtils.h"
#include "WINSMBDirectory.h"

Expand Down
4 changes: 2 additions & 2 deletions xbmc/win32/WINFileSMB.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@
#pragma once
#endif // _MSC_VER > 1000

#include "IFile.h"
#include "AutoPtrHandle.h"
#include "filesystem/IFile.h"
#include "utils/AutoPtrHandle.h"

namespace XFILE
{
Expand Down
6 changes: 3 additions & 3 deletions xbmc/win32/WINSMBDirectory.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@
#include "settings/GUISettings.h"
#include "FileItem.h"
#include "WIN32Util.h"
#include "AutoPtrHandle.h"
#include "log.h"
#include "CharsetConverter.h"
#include "utils/AutoPtrHandle.h"
#include "utils/log.h"
#include "utils/CharsetConverter.h"
#include "PasswordManager.h"
#include "Util.h"

Expand Down
2 changes: 1 addition & 1 deletion xbmc/win32/WINSMBDirectory.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
*/


#include "IDirectory.h"
#include "filesystem/IDirectory.h"
#include "URL.h"

namespace XFILE
Expand Down
2 changes: 1 addition & 1 deletion xbmc/win32/Win32DelayedDllLoad.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

#include <DelayImp.h>
#include "DllPaths_win32.h"
#include "SpecialProtocol.h"
#include "filesystem/SpecialProtocol.h"
#include "Application.h"
#include "windowing/WindowingFactory.h"

Expand Down
2 changes: 1 addition & 1 deletion xbmc/win32/pch.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,4 @@
#include "SDL\SDL.h"
// anything below here should be headers that very rarely (hopefully never)
// change yet are included almost everywhere.
#include "StdString.h"
#include "utils/StdString.h"

5 comments on commit bb4fb0b

@Voyager1
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi jmarshall: for some reason I still need to have ....\xbmc\guilib; in my list of additional include directories (Win32 - VC2010) because otherwise it fails to compile because not finding "Resolution.h" in many other files.

@wsoltys
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I did a full recompile and it worked fine (win64 -VC2010) I found only 5 occurrences of the resolution file and they all have the right prefixed directory beside one which is in the guilib folder.

@Voyager1
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the problem was always with xbmc/xbmc/cores/IPlayer.h , line 27: #include "Resolution.h"
Update: I just looked and it still is like this.

@wsoltys
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

not sure which version u use but at current git IPlayer.h just contains 3 includes: system.h, IAudioCallback.h and utils/StdString.h

https://github.com/xbmc/xbmc/blob/master/xbmc/cores/IPlayer.h

@Voyager1
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ok, never mind. This was because one of my patches I'm using :-) My sincerest apologies.

Please sign in to comment.