Skip to content

Commit

Permalink
Added JPEG support for WinRT + Windows Phone 8
Browse files Browse the repository at this point in the history 
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.
  • Loading branch information
@DavidLudwig
DavidLudwig committed Apr 5, 2014
1 parent 4bd3e55 commit b8f7262
Show file tree
Hide file tree
Showing 7 changed files with 916 additions and 20 deletions.
19 changes: 11 additions & 8 deletions VisualC-WinPhone/SDL_image-WinPhone_VS2012.vcxproj
View file
Expand Up @@ -78,12 +78,12 @@
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<PreprocessorDefinitions>_USRDLL;_CRT_SECURE_NO_WARNINGS;LOAD_BMP;LOAD_PNG;LOAD_PNG_DYNAMIC="libpng.dll";%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>_USRDLL;_CRT_SECURE_NO_WARNINGS;LOAD_BMP;LOAD_PNG;LOAD_PNG_DYNAMIC="libpng.dll";LOAD_JPG;LOAD_JPG_DYNAMIC="jpeg.dll";%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
<CompileAsWinRT>false</CompileAsWinRT>
<AdditionalUsingDirectories>$(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
<AdditionalIncludeDirectories>..\..\SDL\include;..\external\libpng-1.6.2</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\..\SDL\include;..\external\libpng-1.6.2;..\external\jpeg-9</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
Expand All @@ -94,12 +94,12 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<PreprocessorDefinitions>_USRDLL;_CRT_SECURE_NO_WARNINGS;LOAD_BMP;LOAD_PNG;LOAD_PNG_DYNAMIC="libpng.dll";NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>_USRDLL;_CRT_SECURE_NO_WARNINGS;LOAD_BMP;LOAD_PNG;LOAD_PNG_DYNAMIC="libpng.dll";LOAD_JPG;LOAD_JPG_DYNAMIC="jpeg.dll";NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
<CompileAsWinRT>false</CompileAsWinRT>
<AdditionalUsingDirectories>$(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
<AdditionalIncludeDirectories>..\..\SDL\include;..\external\libpng-1.6.2</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\..\SDL\include;..\external\libpng-1.6.2;..\external\jpeg-9</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
Expand All @@ -110,12 +110,12 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
<ClCompile>
<PreprocessorDefinitions>_USRDLL;_CRT_SECURE_NO_WARNINGS;LOAD_BMP;LOAD_PNG;LOAD_PNG_DYNAMIC="libpng.dll";%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>_USRDLL;_CRT_SECURE_NO_WARNINGS;LOAD_BMP;LOAD_PNG;LOAD_PNG_DYNAMIC="libpng.dll";LOAD_JPG;LOAD_JPG_DYNAMIC="jpeg.dll";%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
<CompileAsWinRT>false</CompileAsWinRT>
<AdditionalUsingDirectories>$(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
<AdditionalIncludeDirectories>..\..\SDL\include;..\external\libpng-1.6.2</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\..\SDL\include;..\external\libpng-1.6.2;..\external\jpeg-9</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
Expand All @@ -126,12 +126,12 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
<ClCompile>
<PreprocessorDefinitions>_USRDLL;_CRT_SECURE_NO_WARNINGS;LOAD_BMP;LOAD_PNG;LOAD_PNG_DYNAMIC="libpng.dll";NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>_USRDLL;_CRT_SECURE_NO_WARNINGS;LOAD_BMP;LOAD_PNG;LOAD_PNG_DYNAMIC="libpng.dll";LOAD_JPG;LOAD_JPG_DYNAMIC="jpeg.dll";NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
<CompileAsWinRT>false</CompileAsWinRT>
<AdditionalUsingDirectories>$(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
<AdditionalIncludeDirectories>..\..\SDL\include;..\external\libpng-1.6.2</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\..\SDL\include;..\external\libpng-1.6.2;..\external\jpeg-9</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
Expand Down Expand Up @@ -170,6 +170,9 @@
<ProjectReference Include="..\..\SDL\VisualC-WinPhone\SDL\SDL-WinPhone_VS2012.vcxproj">
<Project>{33048af1-031a-4ce6-b61e-fad2db832e9e}</Project>
</ProjectReference>
<ProjectReference Include="jpeg-WinPhone_VS2012.vcxproj">
<Project>{10cabd6e-bd1a-4705-be35-a34ce1edf6fb}</Project>
</ProjectReference>
<ProjectReference Include="libpng-WinPhone_VS2012.vcxproj">
<Project>{af7120b3-ecf6-464d-a4a6-e56b91e81b50}</Project>
</ProjectReference>
Expand Down
221 changes: 221 additions & 0 deletions VisualC-WinPhone/jpeg-WinPhone_VS2012.vcxproj
View file
@@ -0,0 +1,221 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Debug|ARM">
<Configuration>Debug</Configuration>
<Platform>ARM</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|ARM">
<Configuration>Release</Configuration>
<Platform>ARM</Platform>
</ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{10cabd6e-bd1a-4705-be35-a34ce1edf6fb}</ProjectGuid>
<RootNamespace>jpeg_WinPhone</RootNamespace>
<DefaultLanguage>en-US</DefaultLanguage>
<MinimumVisualStudioVersion>11.0</MinimumVisualStudioVersion>
<ProjectName>jpeg-WinPhone</ProjectName>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v110_wp80</PlatformToolset>
<IgnoreImportLibrary>false</IgnoreImportLibrary>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v110_wp80</PlatformToolset>
<IgnoreImportLibrary>false</IgnoreImportLibrary>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<WholeProgramOptimization>true</WholeProgramOptimization>
<PlatformToolset>v110_wp80</PlatformToolset>
<IgnoreImportLibrary>false</IgnoreImportLibrary>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<WholeProgramOptimization>true</WholeProgramOptimization>
<PlatformToolset>v110_wp80</PlatformToolset>
<IgnoreImportLibrary>false</IgnoreImportLibrary>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<GenerateManifest>false</GenerateManifest>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
<IntDir>Objs\$(Platform)\$(Configuration)\$(MSBuildProjectName)\</IntDir>
<TargetName>jpeg</TargetName>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
<IntDir>Objs\$(Platform)\$(Configuration)\$(MSBuildProjectName)\</IntDir>
<TargetName>jpeg</TargetName>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<IntDir>Objs\$(Platform)\$(Configuration)\$(MSBuildProjectName)\</IntDir>
<TargetName>jpeg</TargetName>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<IntDir>Objs\$(Platform)\$(Configuration)\$(MSBuildProjectName)\</IntDir>
<TargetName>jpeg</TargetName>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<PreprocessorDefinitions>_USRDLL;_CRT_SECURE_NO_WARNINGS;NO_GETENV;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
<CompileAsWinRT>false</CompileAsWinRT>
<AdditionalUsingDirectories>$(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
<GenerateWindowsMetadata>false</GenerateWindowsMetadata>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ModuleDefinitionFile>..\VisualC-WinRT\jpeg.def</ModuleDefinitionFile>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<PreprocessorDefinitions>_USRDLL;_CRT_SECURE_NO_WARNINGS;NO_GETENV;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
<CompileAsWinRT>false</CompileAsWinRT>
<AdditionalUsingDirectories>$(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
<GenerateWindowsMetadata>false</GenerateWindowsMetadata>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ModuleDefinitionFile>..\VisualC-WinRT\jpeg.def</ModuleDefinitionFile>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
<ClCompile>
<PreprocessorDefinitions>_USRDLL;_CRT_SECURE_NO_WARNINGS;NO_GETENV;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
<CompileAsWinRT>false</CompileAsWinRT>
<AdditionalUsingDirectories>$(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
<GenerateWindowsMetadata>false</GenerateWindowsMetadata>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ModuleDefinitionFile>..\VisualC-WinRT\jpeg.def</ModuleDefinitionFile>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
<ClCompile>
<PreprocessorDefinitions>_USRDLL;_CRT_SECURE_NO_WARNINGS;NO_GETENV;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
<CompileAsWinRT>false</CompileAsWinRT>
<AdditionalUsingDirectories>$(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
<GenerateWindowsMetadata>false</GenerateWindowsMetadata>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ModuleDefinitionFile>..\VisualC-WinRT\jpeg.def</ModuleDefinitionFile>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
<Reference Include="Windows">
<IsWinMDFile>true</IsWinMDFile>
</Reference>
<Reference Include="platform.winmd">
<IsWinMDFile>true</IsWinMDFile>
<Private>false</Private>
</Reference>
</ItemGroup>
<ItemGroup>
<None Include="..\VisualC-WinRT\jpeg.def" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\external\jpeg-9\jaricom.c" />
<ClCompile Include="..\external\jpeg-9\jcapimin.c" />
<ClCompile Include="..\external\jpeg-9\jcapistd.c" />
<ClCompile Include="..\external\jpeg-9\jcarith.c" />
<ClCompile Include="..\external\jpeg-9\jccoefct.c" />
<ClCompile Include="..\external\jpeg-9\jccolor.c" />
<ClCompile Include="..\external\jpeg-9\jcdctmgr.c" />
<ClCompile Include="..\external\jpeg-9\jchuff.c" />
<ClCompile Include="..\external\jpeg-9\jcinit.c" />
<ClCompile Include="..\external\jpeg-9\jcmainct.c" />
<ClCompile Include="..\external\jpeg-9\jcmarker.c" />
<ClCompile Include="..\external\jpeg-9\jcmaster.c" />
<ClCompile Include="..\external\jpeg-9\jcomapi.c" />
<ClCompile Include="..\external\jpeg-9\jcparam.c" />
<ClCompile Include="..\external\jpeg-9\jcprepct.c" />
<ClCompile Include="..\external\jpeg-9\jcsample.c" />
<ClCompile Include="..\external\jpeg-9\jctrans.c" />
<ClCompile Include="..\external\jpeg-9\jdapimin.c" />
<ClCompile Include="..\external\jpeg-9\jdapistd.c" />
<ClCompile Include="..\external\jpeg-9\jdarith.c" />
<ClCompile Include="..\external\jpeg-9\jdatadst.c" />
<ClCompile Include="..\external\jpeg-9\jdatasrc.c" />
<ClCompile Include="..\external\jpeg-9\jdcoefct.c" />
<ClCompile Include="..\external\jpeg-9\jdcolor.c" />
<ClCompile Include="..\external\jpeg-9\jddctmgr.c" />
<ClCompile Include="..\external\jpeg-9\jdhuff.c" />
<ClCompile Include="..\external\jpeg-9\jdinput.c" />
<ClCompile Include="..\external\jpeg-9\jdmainct.c" />
<ClCompile Include="..\external\jpeg-9\jdmarker.c" />
<ClCompile Include="..\external\jpeg-9\jdmaster.c" />
<ClCompile Include="..\external\jpeg-9\jdmerge.c" />
<ClCompile Include="..\external\jpeg-9\jdpostct.c" />
<ClCompile Include="..\external\jpeg-9\jdsample.c" />
<ClCompile Include="..\external\jpeg-9\jdtrans.c" />
<ClCompile Include="..\external\jpeg-9\jerror.c" />
<ClCompile Include="..\external\jpeg-9\jfdctflt.c" />
<ClCompile Include="..\external\jpeg-9\jfdctfst.c" />
<ClCompile Include="..\external\jpeg-9\jfdctint.c" />
<ClCompile Include="..\external\jpeg-9\jidctflt.c" />
<ClCompile Include="..\external\jpeg-9\jidctfst.c" />
<ClCompile Include="..\external\jpeg-9\jidctint.c" />
<ClCompile Include="..\external\jpeg-9\jmemansi.c" />
<ClCompile Include="..\external\jpeg-9\jmemmgr.c" />
<ClCompile Include="..\external\jpeg-9\jquant1.c" />
<ClCompile Include="..\external\jpeg-9\jquant2.c" />
<ClCompile Include="..\external\jpeg-9\jutils.c" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\external\jpeg-9\cderror.h" />
<ClInclude Include="..\external\jpeg-9\cdjpeg.h" />
<ClInclude Include="..\external\jpeg-9\jconfig.h" />
<ClInclude Include="..\external\jpeg-9\jdct.h" />
<ClInclude Include="..\external\jpeg-9\jerror.h" />
<ClInclude Include="..\external\jpeg-9\jinclude.h" />
<ClInclude Include="..\external\jpeg-9\jmemsys.h" />
<ClInclude Include="..\external\jpeg-9\jmorecfg.h" />
<ClInclude Include="..\external\jpeg-9\jpegint.h" />
<ClInclude Include="..\external\jpeg-9\jpeglib.h" />
<ClInclude Include="..\external\jpeg-9\jversion.h" />
<ClInclude Include="..\external\jpeg-9\transupp.h" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsPhone\v$(TargetPlatformVersion)\Microsoft.Cpp.WindowsPhone.$(TargetPlatformVersion).targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>

0 comments on commit b8f7262

Please sign in to comment.