From 0ba3a54ac38b9d9dd1259c0a15e62c6a725d1e8c Mon Sep 17 00:00:00 2001 From: David Ludwig Date: Sat, 19 Apr 2014 12:48:45 -0400 Subject: [PATCH] Cleaned up and rearranged WinRT project file structure. All WinRT projects have been merged into a single directory, "VisualC-WinRT", with platform-specific variants in subdirectories off of it. This structure has been applied to a few major SDL satellite libraries as well (SDL_image, SDL_mixer, and SDL_ttf). Currently, only Windows 8.0/RT and Windows Phone 8.0 targets are supported. Windows 8.1/RT/Phone targets are planned. Projects that use SDL_image/WinRT, and link to it via Visual Studio's project-to-project reference system, will need to be updated, to reflect the changes in the project structure. This can be done by: 1. removing the MSVC project(s) for SDL/WinRT 2. re-added the MSVC project(s) for SDL/WinRT 3. right-clicking 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 To note, the satellite libraries that reference SDL/WinRT have been updated already. The changes for those libraries will be pushed to hg.libsdl.org shortly. 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". - investigate NuGet support, which could allow Visual C++ to download new copies of SDL/WinRT, its satellite libraries, and their dependencies, from remote servers. --- .../WinPhone80_VS2012/SDL-WinPhone80.vcxproj | 6 +++++- .../WinPhone80_VS2012/SDL-WinPhone80.vcxproj.filters | 0 .../SDL-WinRT80.sln} | 2 +- .../SDL-WinRT80.vcxproj} | 8 +++++++- .../SDL-WinRT80.vcxproj.filters} | 0 VisualC-WinRT/tests/loopwave/loopwave_VS2012.vcxproj | 2 +- VisualC-WinRT/tests/testthread/testthread_VS2012.vcxproj | 2 +- 7 files changed, 15 insertions(+), 5 deletions(-) rename VisualC-WinPhone/SDL/SDL-WinPhone_VS2012.vcxproj => VisualC-WinRT/WinPhone80_VS2012/SDL-WinPhone80.vcxproj (97%) rename VisualC-WinPhone/SDL/SDL-WinPhone_VS2012.vcxproj.filters => VisualC-WinRT/WinPhone80_VS2012/SDL-WinPhone80.vcxproj.filters (100%) rename VisualC-WinRT/{SDL-WinRT_VS2012.sln => WinRT80_VS2012/SDL-WinRT80.sln} (93%) rename VisualC-WinRT/{SDL/SDL-WinRT_VS2012.vcxproj => WinRT80_VS2012/SDL-WinRT80.vcxproj} (96%) rename VisualC-WinRT/{SDL/SDL-WinRT_VS2012.vcxproj.filters => WinRT80_VS2012/SDL-WinRT80.vcxproj.filters} (100%) diff --git a/VisualC-WinPhone/SDL/SDL-WinPhone_VS2012.vcxproj b/VisualC-WinRT/WinPhone80_VS2012/SDL-WinPhone80.vcxproj similarity index 97% rename from VisualC-WinPhone/SDL/SDL-WinPhone_VS2012.vcxproj rename to VisualC-WinRT/WinPhone80_VS2012/SDL-WinPhone80.vcxproj index 093ac9b3a23ff..bf351e0b91178 100644 --- a/VisualC-WinPhone/SDL/SDL-WinPhone_VS2012.vcxproj +++ b/VisualC-WinRT/WinPhone80_VS2012/SDL-WinPhone80.vcxproj @@ -23,7 +23,7 @@ SDL en-US 11.0 - SDL2-WinPhone + SDL2-WinPhone80 @@ -62,15 +62,19 @@ SDL2 + Objs\$(Platform)\$(Configuration)\$(MSBuildProjectName)\ SDL2 + Objs\$(Platform)\$(Configuration)\$(MSBuildProjectName)\ SDL2 + Objs\$(Platform)\$(Configuration)\$(MSBuildProjectName)\ SDL2 + Objs\$(Platform)\$(Configuration)\$(MSBuildProjectName)\ diff --git a/VisualC-WinPhone/SDL/SDL-WinPhone_VS2012.vcxproj.filters b/VisualC-WinRT/WinPhone80_VS2012/SDL-WinPhone80.vcxproj.filters similarity index 100% rename from VisualC-WinPhone/SDL/SDL-WinPhone_VS2012.vcxproj.filters rename to VisualC-WinRT/WinPhone80_VS2012/SDL-WinPhone80.vcxproj.filters diff --git a/VisualC-WinRT/SDL-WinRT_VS2012.sln b/VisualC-WinRT/WinRT80_VS2012/SDL-WinRT80.sln similarity index 93% rename from VisualC-WinRT/SDL-WinRT_VS2012.sln rename to VisualC-WinRT/WinRT80_VS2012/SDL-WinRT80.sln index 921cebd6d5372..dc3a6ddafb42a 100644 --- a/VisualC-WinRT/SDL-WinRT_VS2012.sln +++ b/VisualC-WinRT/WinRT80_VS2012/SDL-WinRT80.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 2012 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDL-WinRT", "SDL\SDL-WinRT_VS2012.vcxproj", "{AEAEA3A2-D4E6-45B1-8EC6-53D84287FC14}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDL-WinRT", "SDL-WinRT80.vcxproj", "{AEAEA3A2-D4E6-45B1-8EC6-53D84287FC14}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/VisualC-WinRT/SDL/SDL-WinRT_VS2012.vcxproj b/VisualC-WinRT/WinRT80_VS2012/SDL-WinRT80.vcxproj similarity index 96% rename from VisualC-WinRT/SDL/SDL-WinRT_VS2012.vcxproj rename to VisualC-WinRT/WinRT80_VS2012/SDL-WinRT80.vcxproj index 1897ca531f8b6..292a02866d004 100644 --- a/VisualC-WinRT/SDL/SDL-WinRT_VS2012.vcxproj +++ b/VisualC-WinRT/WinRT80_VS2012/SDL-WinRT80.vcxproj @@ -347,7 +347,7 @@ {aeaea3a2-d4e6-45b1-8ec6-53d84287fc14} Win32Proj - SDL2-WinRT + SDL2-WinRT80 SDL_VS2012_WinRT en-US 11.0 @@ -412,31 +412,37 @@ false false SDL2 + Objs\$(Platform)\$(Configuration)\$(MSBuildProjectName)\ false false SDL2 + Objs\$(Platform)\$(Configuration)\$(MSBuildProjectName)\ false false SDL2 + Objs\$(Platform)\$(Configuration)\$(MSBuildProjectName)\ false false SDL2 + Objs\$(Platform)\$(Configuration)\$(MSBuildProjectName)\ false false SDL2 + Objs\$(Platform)\$(Configuration)\$(MSBuildProjectName)\ false false SDL2 + Objs\$(Platform)\$(Configuration)\$(MSBuildProjectName)\ diff --git a/VisualC-WinRT/SDL/SDL-WinRT_VS2012.vcxproj.filters b/VisualC-WinRT/WinRT80_VS2012/SDL-WinRT80.vcxproj.filters similarity index 100% rename from VisualC-WinRT/SDL/SDL-WinRT_VS2012.vcxproj.filters rename to VisualC-WinRT/WinRT80_VS2012/SDL-WinRT80.vcxproj.filters diff --git a/VisualC-WinRT/tests/loopwave/loopwave_VS2012.vcxproj b/VisualC-WinRT/tests/loopwave/loopwave_VS2012.vcxproj index bd17509429931..44c32813b2574 100644 --- a/VisualC-WinRT/tests/loopwave/loopwave_VS2012.vcxproj +++ b/VisualC-WinRT/tests/loopwave/loopwave_VS2012.vcxproj @@ -160,7 +160,7 @@ - + {aeaea3a2-d4e6-45b1-8ec6-53d84287fc14} diff --git a/VisualC-WinRT/tests/testthread/testthread_VS2012.vcxproj b/VisualC-WinRT/tests/testthread/testthread_VS2012.vcxproj index eb2558fa44866..ba1dbc050b50d 100644 --- a/VisualC-WinRT/tests/testthread/testthread_VS2012.vcxproj +++ b/VisualC-WinRT/tests/testthread/testthread_VS2012.vcxproj @@ -150,7 +150,7 @@ - + {aeaea3a2-d4e6-45b1-8ec6-53d84287fc14}