From 8a96db25819269a3ce903f09a673b7cd6ae9bee3 Mon Sep 17 00:00:00 2001 From: walbourn_cp Date: Fri, 28 Sep 2012 16:28:30 -0700 Subject: [PATCH] Rename projects and solutions to a standard naming convention --- ...1_Desktop.sln => DDSView_Desktop_2010.sln} | 4 +-- ...0.vcxproj => DDSView_Desktop_2010.vcxproj} | 2 +- ...s => DDSView_Desktop_2010.vcxproj.filters} | 0 ...View_2010.sln => DDSView_Desktop_2012.sln} | 4 +-- ...p.vcxproj => DDSView_Desktop_2012.vcxproj} | 2 +- ...s => DDSView_Desktop_2012.vcxproj.filters} | 0 DDSView/hlsl.cmd | 14 +++++----- ...x_2010.sln => DirectXTex_Desktop_2010.sln} | 2 +- ...cxproj => DirectXTex_Desktop_2010.vcxproj} | 0 ...> DirectXTex_Desktop_2010.vcxproj.filters} | 0 ...esktop.sln => DirectXTex_Desktop_2012.sln} | 2 +- ...cxproj => DirectXTex_Desktop_2012.vcxproj} | 0 ...> DirectXTex_Desktop_2012.vcxproj.filters} | 0 ...x_11_Metro.sln => DirectXTex_Windows8.sln} | 2 +- ...ro.vcxproj => DirectXTex_Windows8.vcxproj} | 27 +++++++++++++++++++ ...rs => DirectXTex_Windows8.vcxproj.filters} | 0 ...1_Desktop.sln => Texconv_Desktop_2010.sln} | 4 +-- ...0.vcxproj => Texconv_Desktop_2010.vcxproj} | 2 +- ...s => Texconv_Desktop_2010.vcxproj.filters} | 0 ...conv_2010.sln => Texconv_Desktop_2012.sln} | 4 +-- ...p.vcxproj => Texconv_Desktop_2012.vcxproj} | 2 +- ...s => Texconv_Desktop_2012.vcxproj.filters} | 0 22 files changed, 49 insertions(+), 22 deletions(-) rename DDSView/{DDSView_11_Desktop.sln => DDSView_Desktop_2010.sln} (92%) rename DDSView/{DDSView_2010.vcxproj => DDSView_Desktop_2010.vcxproj} (97%) rename DDSView/{DDSView_11_Desktop.vcxproj.filters => DDSView_Desktop_2010.vcxproj.filters} (100%) rename DDSView/{DDSView_2010.sln => DDSView_Desktop_2012.sln} (92%) rename DDSView/{DDSView_11_Desktop.vcxproj => DDSView_Desktop_2012.vcxproj} (97%) rename DDSView/{DDSView_2010.vcxproj.filters => DDSView_Desktop_2012.vcxproj.filters} (100%) rename DirectXTex/{DirectXTex_2010.sln => DirectXTex_Desktop_2010.sln} (93%) rename DirectXTex/{DirectXTex_2010.vcxproj => DirectXTex_Desktop_2010.vcxproj} (100%) rename DirectXTex/{DirectXTex_11_Desktop.vcxproj.filters => DirectXTex_Desktop_2010.vcxproj.filters} (100%) rename DirectXTex/{DirectXTex_11_Desktop.sln => DirectXTex_Desktop_2012.sln} (93%) rename DirectXTex/{DirectXTex_11_Desktop.vcxproj => DirectXTex_Desktop_2012.vcxproj} (100%) rename DirectXTex/{DirectXTex_11_Metro.vcxproj.filters => DirectXTex_Desktop_2012.vcxproj.filters} (100%) rename DirectXTex/{DirectXTex_11_Metro.sln => DirectXTex_Windows8.sln} (95%) rename DirectXTex/{DirectXTex_11_Metro.vcxproj => DirectXTex_Windows8.vcxproj} (94%) rename DirectXTex/{DirectXTex_2010.vcxproj.filters => DirectXTex_Windows8.vcxproj.filters} (100%) rename Texconv/{Texconv_11_Desktop.sln => Texconv_Desktop_2010.sln} (92%) rename Texconv/{texconv_2010.vcxproj => Texconv_Desktop_2010.vcxproj} (97%) rename Texconv/{Texconv_11_Desktop.vcxproj.filters => Texconv_Desktop_2010.vcxproj.filters} (100%) rename Texconv/{texconv_2010.sln => Texconv_Desktop_2012.sln} (92%) rename Texconv/{Texconv_11_Desktop.vcxproj => Texconv_Desktop_2012.vcxproj} (97%) rename Texconv/{texconv_2010.vcxproj.filters => Texconv_Desktop_2012.vcxproj.filters} (100%) diff --git a/DDSView/DDSView_11_Desktop.sln b/DDSView/DDSView_Desktop_2010.sln similarity index 92% rename from DDSView/DDSView_11_Desktop.sln rename to DDSView/DDSView_Desktop_2010.sln index 4be0080..492af76 100644 --- a/DDSView/DDSView_11_Desktop.sln +++ b/DDSView/DDSView_Desktop_2010.sln @@ -1,8 +1,8 @@ Microsoft Visual Studio Solution File, Format Version 11.00 # Visual Studio 2010 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DDSView", "DDSView_11_Desktop.vcxproj", "{9D3EDCAD-A800-43F0-B77F-FE6E4DFA3D84}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DDSView", "DDSView_Desktop_2010.vcxproj", "{9D3EDCAD-A800-43F0-B77F-FE6E4DFA3D84}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DirectXTex", "..\DirectXTex\DirectXTex_11_Desktop.vcxproj", "{371B9FA9-4C90-4AC6-A123-ACED756D6C77}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DirectXTex", "..\DirectXTex\DirectXTex_Desktop_2010.vcxproj", "{371B9FA9-4C90-4AC6-A123-ACED756D6C77}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/DDSView/DDSView_2010.vcxproj b/DDSView/DDSView_Desktop_2010.vcxproj similarity index 97% rename from DDSView/DDSView_2010.vcxproj rename to DDSView/DDSView_Desktop_2010.vcxproj index 0874ddc..ca639ab 100644 --- a/DDSView/DDSView_2010.vcxproj +++ b/DDSView/DDSView_Desktop_2010.vcxproj @@ -371,7 +371,7 @@ - + {371b9fa9-4c90-4ac6-a123-aced756d6c77} diff --git a/DDSView/DDSView_11_Desktop.vcxproj.filters b/DDSView/DDSView_Desktop_2010.vcxproj.filters similarity index 100% rename from DDSView/DDSView_11_Desktop.vcxproj.filters rename to DDSView/DDSView_Desktop_2010.vcxproj.filters diff --git a/DDSView/DDSView_2010.sln b/DDSView/DDSView_Desktop_2012.sln similarity index 92% rename from DDSView/DDSView_2010.sln rename to DDSView/DDSView_Desktop_2012.sln index 947aa2c..a41d52c 100644 --- a/DDSView/DDSView_2010.sln +++ b/DDSView/DDSView_Desktop_2012.sln @@ -1,8 +1,8 @@ Microsoft Visual Studio Solution File, Format Version 11.00 # Visual Studio 2010 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DDSView", "DDSView_2010.vcxproj", "{9D3EDCAD-A800-43F0-B77F-FE6E4DFA3D84}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DDSView", "DDSView_Desktop_2012.vcxproj", "{9D3EDCAD-A800-43F0-B77F-FE6E4DFA3D84}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DirectXTex", "..\DirectXTex\DirectXTex_2010.vcxproj", "{371B9FA9-4C90-4AC6-A123-ACED756D6C77}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DirectXTex", "..\DirectXTex\DirectXTex_Desktop_2012.vcxproj", "{371B9FA9-4C90-4AC6-A123-ACED756D6C77}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/DDSView/DDSView_11_Desktop.vcxproj b/DDSView/DDSView_Desktop_2012.vcxproj similarity index 97% rename from DDSView/DDSView_11_Desktop.vcxproj rename to DDSView/DDSView_Desktop_2012.vcxproj index c783451..5038514 100644 --- a/DDSView/DDSView_11_Desktop.vcxproj +++ b/DDSView/DDSView_Desktop_2012.vcxproj @@ -378,7 +378,7 @@ - + {371b9fa9-4c90-4ac6-a123-aced756d6c77} diff --git a/DDSView/DDSView_2010.vcxproj.filters b/DDSView/DDSView_Desktop_2012.vcxproj.filters similarity index 100% rename from DDSView/DDSView_2010.vcxproj.filters rename to DDSView/DDSView_Desktop_2012.vcxproj.filters diff --git a/DDSView/hlsl.cmd b/DDSView/hlsl.cmd index d18a46d..e5074f5 100644 --- a/DDSView/hlsl.cmd +++ b/DDSView/hlsl.cmd @@ -1,8 +1,8 @@ -%DXSDK_DIR%\Utilities\bin\x86\fxc ddsview.fx /nologo /EVS /Tvs_4_1 /Fhshaders\vs.h -%DXSDK_DIR%\Utilities\bin\x86\fxc ddsview.fx /nologo /EPS_1D /Tps_4_1 /Fhshaders\ps1D.h -%DXSDK_DIR%\Utilities\bin\x86\fxc ddsview.fx /nologo /EPS_1DArray /Tps_4_1 /Fhshaders\ps1Darray.h -%DXSDK_DIR%\Utilities\bin\x86\fxc ddsview.fx /nologo /EPS_2D /Tps_4_1 /Fhshaders\ps2D.h -%DXSDK_DIR%\Utilities\bin\x86\fxc ddsview.fx /nologo /EPS_2DArray /Tps_4_1 /Fhshaders\ps2Darray.h -%DXSDK_DIR%\Utilities\bin\x86\fxc ddsview.fx /nologo /EPS_3D /Tps_4_1 /Fhshaders\ps3D.h -%DXSDK_DIR%\Utilities\bin\x86\fxc ddsview.fx /nologo /EPS_Cube /Tps_4_1 /Fhshaders\psCube.h +fxc ddsview.fx /nologo /EVS /Tvs_4_1 /Fhshaders\vs.h +fxc ddsview.fx /nologo /EPS_1D /Tps_4_1 /Fhshaders\ps1D.h +fxc ddsview.fx /nologo /EPS_1DArray /Tps_4_1 /Fhshaders\ps1Darray.h +fxc ddsview.fx /nologo /EPS_2D /Tps_4_1 /Fhshaders\ps2D.h +fxc ddsview.fx /nologo /EPS_2DArray /Tps_4_1 /Fhshaders\ps2Darray.h +fxc ddsview.fx /nologo /EPS_3D /Tps_4_1 /Fhshaders\ps3D.h +fxc ddsview.fx /nologo /EPS_Cube /Tps_4_1 /Fhshaders\psCube.h diff --git a/DirectXTex/DirectXTex_2010.sln b/DirectXTex/DirectXTex_Desktop_2010.sln similarity index 93% rename from DirectXTex/DirectXTex_2010.sln rename to DirectXTex/DirectXTex_Desktop_2010.sln index 7606656..a75d4d1 100644 --- a/DirectXTex/DirectXTex_2010.sln +++ b/DirectXTex/DirectXTex_Desktop_2010.sln @@ -1,6 +1,6 @@ Microsoft Visual Studio Solution File, Format Version 11.00 # Visual Studio 2010 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DirectXTex", "DirectXTex_2010.vcxproj", "{371B9FA9-4C90-4AC6-A123-ACED756D6C77}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DirectXTex", "DirectXTex_Desktop_2010.vcxproj", "{371B9FA9-4C90-4AC6-A123-ACED756D6C77}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/DirectXTex/DirectXTex_2010.vcxproj b/DirectXTex/DirectXTex_Desktop_2010.vcxproj similarity index 100% rename from DirectXTex/DirectXTex_2010.vcxproj rename to DirectXTex/DirectXTex_Desktop_2010.vcxproj diff --git a/DirectXTex/DirectXTex_11_Desktop.vcxproj.filters b/DirectXTex/DirectXTex_Desktop_2010.vcxproj.filters similarity index 100% rename from DirectXTex/DirectXTex_11_Desktop.vcxproj.filters rename to DirectXTex/DirectXTex_Desktop_2010.vcxproj.filters diff --git a/DirectXTex/DirectXTex_11_Desktop.sln b/DirectXTex/DirectXTex_Desktop_2012.sln similarity index 93% rename from DirectXTex/DirectXTex_11_Desktop.sln rename to DirectXTex/DirectXTex_Desktop_2012.sln index d2057e8..a46cd18 100644 --- a/DirectXTex/DirectXTex_11_Desktop.sln +++ b/DirectXTex/DirectXTex_Desktop_2012.sln @@ -1,6 +1,6 @@ Microsoft Visual Studio Solution File, Format Version 11.00 # Visual Studio 2010 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DirectXTex", "DirectXTex_11_Desktop.vcxproj", "{371B9FA9-4C90-4AC6-A123-ACED756D6C77}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DirectXTex", "DirectXTex_Desktop_2012.vcxproj", "{371B9FA9-4C90-4AC6-A123-ACED756D6C77}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/DirectXTex/DirectXTex_11_Desktop.vcxproj b/DirectXTex/DirectXTex_Desktop_2012.vcxproj similarity index 100% rename from DirectXTex/DirectXTex_11_Desktop.vcxproj rename to DirectXTex/DirectXTex_Desktop_2012.vcxproj diff --git a/DirectXTex/DirectXTex_11_Metro.vcxproj.filters b/DirectXTex/DirectXTex_Desktop_2012.vcxproj.filters similarity index 100% rename from DirectXTex/DirectXTex_11_Metro.vcxproj.filters rename to DirectXTex/DirectXTex_Desktop_2012.vcxproj.filters diff --git a/DirectXTex/DirectXTex_11_Metro.sln b/DirectXTex/DirectXTex_Windows8.sln similarity index 95% rename from DirectXTex/DirectXTex_11_Metro.sln rename to DirectXTex/DirectXTex_Windows8.sln index 659f67b..febeaf9 100644 --- a/DirectXTex/DirectXTex_11_Metro.sln +++ b/DirectXTex/DirectXTex_Windows8.sln @@ -1,6 +1,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 2012 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DirectXTex", "DirectXTex_11_Metro.vcxproj", "{371B9FA9-4C90-4AC6-A123-ACED756D6C77}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DirectXTex", "DirectXTex_Windows8.vcxproj", "{371B9FA9-4C90-4AC6-A123-ACED756D6C77}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/DirectXTex/DirectXTex_11_Metro.vcxproj b/DirectXTex/DirectXTex_Windows8.vcxproj similarity index 94% rename from DirectXTex/DirectXTex_11_Metro.vcxproj rename to DirectXTex/DirectXTex_Windows8.vcxproj index af6af25..07fa9fe 100644 --- a/DirectXTex/DirectXTex_11_Metro.vcxproj +++ b/DirectXTex/DirectXTex_Windows8.vcxproj @@ -232,6 +232,9 @@ + + /IGNORE:4264 %(AdditionalOptions) + @@ -270,6 +273,9 @@ + + /IGNORE:4264 %(AdditionalOptions) + @@ -309,6 +315,9 @@ + + /IGNORE:4264 %(AdditionalOptions) + @@ -351,6 +360,9 @@ + + /IGNORE:4264 %(AdditionalOptions) + @@ -391,6 +403,9 @@ + + /IGNORE:4264 %(AdditionalOptions) + @@ -432,6 +447,9 @@ + + /IGNORE:4264 %(AdditionalOptions) + @@ -474,6 +492,9 @@ + + /IGNORE:4264 %(AdditionalOptions) + @@ -514,6 +535,9 @@ + + /IGNORE:4264 %(AdditionalOptions) + @@ -555,6 +579,9 @@ + + /IGNORE:4264 %(AdditionalOptions) + diff --git a/DirectXTex/DirectXTex_2010.vcxproj.filters b/DirectXTex/DirectXTex_Windows8.vcxproj.filters similarity index 100% rename from DirectXTex/DirectXTex_2010.vcxproj.filters rename to DirectXTex/DirectXTex_Windows8.vcxproj.filters diff --git a/Texconv/Texconv_11_Desktop.sln b/Texconv/Texconv_Desktop_2010.sln similarity index 92% rename from Texconv/Texconv_11_Desktop.sln rename to Texconv/Texconv_Desktop_2010.sln index fbde6e8..fe1bf83 100644 --- a/Texconv/Texconv_11_Desktop.sln +++ b/Texconv/Texconv_Desktop_2010.sln @@ -1,8 +1,8 @@ Microsoft Visual Studio Solution File, Format Version 11.00 # Visual Studio 2010 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "texconv", "Texconv_11_Desktop.vcxproj", "{C3A65381-8FD3-4F69-B29E-654B4B0ED136}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "texconv", "Texconv_Desktop_2010.vcxproj", "{C3A65381-8FD3-4F69-B29E-654B4B0ED136}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DirectXTex", "..\DirectXTex\DirectXTex_11_Desktop.vcxproj", "{371B9FA9-4C90-4AC6-A123-ACED756D6C77}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DirectXTex", "..\DirectXTex\DirectXTex_Desktop_2010.vcxproj", "{371B9FA9-4C90-4AC6-A123-ACED756D6C77}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/Texconv/texconv_2010.vcxproj b/Texconv/Texconv_Desktop_2010.vcxproj similarity index 97% rename from Texconv/texconv_2010.vcxproj rename to Texconv/Texconv_Desktop_2010.vcxproj index 016c393..18b842e 100644 --- a/Texconv/texconv_2010.vcxproj +++ b/Texconv/Texconv_Desktop_2010.vcxproj @@ -371,7 +371,7 @@ - + {371b9fa9-4c90-4ac6-a123-aced756d6c77} diff --git a/Texconv/Texconv_11_Desktop.vcxproj.filters b/Texconv/Texconv_Desktop_2010.vcxproj.filters similarity index 100% rename from Texconv/Texconv_11_Desktop.vcxproj.filters rename to Texconv/Texconv_Desktop_2010.vcxproj.filters diff --git a/Texconv/texconv_2010.sln b/Texconv/Texconv_Desktop_2012.sln similarity index 92% rename from Texconv/texconv_2010.sln rename to Texconv/Texconv_Desktop_2012.sln index c98d5ee..bf2237f 100644 --- a/Texconv/texconv_2010.sln +++ b/Texconv/Texconv_Desktop_2012.sln @@ -1,8 +1,8 @@ Microsoft Visual Studio Solution File, Format Version 11.00 # Visual Studio 2010 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "texconv", "texconv_2010.vcxproj", "{C3A65381-8FD3-4F69-B29E-654B4B0ED136}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "texconv", "Texconv_Desktop_2012.vcxproj", "{C3A65381-8FD3-4F69-B29E-654B4B0ED136}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DirectXTex", "..\DirectXTex\DirectXTex_2010.vcxproj", "{371B9FA9-4C90-4AC6-A123-ACED756D6C77}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DirectXTex", "..\DirectXTex\DirectXTex_Desktop_2012.vcxproj", "{371B9FA9-4C90-4AC6-A123-ACED756D6C77}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/Texconv/Texconv_11_Desktop.vcxproj b/Texconv/Texconv_Desktop_2012.vcxproj similarity index 97% rename from Texconv/Texconv_11_Desktop.vcxproj rename to Texconv/Texconv_Desktop_2012.vcxproj index 5de3ade..bcf583e 100644 --- a/Texconv/Texconv_11_Desktop.vcxproj +++ b/Texconv/Texconv_Desktop_2012.vcxproj @@ -378,7 +378,7 @@ - + {371b9fa9-4c90-4ac6-a123-aced756d6c77} diff --git a/Texconv/texconv_2010.vcxproj.filters b/Texconv/Texconv_Desktop_2012.vcxproj.filters similarity index 100% rename from Texconv/texconv_2010.vcxproj.filters rename to Texconv/Texconv_Desktop_2012.vcxproj.filters