Skip to content

Commit

Permalink
Cleaned up and rearranged WinRT project file structure.
Browse files Browse the repository at this point in the history
All WinRT projects have been merged into a single directory, "VisualC-WinRT",
with platform-specific variants in subdirectories off of it.  WinRT development
currently requires muliple project types, one for Windows 8.0, a second for
Windows Phone 8.0, and a third, possibly a fourth, for Windows 8.1 and/or
Windows Phone 8.1 targets.

The first two, for Windows 8.0 and Windows Phone 8.0 targets, are now in place,
inside "WinRT80_VS2012" and "WinPhone80_VS2012" subdirectories.  Both require
the VS2012 toolchain(s).

Projects that use SDL_image/WinRT will need to have existing references to
SDL_image, and its dependencies libraries, removed and then re-added.  This can
be done by:
1. removing the MSVC projects for SDL_image, libpng, jpeg, and zlib (for WinRT)
2. re-added the MSVC projects for SDL_image, libpng, jpeg, and zlib (for WinRT)
3. right-clickong on the app, or projects that use those libraries, choosing
References, removing the references to any of these projects (they'll likely
be highlighted with an exclamation mark), then re-adding them

TODO:
- add support for Windows 8.1 and Windows Phone 8.1 targets, using
Microsoft's new "Universal" app support, if possible.  These will be added to
a new subdirectory, or subdirectories (if more than one sets of projects are
needed, hopefully not), of "VisualC-WinRT".
- add a README.txt file inside VisualC-WinRT that explains which directories
are used for which targets, along with some basic setup info
  • Loading branch information
DavidLudwig committed Apr 6, 2014
1 parent b8f7262 commit a5ce986
Show file tree
Hide file tree
Showing 18 changed files with 568 additions and 568 deletions.
20 changes: 0 additions & 20 deletions VisualC-WinPhone/SDL_image-WinPhone_VS2012.vcxproj.filters

This file was deleted.

24 changes: 0 additions & 24 deletions VisualC-WinRT/SDL_image-WinRT_VS2012.vcxproj.filters

This file was deleted.

Expand Up @@ -23,7 +23,7 @@
<RootNamespace>SDL2_image_WinPhone</RootNamespace>
<DefaultLanguage>en-US</DefaultLanguage>
<MinimumVisualStudioVersion>11.0</MinimumVisualStudioVersion>
<ProjectName>SDL2_image-WinPhone</ProjectName>
<ProjectName>SDL2_image-WinPhone80</ProjectName>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
Expand Down Expand Up @@ -83,7 +83,7 @@
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
<CompileAsWinRT>false</CompileAsWinRT>
<AdditionalUsingDirectories>$(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
<AdditionalIncludeDirectories>..\..\SDL\include;..\external\libpng-1.6.2;..\external\jpeg-9</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\..\..\SDL\include;..\..\external\libpng-1.6.2;..\..\external\jpeg-9</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
Expand All @@ -99,7 +99,7 @@
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
<CompileAsWinRT>false</CompileAsWinRT>
<AdditionalUsingDirectories>$(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
<AdditionalIncludeDirectories>..\..\SDL\include;..\external\libpng-1.6.2;..\external\jpeg-9</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\..\..\SDL\include;..\..\external\libpng-1.6.2;..\..\external\jpeg-9</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
Expand All @@ -115,7 +115,7 @@
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
<CompileAsWinRT>false</CompileAsWinRT>
<AdditionalUsingDirectories>$(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
<AdditionalIncludeDirectories>..\..\SDL\include;..\external\libpng-1.6.2;..\external\jpeg-9</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\..\..\SDL\include;..\..\external\libpng-1.6.2;..\..\external\jpeg-9</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
Expand All @@ -131,7 +131,7 @@
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
<CompileAsWinRT>false</CompileAsWinRT>
<AdditionalUsingDirectories>$(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
<AdditionalIncludeDirectories>..\..\SDL\include;..\external\libpng-1.6.2;..\external\jpeg-9</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\..\..\SDL\include;..\..\external\libpng-1.6.2;..\..\external\jpeg-9</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
Expand All @@ -150,30 +150,30 @@
</Reference>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\IMG.c" />
<ClCompile Include="..\IMG_bmp.c" />
<ClCompile Include="..\IMG_gif.c" />
<ClCompile Include="..\IMG_jpg.c" />
<ClCompile Include="..\IMG_lbm.c" />
<ClCompile Include="..\IMG_pcx.c" />
<ClCompile Include="..\IMG_png.c" />
<ClCompile Include="..\IMG_pnm.c" />
<ClCompile Include="..\IMG_tga.c" />
<ClCompile Include="..\IMG_tif.c" />
<ClCompile Include="..\IMG_webp.c" />
<ClCompile Include="..\IMG_xcf.c" />
<ClCompile Include="..\IMG_xpm.c" />
<ClCompile Include="..\IMG_xv.c" />
<ClCompile Include="..\IMG_xxx.c" />
<ClCompile Include="..\..\IMG.c" />
<ClCompile Include="..\..\IMG_bmp.c" />
<ClCompile Include="..\..\IMG_gif.c" />
<ClCompile Include="..\..\IMG_jpg.c" />
<ClCompile Include="..\..\IMG_lbm.c" />
<ClCompile Include="..\..\IMG_pcx.c" />
<ClCompile Include="..\..\IMG_png.c" />
<ClCompile Include="..\..\IMG_pnm.c" />
<ClCompile Include="..\..\IMG_tga.c" />
<ClCompile Include="..\..\IMG_tif.c" />
<ClCompile Include="..\..\IMG_webp.c" />
<ClCompile Include="..\..\IMG_xcf.c" />
<ClCompile Include="..\..\IMG_xpm.c" />
<ClCompile Include="..\..\IMG_xv.c" />
<ClCompile Include="..\..\IMG_xxx.c" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\SDL\VisualC-WinPhone\SDL\SDL-WinPhone_VS2012.vcxproj">
<ProjectReference Include="..\..\..\SDL\VisualC-WinPhone\SDL\SDL-WinPhone_VS2012.vcxproj">
<Project>{33048af1-031a-4ce6-b61e-fad2db832e9e}</Project>
</ProjectReference>
<ProjectReference Include="jpeg-WinPhone_VS2012.vcxproj">
<ProjectReference Include="jpeg-WinPhone80.vcxproj">
<Project>{10cabd6e-bd1a-4705-be35-a34ce1edf6fb}</Project>
</ProjectReference>
<ProjectReference Include="libpng-WinPhone_VS2012.vcxproj">
<ProjectReference Include="libpng-WinPhone80.vcxproj">
<Project>{af7120b3-ecf6-464d-a4a6-e56b91e81b50}</Project>
</ProjectReference>
</ItemGroup>
Expand Down
@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<ClCompile Include="..\..\IMG.c" />
<ClCompile Include="..\..\IMG_bmp.c" />
<ClCompile Include="..\..\IMG_gif.c" />
<ClCompile Include="..\..\IMG_jpg.c" />
<ClCompile Include="..\..\IMG_lbm.c" />
<ClCompile Include="..\..\IMG_pcx.c" />
<ClCompile Include="..\..\IMG_png.c" />
<ClCompile Include="..\..\IMG_pnm.c" />
<ClCompile Include="..\..\IMG_tga.c" />
<ClCompile Include="..\..\IMG_tif.c" />
<ClCompile Include="..\..\IMG_webp.c" />
<ClCompile Include="..\..\IMG_xcf.c" />
<ClCompile Include="..\..\IMG_xpm.c" />
<ClCompile Include="..\..\IMG_xv.c" />
<ClCompile Include="..\..\IMG_xxx.c" />
</ItemGroup>
</Project>
Expand Up @@ -23,7 +23,7 @@
<RootNamespace>jpeg_WinPhone</RootNamespace>
<DefaultLanguage>en-US</DefaultLanguage>
<MinimumVisualStudioVersion>11.0</MinimumVisualStudioVersion>
<ProjectName>jpeg-WinPhone</ProjectName>
<ProjectName>jpeg-WinPhone80</ProjectName>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
Expand Down Expand Up @@ -89,7 +89,7 @@
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
<GenerateWindowsMetadata>false</GenerateWindowsMetadata>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ModuleDefinitionFile>..\VisualC-WinRT\jpeg.def</ModuleDefinitionFile>
<ModuleDefinitionFile>..\jpeg.def</ModuleDefinitionFile>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
Expand All @@ -105,7 +105,7 @@
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
<GenerateWindowsMetadata>false</GenerateWindowsMetadata>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ModuleDefinitionFile>..\VisualC-WinRT\jpeg.def</ModuleDefinitionFile>
<ModuleDefinitionFile>..\jpeg.def</ModuleDefinitionFile>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
Expand All @@ -121,7 +121,7 @@
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
<GenerateWindowsMetadata>false</GenerateWindowsMetadata>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ModuleDefinitionFile>..\VisualC-WinRT\jpeg.def</ModuleDefinitionFile>
<ModuleDefinitionFile>..\jpeg.def</ModuleDefinitionFile>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
Expand All @@ -137,7 +137,7 @@
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
<GenerateWindowsMetadata>false</GenerateWindowsMetadata>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ModuleDefinitionFile>..\VisualC-WinRT\jpeg.def</ModuleDefinitionFile>
<ModuleDefinitionFile>..\jpeg.def</ModuleDefinitionFile>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
Expand All @@ -153,66 +153,66 @@
<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" />
<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" />
<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" />
Expand Down

0 comments on commit a5ce986

Please sign in to comment.