Skip to content
This repository has been archived by the owner on Mar 30, 2019. It is now read-only.

Commit

Permalink
[Build] Fixed broken configuration for WinRT (as result of renaming W…
Browse files Browse the repository at this point in the history
…in8DX11_2 to Win8).
  • Loading branch information
ArtiomCiumac committed Nov 13, 2013
1 parent f559aa7 commit 42aa029
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 32 deletions.
2 changes: 1 addition & 1 deletion SharpDX.PreSettings.targets
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@
</PropertyGroup>

<!--.NET 4.5 - DirectX11.2 - Windows 8 Metro-->
<PropertyGroup Condition=" '$(Configuration)' == 'Win8DDebug' Or '$(Configuration)' == 'Win8Release' ">
<PropertyGroup Condition=" '$(Configuration)' == 'Win8Debug' Or '$(Configuration)' == 'Win8Release' ">
<SharpDXAssemblyType>DirectX11_2</SharpDXAssemblyType>
<SharpDXPlatform>winrt</SharpDXPlatform>
<SharpDXWin8>true</SharpDXWin8>
Expand Down
27 changes: 0 additions & 27 deletions SharpDX.sln
Original file line number Diff line number Diff line change
Expand Up @@ -208,9 +208,7 @@ Global
{618AFA87-81A8-4B1C-8876-5457D49F2DEF}.Release|Any CPU.Build.0 = Release|Any CPU
{618AFA87-81A8-4B1C-8876-5457D49F2DEF}.ToolsDebug|Any CPU.ActiveCfg = Net20Release|Any CPU
{618AFA87-81A8-4B1C-8876-5457D49F2DEF}.Win8Debug|Any CPU.ActiveCfg = Win8Debug|Any CPU
{618AFA87-81A8-4B1C-8876-5457D49F2DEF}.Win8Debug|Any CPU.Build.0 = Win8Debug|Any CPU
{618AFA87-81A8-4B1C-8876-5457D49F2DEF}.Win8Release|Any CPU.ActiveCfg = Win8Release|Any CPU
{618AFA87-81A8-4B1C-8876-5457D49F2DEF}.Win8Release|Any CPU.Build.0 = Win8Release|Any CPU
{618AFA87-81A8-4B1C-8876-5457D49F2DEF}.WP8Debug|Any CPU.ActiveCfg = WP8Debug|Any CPU
{618AFA87-81A8-4B1C-8876-5457D49F2DEF}.WP8Debug|Any CPU.Build.0 = WP8Debug|Any CPU
{618AFA87-81A8-4B1C-8876-5457D49F2DEF}.WP8Release|Any CPU.ActiveCfg = WP8Release|Any CPU
Expand Down Expand Up @@ -252,9 +250,7 @@ Global
{E927F2D5-8E27-462A-8687-CB207EE01164}.Release|Any CPU.Build.0 = Release|Any CPU
{E927F2D5-8E27-462A-8687-CB207EE01164}.ToolsDebug|Any CPU.ActiveCfg = Net20Release|Any CPU
{E927F2D5-8E27-462A-8687-CB207EE01164}.Win8Debug|Any CPU.ActiveCfg = Win8Debug|Any CPU
{E927F2D5-8E27-462A-8687-CB207EE01164}.Win8Debug|Any CPU.Build.0 = Win8Debug|Any CPU
{E927F2D5-8E27-462A-8687-CB207EE01164}.Win8Release|Any CPU.ActiveCfg = Win8Release|Any CPU
{E927F2D5-8E27-462A-8687-CB207EE01164}.Win8Release|Any CPU.Build.0 = Win8Release|Any CPU
{E927F2D5-8E27-462A-8687-CB207EE01164}.WP8Debug|Any CPU.ActiveCfg = WP8Debug|Any CPU
{E927F2D5-8E27-462A-8687-CB207EE01164}.WP8Debug|Any CPU.Build.0 = WP8Debug|Any CPU
{E927F2D5-8E27-462A-8687-CB207EE01164}.WP8Release|Any CPU.ActiveCfg = WP8Release|Any CPU
Expand Down Expand Up @@ -319,9 +315,7 @@ Global
{B4D984DF-85B8-4BBF-8C3B-5CEF905F40D9}.Release|Any CPU.Build.0 = Release|Any CPU
{B4D984DF-85B8-4BBF-8C3B-5CEF905F40D9}.ToolsDebug|Any CPU.ActiveCfg = Net20Release|Any CPU
{B4D984DF-85B8-4BBF-8C3B-5CEF905F40D9}.Win8Debug|Any CPU.ActiveCfg = Win8Debug|Any CPU
{B4D984DF-85B8-4BBF-8C3B-5CEF905F40D9}.Win8Debug|Any CPU.Build.0 = Win8Debug|Any CPU
{B4D984DF-85B8-4BBF-8C3B-5CEF905F40D9}.Win8Release|Any CPU.ActiveCfg = Win8Release|Any CPU
{B4D984DF-85B8-4BBF-8C3B-5CEF905F40D9}.Win8Release|Any CPU.Build.0 = Win8Release|Any CPU
{B4D984DF-85B8-4BBF-8C3B-5CEF905F40D9}.WP8Debug|Any CPU.ActiveCfg = WP8Debug|Any CPU
{B4D984DF-85B8-4BBF-8C3B-5CEF905F40D9}.WP8Debug|Any CPU.Build.0 = WP8Debug|Any CPU
{B4D984DF-85B8-4BBF-8C3B-5CEF905F40D9}.WP8Release|Any CPU.ActiveCfg = WP8Release|Any CPU
Expand All @@ -340,9 +334,7 @@ Global
{112F146B-7C01-490B-B943-EA9341ACCAF2}.Release|Any CPU.Build.0 = Release|Any CPU
{112F146B-7C01-490B-B943-EA9341ACCAF2}.ToolsDebug|Any CPU.ActiveCfg = Net20Release|Any CPU
{112F146B-7C01-490B-B943-EA9341ACCAF2}.Win8Debug|Any CPU.ActiveCfg = Win8Debug|Any CPU
{112F146B-7C01-490B-B943-EA9341ACCAF2}.Win8Debug|Any CPU.Build.0 = Win8Debug|Any CPU
{112F146B-7C01-490B-B943-EA9341ACCAF2}.Win8Release|Any CPU.ActiveCfg = Win8Release|Any CPU
{112F146B-7C01-490B-B943-EA9341ACCAF2}.Win8Release|Any CPU.Build.0 = Win8Release|Any CPU
{112F146B-7C01-490B-B943-EA9341ACCAF2}.WP8Debug|Any CPU.ActiveCfg = WP8Debug|Any CPU
{112F146B-7C01-490B-B943-EA9341ACCAF2}.WP8Debug|Any CPU.Build.0 = WP8Debug|Any CPU
{112F146B-7C01-490B-B943-EA9341ACCAF2}.WP8Release|Any CPU.ActiveCfg = WP8Release|Any CPU
Expand Down Expand Up @@ -430,7 +422,6 @@ Global
{9AA405CA-B7FD-44D0-9EBC-21F5D0F44DEB}.ToolsDebug|Any CPU.ActiveCfg = Debug|Any CPU
{9AA405CA-B7FD-44D0-9EBC-21F5D0F44DEB}.Win8Debug|Any CPU.ActiveCfg = Win8Debug|Any CPU
{9AA405CA-B7FD-44D0-9EBC-21F5D0F44DEB}.Win8Release|Any CPU.ActiveCfg = Release|Any CPU
{9AA405CA-B7FD-44D0-9EBC-21F5D0F44DEB}.Win8Release|Any CPU.Build.0 = Release|Any CPU
{9AA405CA-B7FD-44D0-9EBC-21F5D0F44DEB}.WP8Debug|Any CPU.ActiveCfg = Debug|Any CPU
{9AA405CA-B7FD-44D0-9EBC-21F5D0F44DEB}.WP8Debug|Any CPU.Build.0 = Debug|Any CPU
{9AA405CA-B7FD-44D0-9EBC-21F5D0F44DEB}.WP8Release|Any CPU.ActiveCfg = Release|Any CPU
Expand All @@ -449,9 +440,7 @@ Global
{4939860C-5D5B-4D56-89C8-1980A9EBB392}.Release|Any CPU.Build.0 = Release|Any CPU
{4939860C-5D5B-4D56-89C8-1980A9EBB392}.ToolsDebug|Any CPU.ActiveCfg = Net20Release|Any CPU
{4939860C-5D5B-4D56-89C8-1980A9EBB392}.Win8Debug|Any CPU.ActiveCfg = Win8Debug|Any CPU
{4939860C-5D5B-4D56-89C8-1980A9EBB392}.Win8Debug|Any CPU.Build.0 = Win8Debug|Any CPU
{4939860C-5D5B-4D56-89C8-1980A9EBB392}.Win8Release|Any CPU.ActiveCfg = Win8Release|Any CPU
{4939860C-5D5B-4D56-89C8-1980A9EBB392}.Win8Release|Any CPU.Build.0 = Win8Release|Any CPU
{4939860C-5D5B-4D56-89C8-1980A9EBB392}.WP8Debug|Any CPU.ActiveCfg = WP8Debug|Any CPU
{4939860C-5D5B-4D56-89C8-1980A9EBB392}.WP8Debug|Any CPU.Build.0 = WP8Debug|Any CPU
{4939860C-5D5B-4D56-89C8-1980A9EBB392}.WP8Release|Any CPU.ActiveCfg = WP8Release|Any CPU
Expand All @@ -472,9 +461,7 @@ Global
{05D17A7B-F200-48C0-B8F9-B7211665A17F}.Release|Any CPU.Build.0 = Release|Any CPU
{05D17A7B-F200-48C0-B8F9-B7211665A17F}.ToolsDebug|Any CPU.ActiveCfg = Net20Release|Any CPU
{05D17A7B-F200-48C0-B8F9-B7211665A17F}.Win8Debug|Any CPU.ActiveCfg = Win8Debug|Any CPU
{05D17A7B-F200-48C0-B8F9-B7211665A17F}.Win8Debug|Any CPU.Build.0 = Win8Debug|Any CPU
{05D17A7B-F200-48C0-B8F9-B7211665A17F}.Win8Release|Any CPU.ActiveCfg = Win8Release|Any CPU
{05D17A7B-F200-48C0-B8F9-B7211665A17F}.Win8Release|Any CPU.Build.0 = Win8Release|Any CPU
{05D17A7B-F200-48C0-B8F9-B7211665A17F}.WP8Debug|Any CPU.ActiveCfg = WP8Debug|Any CPU
{05D17A7B-F200-48C0-B8F9-B7211665A17F}.WP8Debug|Any CPU.Build.0 = WP8Debug|Any CPU
{05D17A7B-F200-48C0-B8F9-B7211665A17F}.WP8Release|Any CPU.ActiveCfg = WP8Release|Any CPU
Expand Down Expand Up @@ -532,9 +519,7 @@ Global
{874DEC63-9AB9-4A09-B1EA-E8FB1F1B68A1}.Release|Any CPU.Build.0 = Release|Any CPU
{874DEC63-9AB9-4A09-B1EA-E8FB1F1B68A1}.ToolsDebug|Any CPU.ActiveCfg = Net20Release|Any CPU
{874DEC63-9AB9-4A09-B1EA-E8FB1F1B68A1}.Win8Debug|Any CPU.ActiveCfg = Win8Debug|Any CPU
{874DEC63-9AB9-4A09-B1EA-E8FB1F1B68A1}.Win8Debug|Any CPU.Build.0 = Win8Debug|Any CPU
{874DEC63-9AB9-4A09-B1EA-E8FB1F1B68A1}.Win8Release|Any CPU.ActiveCfg = Win8Release|Any CPU
{874DEC63-9AB9-4A09-B1EA-E8FB1F1B68A1}.Win8Release|Any CPU.Build.0 = Win8Release|Any CPU
{874DEC63-9AB9-4A09-B1EA-E8FB1F1B68A1}.WP8Debug|Any CPU.ActiveCfg = WP8Debug|Any CPU
{874DEC63-9AB9-4A09-B1EA-E8FB1F1B68A1}.WP8Debug|Any CPU.Build.0 = WP8Debug|Any CPU
{874DEC63-9AB9-4A09-B1EA-E8FB1F1B68A1}.WP8Release|Any CPU.ActiveCfg = WP8Release|Any CPU
Expand Down Expand Up @@ -578,9 +563,7 @@ Global
{BBB50A46-3291-4C62-B884-D1AB64F71EA5}.Release|Any CPU.Build.0 = Release|Any CPU
{BBB50A46-3291-4C62-B884-D1AB64F71EA5}.ToolsDebug|Any CPU.ActiveCfg = Net20Release|Any CPU
{BBB50A46-3291-4C62-B884-D1AB64F71EA5}.Win8Debug|Any CPU.ActiveCfg = Win8Debug|Any CPU
{BBB50A46-3291-4C62-B884-D1AB64F71EA5}.Win8Debug|Any CPU.Build.0 = Win8Debug|Any CPU
{BBB50A46-3291-4C62-B884-D1AB64F71EA5}.Win8Release|Any CPU.ActiveCfg = Win8Release|Any CPU
{BBB50A46-3291-4C62-B884-D1AB64F71EA5}.Win8Release|Any CPU.Build.0 = Win8Release|Any CPU
{BBB50A46-3291-4C62-B884-D1AB64F71EA5}.WP8Debug|Any CPU.ActiveCfg = WP8Debug|Any CPU
{BBB50A46-3291-4C62-B884-D1AB64F71EA5}.WP8Debug|Any CPU.Build.0 = WP8Debug|Any CPU
{BBB50A46-3291-4C62-B884-D1AB64F71EA5}.WP8Release|Any CPU.ActiveCfg = WP8Release|Any CPU
Expand Down Expand Up @@ -668,9 +651,7 @@ Global
{8BFFF9D1-84EC-4FBA-9BEB-710ECF1857A8}.ToolsDebug|Any CPU.ActiveCfg = WP8Release|Any CPU
{8BFFF9D1-84EC-4FBA-9BEB-710ECF1857A8}.ToolsDebug|Any CPU.Build.0 = WP8Release|Any CPU
{8BFFF9D1-84EC-4FBA-9BEB-710ECF1857A8}.Win8Debug|Any CPU.ActiveCfg = Win8Debug|Any CPU
{8BFFF9D1-84EC-4FBA-9BEB-710ECF1857A8}.Win8Debug|Any CPU.Build.0 = Win8Debug|Any CPU
{8BFFF9D1-84EC-4FBA-9BEB-710ECF1857A8}.Win8Release|Any CPU.ActiveCfg = Win8Release|Any CPU
{8BFFF9D1-84EC-4FBA-9BEB-710ECF1857A8}.Win8Release|Any CPU.Build.0 = Win8Release|Any CPU
{8BFFF9D1-84EC-4FBA-9BEB-710ECF1857A8}.WP8Debug|Any CPU.ActiveCfg = WP8Debug|Any CPU
{8BFFF9D1-84EC-4FBA-9BEB-710ECF1857A8}.WP8Debug|Any CPU.Build.0 = WP8Debug|Any CPU
{8BFFF9D1-84EC-4FBA-9BEB-710ECF1857A8}.WP8Release|Any CPU.ActiveCfg = WP8Release|Any CPU
Expand All @@ -692,9 +673,7 @@ Global
{BCE106B4-0C81-4705-8A9C-C4C4F5EAB702}.ToolsDebug|Any CPU.ActiveCfg = WP8Release|Any CPU
{BCE106B4-0C81-4705-8A9C-C4C4F5EAB702}.ToolsDebug|Any CPU.Build.0 = WP8Release|Any CPU
{BCE106B4-0C81-4705-8A9C-C4C4F5EAB702}.Win8Debug|Any CPU.ActiveCfg = Win8Debug|Any CPU
{BCE106B4-0C81-4705-8A9C-C4C4F5EAB702}.Win8Debug|Any CPU.Build.0 = Win8Debug|Any CPU
{BCE106B4-0C81-4705-8A9C-C4C4F5EAB702}.Win8Release|Any CPU.ActiveCfg = Win8Release|Any CPU
{BCE106B4-0C81-4705-8A9C-C4C4F5EAB702}.Win8Release|Any CPU.Build.0 = Win8Release|Any CPU
{BCE106B4-0C81-4705-8A9C-C4C4F5EAB702}.WP8Debug|Any CPU.ActiveCfg = WP8Debug|Any CPU
{BCE106B4-0C81-4705-8A9C-C4C4F5EAB702}.WP8Debug|Any CPU.Build.0 = WP8Debug|Any CPU
{BCE106B4-0C81-4705-8A9C-C4C4F5EAB702}.WP8Release|Any CPU.ActiveCfg = WP8Release|Any CPU
Expand Down Expand Up @@ -740,9 +719,7 @@ Global
{7329B02D-C504-482A-A156-181D48CE493C}.ToolsDebug|Any CPU.ActiveCfg = WP8Release|Any CPU
{7329B02D-C504-482A-A156-181D48CE493C}.ToolsDebug|Any CPU.Build.0 = WP8Release|Any CPU
{7329B02D-C504-482A-A156-181D48CE493C}.Win8Debug|Any CPU.ActiveCfg = Win8Debug|Any CPU
{7329B02D-C504-482A-A156-181D48CE493C}.Win8Debug|Any CPU.Build.0 = Win8Debug|Any CPU
{7329B02D-C504-482A-A156-181D48CE493C}.Win8Release|Any CPU.ActiveCfg = Win8Release|Any CPU
{7329B02D-C504-482A-A156-181D48CE493C}.Win8Release|Any CPU.Build.0 = Win8Release|Any CPU
{7329B02D-C504-482A-A156-181D48CE493C}.WP8Debug|Any CPU.ActiveCfg = WP8Debug|Any CPU
{7329B02D-C504-482A-A156-181D48CE493C}.WP8Debug|Any CPU.Build.0 = WP8Debug|Any CPU
{7329B02D-C504-482A-A156-181D48CE493C}.WP8Release|Any CPU.ActiveCfg = WP8Release|Any CPU
Expand Down Expand Up @@ -808,9 +785,7 @@ Global
{90F4C7BC-7A08-4C0F-A5D7-ED9D1D3900D4}.Release|Any CPU.Build.0 = Release|Any CPU
{90F4C7BC-7A08-4C0F-A5D7-ED9D1D3900D4}.ToolsDebug|Any CPU.ActiveCfg = Release|Any CPU
{90F4C7BC-7A08-4C0F-A5D7-ED9D1D3900D4}.Win8Debug|Any CPU.ActiveCfg = Win8Debug|Any CPU
{90F4C7BC-7A08-4C0F-A5D7-ED9D1D3900D4}.Win8Debug|Any CPU.Build.0 = Win8Debug|Any CPU
{90F4C7BC-7A08-4C0F-A5D7-ED9D1D3900D4}.Win8Release|Any CPU.ActiveCfg = Win8Release|Any CPU
{90F4C7BC-7A08-4C0F-A5D7-ED9D1D3900D4}.Win8Release|Any CPU.Build.0 = Win8Release|Any CPU
{90F4C7BC-7A08-4C0F-A5D7-ED9D1D3900D4}.WP8Debug|Any CPU.ActiveCfg = WP8Debug|Any CPU
{90F4C7BC-7A08-4C0F-A5D7-ED9D1D3900D4}.WP8Release|Any CPU.ActiveCfg = WP8Release|Any CPU
{76FD0713-F217-4485-89B3-C6423DB46C58}.DIRECTX11_2Debug|Any CPU.ActiveCfg = DIRECTX11_2Debug|Any CPU
Expand All @@ -830,9 +805,7 @@ Global
{76FD0713-F217-4485-89B3-C6423DB46C58}.ToolsDebug|Any CPU.ActiveCfg = WP8Debug|Any CPU
{76FD0713-F217-4485-89B3-C6423DB46C58}.ToolsDebug|Any CPU.Build.0 = WP8Debug|Any CPU
{76FD0713-F217-4485-89B3-C6423DB46C58}.Win8Debug|Any CPU.ActiveCfg = Win8Debug|Any CPU
{76FD0713-F217-4485-89B3-C6423DB46C58}.Win8Debug|Any CPU.Build.0 = Win8Debug|Any CPU
{76FD0713-F217-4485-89B3-C6423DB46C58}.Win8Release|Any CPU.ActiveCfg = Win8Release|Any CPU
{76FD0713-F217-4485-89B3-C6423DB46C58}.Win8Release|Any CPU.Build.0 = Win8Release|Any CPU
{76FD0713-F217-4485-89B3-C6423DB46C58}.WP8Debug|Any CPU.ActiveCfg = WP8Debug|Any CPU
{76FD0713-F217-4485-89B3-C6423DB46C58}.WP8Debug|Any CPU.Build.0 = WP8Debug|Any CPU
{76FD0713-F217-4485-89B3-C6423DB46C58}.WP8Release|Any CPU.ActiveCfg = WP8Release|Any CPU
Expand Down
8 changes: 4 additions & 4 deletions Source/Tools/SharpGen/SharpGen.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -127,9 +127,9 @@
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
<CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Win8Debug|AnyCPU' ">
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Win8Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<OutputPath>bin\Win8DX11_2Debug\</OutputPath>
<OutputPath>bin\Win8Debug\</OutputPath>
<DefineConstants>TRACE;DEBUG;WIN8METRO;DIRECTX11_1;DIRECTX11_2</DefineConstants>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<DebugType>full</DebugType>
Expand All @@ -139,8 +139,8 @@
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
<CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Win8Release|AnyCPU' ">
<OutputPath>bin\Win8DX11_2Release\</OutputPath>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Win8Release|AnyCPU' ">
<OutputPath>bin\Win8Release\</OutputPath>
<DefineConstants>TRACE;WIN8METRO;DIRECTX11_1;DIRECTX11_2</DefineConstants>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<Optimize>true</Optimize>
Expand Down

0 comments on commit 42aa029

Please sign in to comment.