diff options
| author | wsoltys <wiso@xbmc.org> | 2011-09-12 21:56:45 +0200 |
|---|---|---|
| committer | theuni <theuni-nospam-@xbmc.org> | 2011-09-18 18:12:34 -0400 |
| commit | 0edcc842e4a510dcf2f2b587ad0a81783a4e0163 (patch) | |
| tree | ac553b275cec1e9aad521913eabfa2a2436ca397 | |
| parent | fe894f51b41a786c53b2b0283a35e87142c6e95b (diff) | |
[WIN32] added: hook up libjpeg-turbo
| -rw-r--r-- | project/VS2010Express/XBMC.vcxproj | 4 | ||||
| -rw-r--r-- | project/VS2010Express/XBMC.vcxproj.filters | 6 | ||||
| -rw-r--r-- | xbmc/guilib/JpegIO.h | 5 |
3 files changed, 14 insertions, 1 deletions
diff --git a/project/VS2010Express/XBMC.vcxproj b/project/VS2010Express/XBMC.vcxproj index e74f8b1b85..160ec42d20 100644 --- a/project/VS2010Express/XBMC.vcxproj +++ b/project/VS2010Express/XBMC.vcxproj @@ -103,7 +103,7 @@ <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> <OmitFramePointers>true</OmitFramePointers> <AdditionalIncludeDirectories>..\..\;..\..\xbmc\;..\..\xbmc\win32\;..\..\xbmc\cores\dvdplayer;..\..\lib;..\..\lib\ffmpeg;..\..\lib\ffmpeg\include-xbmc-win32;..\..\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\win32\pcre;..\..\lib\win32</AdditionalIncludeDirectories> - <PreprocessorDefinitions>TARGET_WINDOWS;_WINDOWS;_MSVC;WIN32;NDEBUG;_WIN32_WINNT=0x0501;NTDDI_VERSION=0x05010300;NOMINMAX;_USE_32BIT_TIME_T;HAS_GL;__STDC_CONSTANT_MACROS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>TARGET_WINDOWS;_WINDOWS;_MSVC;WIN32;NDEBUG;_WIN32_WINNT=0x0501;NTDDI_VERSION=0x05010300;NOMINMAX;_USE_32BIT_TIME_T;HAS_GL;__STDC_CONSTANT_MACROS;XMD_H;%(PreprocessorDefinitions)</PreprocessorDefinitions> <StringPooling>false</StringPooling> <MinimalRebuild>false</MinimalRebuild> <ExceptionHandling>Async</ExceptionHandling> @@ -426,6 +426,7 @@ <ClCompile Include="..\..\xbmc\guilib\GUIWindowManager.cpp" /> <ClCompile Include="..\..\xbmc\guilib\GUIWrappingListContainer.cpp" /> <ClCompile Include="..\..\xbmc\guilib\IWindowManagerCallback.cpp" /> + <ClCompile Include="..\..\xbmc\guilib\JpegIO.cpp" /> <ClCompile Include="..\..\xbmc\guilib\Key.cpp" /> <ClCompile Include="..\..\xbmc\guilib\LocalizeStrings.cpp" /> <ClCompile Include="..\..\xbmc\guilib\MatrixGLES.cpp" /> @@ -1338,6 +1339,7 @@ <ClInclude Include="..\..\xbmc\guilib\IAudioDeviceChangedCallback.h" /> <ClInclude Include="..\..\xbmc\guilib\IMsgTargetCallback.h" /> <ClInclude Include="..\..\xbmc\guilib\IWindowManagerCallback.h" /> + <ClInclude Include="..\..\xbmc\guilib\JpegIO.h" /> <ClInclude Include="..\..\xbmc\guilib\Key.h" /> <ClInclude Include="..\..\xbmc\guilib\LocalizeStrings.h" /> <ClInclude Include="..\..\xbmc\guilib\MatrixGLES.h" /> diff --git a/project/VS2010Express/XBMC.vcxproj.filters b/project/VS2010Express/XBMC.vcxproj.filters index bd86b514ea..a4a79ad05c 100644 --- a/project/VS2010Express/XBMC.vcxproj.filters +++ b/project/VS2010Express/XBMC.vcxproj.filters @@ -2487,6 +2487,9 @@ <ClCompile Include="..\..\xbmc\interfaces\json-rpc\ApplicationOperations.cpp"> <Filter>interfaces\json-rpc</Filter> </ClCompile> + <ClCompile Include="..\..\xbmc\guilib\JpegIO.cpp"> + <Filter>guilib</Filter> + </ClCompile> <ClCompile Include="..\..\xbmc\filesystem\FileNFS.cpp"> <Filter>filesystem</Filter> </ClCompile> @@ -5000,6 +5003,9 @@ <ClInclude Include="..\..\xbmc\interfaces\json-rpc\ApplicationOperations.h"> <Filter>interfaces\json-rpc</Filter> </ClInclude> + <ClInclude Include="..\..\xbmc\guilib\JpegIO.h"> + <Filter>guilib</Filter> + </ClInclude> <ClInclude Include="..\..\xbmc\filesystem\FileNFS.h"> <Filter>filesystem</Filter> </ClInclude> diff --git a/xbmc/guilib/JpegIO.h b/xbmc/guilib/JpegIO.h index ad52da37db..faca0a0f66 100644 --- a/xbmc/guilib/JpegIO.h +++ b/xbmc/guilib/JpegIO.h @@ -22,6 +22,11 @@ #ifndef GUILIB_JPEGIO_H #define GUILIB_JPEGIO_H +#ifdef TARGET_WINDOWS +#define XMD_H +#pragma comment(lib, "jpeg-static.lib") +#endif + #include <jpeglib.h> #include "utils/StdString.h" |