From b8f7262bf1ae78cb91688c56a816be2f5d8c1e90 Mon Sep 17 00:00:00 2001 From: David Ludwig Date: Sat, 5 Apr 2014 13:08:18 -0400 Subject: [PATCH] Added JPEG support for WinRT + Windows Phone 8 Platform support for Windows 8.0/RT and Windows Phone 8.0 was added. TODO: Add support for Windows 8.1/RT, Windows Phone 8.1, and other 'Universal' platforms. --- .../SDL_image-WinPhone_VS2012.vcxproj | 19 +- VisualC-WinPhone/jpeg-WinPhone_VS2012.vcxproj | 221 ++++++++++++++ .../jpeg-WinPhone_VS2012.vcxproj.filters | 192 ++++++++++++ VisualC-WinRT/SDL_image-WinRT_VS2012.vcxproj | 27 +- VisualC-WinRT/jpeg-WinRT_VS2012.vcxproj | 275 ++++++++++++++++++ .../jpeg-WinRT_VS2012.vcxproj.filters | 192 ++++++++++++ VisualC-WinRT/jpeg.def | 10 + 7 files changed, 916 insertions(+), 20 deletions(-) create mode 100644 VisualC-WinPhone/jpeg-WinPhone_VS2012.vcxproj create mode 100644 VisualC-WinPhone/jpeg-WinPhone_VS2012.vcxproj.filters create mode 100644 VisualC-WinRT/jpeg-WinRT_VS2012.vcxproj create mode 100644 VisualC-WinRT/jpeg-WinRT_VS2012.vcxproj.filters create mode 100644 VisualC-WinRT/jpeg.def diff --git a/VisualC-WinPhone/SDL_image-WinPhone_VS2012.vcxproj b/VisualC-WinPhone/SDL_image-WinPhone_VS2012.vcxproj index 4982e105..85e26298 100644 --- a/VisualC-WinPhone/SDL_image-WinPhone_VS2012.vcxproj +++ b/VisualC-WinPhone/SDL_image-WinPhone_VS2012.vcxproj @@ -78,12 +78,12 @@ - _USRDLL;_CRT_SECURE_NO_WARNINGS;LOAD_BMP;LOAD_PNG;LOAD_PNG_DYNAMIC="libpng.dll";%(PreprocessorDefinitions) + _USRDLL;_CRT_SECURE_NO_WARNINGS;LOAD_BMP;LOAD_PNG;LOAD_PNG_DYNAMIC="libpng.dll";LOAD_JPG;LOAD_JPG_DYNAMIC="jpeg.dll";%(PreprocessorDefinitions) NotUsing pch.h false $(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories) - ..\..\SDL\include;..\external\libpng-1.6.2 + ..\..\SDL\include;..\external\libpng-1.6.2;..\external\jpeg-9 Console @@ -94,12 +94,12 @@ - _USRDLL;_CRT_SECURE_NO_WARNINGS;LOAD_BMP;LOAD_PNG;LOAD_PNG_DYNAMIC="libpng.dll";NDEBUG;%(PreprocessorDefinitions) + _USRDLL;_CRT_SECURE_NO_WARNINGS;LOAD_BMP;LOAD_PNG;LOAD_PNG_DYNAMIC="libpng.dll";LOAD_JPG;LOAD_JPG_DYNAMIC="jpeg.dll";NDEBUG;%(PreprocessorDefinitions) NotUsing pch.h false $(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories) - ..\..\SDL\include;..\external\libpng-1.6.2 + ..\..\SDL\include;..\external\libpng-1.6.2;..\external\jpeg-9 Console @@ -110,12 +110,12 @@ - _USRDLL;_CRT_SECURE_NO_WARNINGS;LOAD_BMP;LOAD_PNG;LOAD_PNG_DYNAMIC="libpng.dll";%(PreprocessorDefinitions) + _USRDLL;_CRT_SECURE_NO_WARNINGS;LOAD_BMP;LOAD_PNG;LOAD_PNG_DYNAMIC="libpng.dll";LOAD_JPG;LOAD_JPG_DYNAMIC="jpeg.dll";%(PreprocessorDefinitions) NotUsing pch.h false $(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories) - ..\..\SDL\include;..\external\libpng-1.6.2 + ..\..\SDL\include;..\external\libpng-1.6.2;..\external\jpeg-9 Console @@ -126,12 +126,12 @@ - _USRDLL;_CRT_SECURE_NO_WARNINGS;LOAD_BMP;LOAD_PNG;LOAD_PNG_DYNAMIC="libpng.dll";NDEBUG;%(PreprocessorDefinitions) + _USRDLL;_CRT_SECURE_NO_WARNINGS;LOAD_BMP;LOAD_PNG;LOAD_PNG_DYNAMIC="libpng.dll";LOAD_JPG;LOAD_JPG_DYNAMIC="jpeg.dll";NDEBUG;%(PreprocessorDefinitions) NotUsing pch.h false $(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories) - ..\..\SDL\include;..\external\libpng-1.6.2 + ..\..\SDL\include;..\external\libpng-1.6.2;..\external\jpeg-9 Console @@ -170,6 +170,9 @@ {33048af1-031a-4ce6-b61e-fad2db832e9e} + + {10cabd6e-bd1a-4705-be35-a34ce1edf6fb} + {af7120b3-ecf6-464d-a4a6-e56b91e81b50} diff --git a/VisualC-WinPhone/jpeg-WinPhone_VS2012.vcxproj b/VisualC-WinPhone/jpeg-WinPhone_VS2012.vcxproj new file mode 100644 index 00000000..7aaebdc1 --- /dev/null +++ b/VisualC-WinPhone/jpeg-WinPhone_VS2012.vcxproj @@ -0,0 +1,221 @@ + + + + + Debug + Win32 + + + Debug + ARM + + + Release + Win32 + + + Release + ARM + + + + {10cabd6e-bd1a-4705-be35-a34ce1edf6fb} + jpeg_WinPhone + en-US + 11.0 + jpeg-WinPhone + + + + DynamicLibrary + true + v110_wp80 + false + + + DynamicLibrary + true + v110_wp80 + false + + + DynamicLibrary + false + true + v110_wp80 + false + + + DynamicLibrary + false + true + v110_wp80 + false + + + + + + + + false + + + Objs\$(Platform)\$(Configuration)\$(MSBuildProjectName)\ + jpeg + + + Objs\$(Platform)\$(Configuration)\$(MSBuildProjectName)\ + jpeg + + + Objs\$(Platform)\$(Configuration)\$(MSBuildProjectName)\ + jpeg + + + Objs\$(Platform)\$(Configuration)\$(MSBuildProjectName)\ + jpeg + + + + _USRDLL;_CRT_SECURE_NO_WARNINGS;NO_GETENV;%(PreprocessorDefinitions) + NotUsing + pch.h + false + $(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories) + + + Console + false + false + true + ..\VisualC-WinRT\jpeg.def + + + + + _USRDLL;_CRT_SECURE_NO_WARNINGS;NO_GETENV;NDEBUG;%(PreprocessorDefinitions) + NotUsing + pch.h + false + $(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories) + + + Console + false + false + true + ..\VisualC-WinRT\jpeg.def + + + + + _USRDLL;_CRT_SECURE_NO_WARNINGS;NO_GETENV;%(PreprocessorDefinitions) + NotUsing + pch.h + false + $(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories) + + + Console + false + false + true + ..\VisualC-WinRT\jpeg.def + + + + + _USRDLL;_CRT_SECURE_NO_WARNINGS;NO_GETENV;NDEBUG;%(PreprocessorDefinitions) + NotUsing + pch.h + false + $(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories) + + + Console + false + false + true + ..\VisualC-WinRT\jpeg.def + + + + + true + + + true + false + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/VisualC-WinPhone/jpeg-WinPhone_VS2012.vcxproj.filters b/VisualC-WinPhone/jpeg-WinPhone_VS2012.vcxproj.filters new file mode 100644 index 00000000..84be7923 --- /dev/null +++ b/VisualC-WinPhone/jpeg-WinPhone_VS2012.vcxproj.filters @@ -0,0 +1,192 @@ + + + + + {1795ab2e-85cb-4386-991e-9e825db65ab1} + + + {2fceec3f-ff60-4ebd-8746-bf9fd3d60be4} + + + + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + \ No newline at end of file diff --git a/VisualC-WinRT/SDL_image-WinRT_VS2012.vcxproj b/VisualC-WinRT/SDL_image-WinRT_VS2012.vcxproj index 95645c7a..8c7a3fa8 100644 --- a/VisualC-WinRT/SDL_image-WinRT_VS2012.vcxproj +++ b/VisualC-WinRT/SDL_image-WinRT_VS2012.vcxproj @@ -51,6 +51,9 @@ {aeaea3a2-d4e6-45b1-8ec6-53d84287fc14} + + {cc6cf4c7-bd07-4738-854c-a6c5bae62ea9} + {b43d3823-d0c0-4017-9153-c4cbc9a4f9d0} @@ -159,8 +162,8 @@ NotUsing false - ..\..\SDL\include;..\external\libpng-1.6.2;%(AdditionalIncludeDirectories) - _WINDLL;_CRT_SECURE_NO_WARNINGS;LOAD_BMP;LOAD_PNG;LOAD_PNG_DYNAMIC="libpng.dll";%(PreprocessorDefinitions) + ..\..\SDL\include;..\external\libpng-1.6.2;..\external\jpeg-9;%(AdditionalIncludeDirectories) + _WINDLL;_CRT_SECURE_NO_WARNINGS;LOAD_BMP;LOAD_PNG;LOAD_PNG_DYNAMIC="libpng.dll";LOAD_JPG;LOAD_JPG_DYNAMIC="jpeg.dll";%(PreprocessorDefinitions) Console @@ -172,8 +175,8 @@ NotUsing false - ..\..\SDL\include;..\external\libpng-1.6.2;%(AdditionalIncludeDirectories) - _WINDLL;_CRT_SECURE_NO_WARNINGS;LOAD_BMP;LOAD_PNG;LOAD_PNG_DYNAMIC="libpng.dll";%(PreprocessorDefinitions) + ..\..\SDL\include;..\external\libpng-1.6.2;..\external\jpeg-9;%(AdditionalIncludeDirectories) + _WINDLL;_CRT_SECURE_NO_WARNINGS;LOAD_BMP;LOAD_PNG;LOAD_PNG_DYNAMIC="libpng.dll";LOAD_JPG;LOAD_JPG_DYNAMIC="jpeg.dll";%(PreprocessorDefinitions) Console @@ -185,8 +188,8 @@ NotUsing false - ..\..\SDL\include;..\external\libpng-1.6.2;%(AdditionalIncludeDirectories) - _WINDLL;_CRT_SECURE_NO_WARNINGS;LOAD_BMP;LOAD_PNG;LOAD_PNG_DYNAMIC="libpng.dll";%(PreprocessorDefinitions) + ..\..\SDL\include;..\external\libpng-1.6.2;..\external\jpeg-9;%(AdditionalIncludeDirectories) + _WINDLL;_CRT_SECURE_NO_WARNINGS;LOAD_BMP;LOAD_PNG;LOAD_PNG_DYNAMIC="libpng.dll";LOAD_JPG;LOAD_JPG_DYNAMIC="jpeg.dll";%(PreprocessorDefinitions) Console @@ -198,8 +201,8 @@ NotUsing false - ..\..\SDL\include;..\external\libpng-1.6.2;%(AdditionalIncludeDirectories) - _WINDLL;_CRT_SECURE_NO_WARNINGS;LOAD_BMP;LOAD_PNG;LOAD_PNG_DYNAMIC="libpng.dll";%(PreprocessorDefinitions) + ..\..\SDL\include;..\external\libpng-1.6.2;..\external\jpeg-9;%(AdditionalIncludeDirectories) + _WINDLL;_CRT_SECURE_NO_WARNINGS;LOAD_BMP;LOAD_PNG;LOAD_PNG_DYNAMIC="libpng.dll";LOAD_JPG;LOAD_JPG_DYNAMIC="jpeg.dll";%(PreprocessorDefinitions) Console @@ -211,8 +214,8 @@ NotUsing false - ..\..\SDL\include;..\external\libpng-1.6.2;%(AdditionalIncludeDirectories) - _WINDLL;_CRT_SECURE_NO_WARNINGS;LOAD_BMP;LOAD_PNG;LOAD_PNG_DYNAMIC="libpng.dll";%(PreprocessorDefinitions) + ..\..\SDL\include;..\external\libpng-1.6.2;..\external\jpeg-9;%(AdditionalIncludeDirectories) + _WINDLL;_CRT_SECURE_NO_WARNINGS;LOAD_BMP;LOAD_PNG;LOAD_PNG_DYNAMIC="libpng.dll";LOAD_JPG;LOAD_JPG_DYNAMIC="jpeg.dll";%(PreprocessorDefinitions) Console @@ -224,8 +227,8 @@ NotUsing false - ..\..\SDL\include;..\external\libpng-1.6.2;%(AdditionalIncludeDirectories) - _WINDLL;_CRT_SECURE_NO_WARNINGS;LOAD_BMP;LOAD_PNG;LOAD_PNG_DYNAMIC="libpng.dll";%(PreprocessorDefinitions) + ..\..\SDL\include;..\external\libpng-1.6.2;..\external\jpeg-9;%(AdditionalIncludeDirectories) + _WINDLL;_CRT_SECURE_NO_WARNINGS;LOAD_BMP;LOAD_PNG;LOAD_PNG_DYNAMIC="libpng.dll";LOAD_JPG;LOAD_JPG_DYNAMIC="jpeg.dll";%(PreprocessorDefinitions) Console diff --git a/VisualC-WinRT/jpeg-WinRT_VS2012.vcxproj b/VisualC-WinRT/jpeg-WinRT_VS2012.vcxproj new file mode 100644 index 00000000..97fbc469 --- /dev/null +++ b/VisualC-WinRT/jpeg-WinRT_VS2012.vcxproj @@ -0,0 +1,275 @@ + + + + + Debug + ARM + + + Debug + Win32 + + + Debug + x64 + + + Release + ARM + + + Release + Win32 + + + Release + x64 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {cc6cf4c7-bd07-4738-854c-a6c5bae62ea9} + Win32Proj + jpeg-WinRT + jpeg_WinRT_VS2012 + en-US + 11.0 + true + + + + DynamicLibrary + true + v110 + + + DynamicLibrary + true + v110 + + + DynamicLibrary + true + v110 + + + DynamicLibrary + false + true + v110 + + + DynamicLibrary + false + true + v110 + + + DynamicLibrary + false + true + v110 + + + + + + + + + + + + + + + + + + + + + + + + false + false + Objs\$(Platform)\$(Configuration)\$(MSBuildProjectName)\ + jpeg + + + false + false + Objs\$(Platform)\$(Configuration)\$(MSBuildProjectName)\ + jpeg + + + false + false + Objs\$(Platform)\$(Configuration)\$(MSBuildProjectName)\ + jpeg + + + false + false + Objs\$(Platform)\$(Configuration)\$(MSBuildProjectName)\ + jpeg + + + false + false + Objs\$(Platform)\$(Configuration)\$(MSBuildProjectName)\ + jpeg + + + false + false + Objs\$(Platform)\$(Configuration)\$(MSBuildProjectName)\ + jpeg + + + + NotUsing + false + _WINDLL;_CRT_SECURE_NO_WARNINGS;NO_GETENV;%(PreprocessorDefinitions) + + + Console + false + false + .\jpeg.def + + + + + NotUsing + false + _WINDLL;_CRT_SECURE_NO_WARNINGS;NO_GETENV;%(PreprocessorDefinitions) + + + Console + false + false + .\jpeg.def + + + + + NotUsing + false + _WINDLL;_CRT_SECURE_NO_WARNINGS;NO_GETENV;%(PreprocessorDefinitions) + + + Console + false + false + .\jpeg.def + + + + + NotUsing + false + _WINDLL;_CRT_SECURE_NO_WARNINGS;NO_GETENV;%(PreprocessorDefinitions) + + + Console + false + false + .\jpeg.def + + + + + NotUsing + false + _WINDLL;_CRT_SECURE_NO_WARNINGS;NO_GETENV;%(PreprocessorDefinitions) + + + Console + false + false + .\jpeg.def + + + + + NotUsing + false + _WINDLL;_CRT_SECURE_NO_WARNINGS;NO_GETENV;%(PreprocessorDefinitions) + + + Console + false + false + .\jpeg.def + + + + + + \ No newline at end of file diff --git a/VisualC-WinRT/jpeg-WinRT_VS2012.vcxproj.filters b/VisualC-WinRT/jpeg-WinRT_VS2012.vcxproj.filters new file mode 100644 index 00000000..e9b4eada --- /dev/null +++ b/VisualC-WinRT/jpeg-WinRT_VS2012.vcxproj.filters @@ -0,0 +1,192 @@ + + + + + {7db274c7-68c9-474d-857b-8808aa7fb6f0} + + + {25fe7347-3329-411f-a586-9ef604f39806} + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + + + + \ No newline at end of file diff --git a/VisualC-WinRT/jpeg.def b/VisualC-WinRT/jpeg.def new file mode 100644 index 00000000..9c06fbf2 --- /dev/null +++ b/VisualC-WinRT/jpeg.def @@ -0,0 +1,10 @@ +EXPORTS + jpeg_calc_output_dimensions + jpeg_CreateDecompress + jpeg_destroy_decompress + jpeg_finish_decompress + jpeg_read_header + jpeg_read_scanlines + jpeg_resync_to_restart + jpeg_start_decompress + jpeg_std_error