From 286f0d9478c4b30ff8116fc6939c1fd3647786f8 Mon Sep 17 00:00:00 2001 From: Glatzemann Date: Thu, 15 Nov 2012 07:37:53 +0000 Subject: [PATCH] build script improvement: only stock shaders which are needed for the build target are generated, not all anymore --- ...X.Framework.Content.Pipeline_PSVita.csproj | 25 +++++++++++++--- ANX.Framework/ANX.Framework_Linux.csproj | 1 + .../ANX.InputDevices.PsVita_Linux.csproj | 4 +-- .../ANX.InputDevices.PsVita_PSVita.csproj | 4 +-- ...X.InputDevices.Windows.Kinect_Linux.csproj | 4 +-- ....InputDevices.Windows.Kinect_PSVita.csproj | 4 +-- .../ANX.RenderSystem.GL3_Linux.csproj | 4 +-- .../ANX.RenderSystem.GL3_PSVita.csproj | 4 +-- ...ANX.RenderSystem.Windows.DX10_Linux.csproj | 6 ++-- ...NX.RenderSystem.Windows.DX10_PSVita.csproj | 6 ++-- ...ANX.RenderSystem.Windows.DX11_Linux.csproj | 12 +++----- ...NX.RenderSystem.Windows.DX11_PSVita.csproj | 16 +++------- Samples/SimpleNoContent/Manifest.appxmanifest | 4 +-- .../SimpleNoContent_Linux.csproj | 9 ------ .../SimpleNoContent_PSVita.csproj | 9 ------ .../SimpleNoContent_WindowsMetro.csproj | 7 +++-- .../ANX.SoundSystem.PsVita_Linux.csproj | 4 +-- .../ANX.SoundSystem.PsVita_PSVita.csproj | 4 +-- build/ANX.Framework.build | 29 ++++++++++++++++--- 19 files changed, 83 insertions(+), 73 deletions(-) diff --git a/ANX.Framework.Content.Pipeline/ANX.Framework.Content.Pipeline_PSVita.csproj b/ANX.Framework.Content.Pipeline/ANX.Framework.Content.Pipeline_PSVita.csproj index 0464ffe8..6cfecddc 100644 --- a/ANX.Framework.Content.Pipeline/ANX.Framework.Content.Pipeline_PSVita.csproj +++ b/ANX.Framework.Content.Pipeline/ANX.Framework.Content.Pipeline_PSVita.csproj @@ -62,6 +62,23 @@ + + + + + + + + + + + + + + + + + @@ -145,17 +162,20 @@ + + + @@ -180,6 +200,7 @@ + @@ -201,10 +222,6 @@ {6899F0C9-70B9-4EB0-9DD3-E598D4BE3E35} ANX.Framework - - {EB8258E0-6741-4DB9-B756-1EBDF67B1ED6} - ANX.RenderSystem.GL3 - {1986B0ED-3D28-4FEE-82D0-BCC39C87C18C} WaveUtils diff --git a/ANX.Framework/ANX.Framework_Linux.csproj b/ANX.Framework/ANX.Framework_Linux.csproj index bfce8852..21be853f 100644 --- a/ANX.Framework/ANX.Framework_Linux.csproj +++ b/ANX.Framework/ANX.Framework_Linux.csproj @@ -11,6 +11,7 @@ {6899F0C9-70B9-4EB0-9DD3-E598D4BE3E35} ANX.Framework ANX.Framework + v4.0 true diff --git a/InputSystems/ANX.InputDevices.PsVita/ANX.InputDevices.PsVita_Linux.csproj b/InputSystems/ANX.InputDevices.PsVita/ANX.InputDevices.PsVita_Linux.csproj index 5414a133..819fc399 100644 --- a/InputSystems/ANX.InputDevices.PsVita/ANX.InputDevices.PsVita_Linux.csproj +++ b/InputSystems/ANX.InputDevices.PsVita/ANX.InputDevices.PsVita_Linux.csproj @@ -21,7 +21,7 @@ TRACE;DEBUG;LINUX; prompt 4 - x86 + AnyCPU pdbonly @@ -30,7 +30,7 @@ TRACE;LINUX; prompt 4 - x86 + AnyCPU diff --git a/InputSystems/ANX.InputDevices.PsVita/ANX.InputDevices.PsVita_PSVita.csproj b/InputSystems/ANX.InputDevices.PsVita/ANX.InputDevices.PsVita_PSVita.csproj index bea6d676..ffbbe07f 100644 --- a/InputSystems/ANX.InputDevices.PsVita/ANX.InputDevices.PsVita_PSVita.csproj +++ b/InputSystems/ANX.InputDevices.PsVita/ANX.InputDevices.PsVita_PSVita.csproj @@ -21,7 +21,7 @@ TRACE;DEBUG;PSVITA; prompt 4 - x86 + AnyCPU pdbonly @@ -30,7 +30,7 @@ TRACE;PSVITA; prompt 4 - x86 + AnyCPU diff --git a/InputSystems/ANX.InputDevices.Windows.Kinect/ANX.InputDevices.Windows.Kinect_Linux.csproj b/InputSystems/ANX.InputDevices.Windows.Kinect/ANX.InputDevices.Windows.Kinect_Linux.csproj index 48932fb2..940dab3d 100644 --- a/InputSystems/ANX.InputDevices.Windows.Kinect/ANX.InputDevices.Windows.Kinect_Linux.csproj +++ b/InputSystems/ANX.InputDevices.Windows.Kinect/ANX.InputDevices.Windows.Kinect_Linux.csproj @@ -14,7 +14,7 @@ 512 - x86 + AnyCPU true full false @@ -24,7 +24,7 @@ 4 - x86 + AnyCPU pdbonly true ..\..\bin\Debug\ diff --git a/InputSystems/ANX.InputDevices.Windows.Kinect/ANX.InputDevices.Windows.Kinect_PSVita.csproj b/InputSystems/ANX.InputDevices.Windows.Kinect/ANX.InputDevices.Windows.Kinect_PSVita.csproj index 0d9c7504..c70a29a7 100644 --- a/InputSystems/ANX.InputDevices.Windows.Kinect/ANX.InputDevices.Windows.Kinect_PSVita.csproj +++ b/InputSystems/ANX.InputDevices.Windows.Kinect/ANX.InputDevices.Windows.Kinect_PSVita.csproj @@ -14,7 +14,7 @@ {69878862-DA7D-4DC6-B0A1-50D8FAB4242F};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - x86 + AnyCPU true full false @@ -24,7 +24,7 @@ 4 - x86 + AnyCPU pdbonly true ..\..\bin\Debug\ diff --git a/RenderSystems/ANX.Framework.GL3/ANX.RenderSystem.GL3_Linux.csproj b/RenderSystems/ANX.Framework.GL3/ANX.RenderSystem.GL3_Linux.csproj index 5f95f7d0..fe90ac3f 100644 --- a/RenderSystems/ANX.Framework.GL3/ANX.RenderSystem.GL3_Linux.csproj +++ b/RenderSystems/ANX.Framework.GL3/ANX.RenderSystem.GL3_Linux.csproj @@ -20,7 +20,7 @@ XNAEXT;DEBUG;TRACE;LINUX; prompt 4 - x86 + AnyCPU Auto true @@ -31,7 +31,7 @@ XNAEXT;TRACE;LINUX; prompt 4 - x86 + AnyCPU true diff --git a/RenderSystems/ANX.Framework.GL3/ANX.RenderSystem.GL3_PSVita.csproj b/RenderSystems/ANX.Framework.GL3/ANX.RenderSystem.GL3_PSVita.csproj index e464c6d3..e16d889e 100644 --- a/RenderSystems/ANX.Framework.GL3/ANX.RenderSystem.GL3_PSVita.csproj +++ b/RenderSystems/ANX.Framework.GL3/ANX.RenderSystem.GL3_PSVita.csproj @@ -21,7 +21,7 @@ XNAEXT;DEBUG;TRACE;PSVITA; prompt 4 - x86 + AnyCPU Auto true @@ -32,7 +32,7 @@ XNAEXT;TRACE;PSVITA; prompt 4 - x86 + AnyCPU true diff --git a/RenderSystems/ANX.RenderSystem.Windows.DX10/ANX.RenderSystem.Windows.DX10_Linux.csproj b/RenderSystems/ANX.RenderSystem.Windows.DX10/ANX.RenderSystem.Windows.DX10_Linux.csproj index cf23137b..79eac468 100644 --- a/RenderSystems/ANX.RenderSystem.Windows.DX10/ANX.RenderSystem.Windows.DX10_Linux.csproj +++ b/RenderSystems/ANX.RenderSystem.Windows.DX10/ANX.RenderSystem.Windows.DX10_Linux.csproj @@ -20,8 +20,8 @@ ..\..\bin\Debug\ XNAEXT DX10;DEBUG;TRACE;LINUX; prompt - 4 - x86 + 0 + AnyCPU true @@ -31,7 +31,7 @@ XNAEXT DX10;TRACE;LINUX; prompt 4 - x86 + AnyCPU true diff --git a/RenderSystems/ANX.RenderSystem.Windows.DX10/ANX.RenderSystem.Windows.DX10_PSVita.csproj b/RenderSystems/ANX.RenderSystem.Windows.DX10/ANX.RenderSystem.Windows.DX10_PSVita.csproj index c2483902..6d6cdbe0 100644 --- a/RenderSystems/ANX.RenderSystem.Windows.DX10/ANX.RenderSystem.Windows.DX10_PSVita.csproj +++ b/RenderSystems/ANX.RenderSystem.Windows.DX10/ANX.RenderSystem.Windows.DX10_PSVita.csproj @@ -20,8 +20,8 @@ ..\..\bin\Debug\ XNAEXT DX10;DEBUG;TRACE;PSVITA; prompt - 4 - x86 + 0 + AnyCPU true @@ -31,7 +31,7 @@ XNAEXT DX10;TRACE;PSVITA; prompt 4 - x86 + AnyCPU true diff --git a/RenderSystems/ANX.RenderSystem.Windows.DX11/ANX.RenderSystem.Windows.DX11_Linux.csproj b/RenderSystems/ANX.RenderSystem.Windows.DX11/ANX.RenderSystem.Windows.DX11_Linux.csproj index 802b95c3..6d6f6d93 100644 --- a/RenderSystems/ANX.RenderSystem.Windows.DX11/ANX.RenderSystem.Windows.DX11_Linux.csproj +++ b/RenderSystems/ANX.RenderSystem.Windows.DX11/ANX.RenderSystem.Windows.DX11_Linux.csproj @@ -14,22 +14,22 @@ 512 - x86 + AnyCPU true full false ..\..\bin\Debug\ - XNAEXT DX11;DEBUG;TRACE;LINUX; + DX11;XNAEXT;DEBUG;TRACE;LINUX; prompt 4 true - x86 + AnyCPU pdbonly true ..\..\bin\Release\ - XNAEXT DX11;TRACE;LINUX; + DX11;XNAEXT;TRACE;LINUX; prompt 4 true @@ -42,10 +42,6 @@ {6899F0C9-70B9-4EB0-9DD3-E598D4BE3E35} ANX.Framework - - {A4D3AD34-E49C-4142-8620-2AFF44ED6719} - ANX.BaseDirectX - diff --git a/RenderSystems/ANX.RenderSystem.Windows.DX11/ANX.RenderSystem.Windows.DX11_PSVita.csproj b/RenderSystems/ANX.RenderSystem.Windows.DX11/ANX.RenderSystem.Windows.DX11_PSVita.csproj index 3b11c99c..2c9e1d5e 100644 --- a/RenderSystems/ANX.RenderSystem.Windows.DX11/ANX.RenderSystem.Windows.DX11_PSVita.csproj +++ b/RenderSystems/ANX.RenderSystem.Windows.DX11/ANX.RenderSystem.Windows.DX11_PSVita.csproj @@ -14,22 +14,22 @@ {69878862-DA7D-4DC6-B0A1-50D8FAB4242F};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - x86 + AnyCPU true full false ..\..\bin\Debug\ - XNAEXT DX11;DEBUG;TRACE;PSVITA; + DX11;XNAEXT;DEBUG;TRACE;PSVITA; prompt 4 true - x86 + AnyCPU pdbonly true ..\..\bin\Release\ - XNAEXT DX11;TRACE;PSVITA; + DX11;XNAEXT;TRACE;PSVITA; prompt 4 true @@ -42,14 +42,6 @@ {6899F0C9-70B9-4EB0-9DD3-E598D4BE3E35} ANX.Framework - - {A4D3AD34-E49C-4142-8620-2AFF44ED6719} - ANX.BaseDirectX - - - {5BE49183-2F6F-4527-AC90-D816911FCF90} - ANX.RenderSystem.Windows.DX10 - diff --git a/Samples/SimpleNoContent/Manifest.appxmanifest b/Samples/SimpleNoContent/Manifest.appxmanifest index f808b52f..e2b4fa18 100644 --- a/Samples/SimpleNoContent/Manifest.appxmanifest +++ b/Samples/SimpleNoContent/Manifest.appxmanifest @@ -1,6 +1,6 @@ - + - + SimpleNoContent ANX Developer Team diff --git a/Samples/SimpleNoContent/SimpleNoContent_Linux.csproj b/Samples/SimpleNoContent/SimpleNoContent_Linux.csproj index c456430f..94da87d1 100644 --- a/Samples/SimpleNoContent/SimpleNoContent_Linux.csproj +++ b/Samples/SimpleNoContent/SimpleNoContent_Linux.csproj @@ -35,15 +35,6 @@ - - - - - - - - - diff --git a/Samples/SimpleNoContent/SimpleNoContent_PSVita.csproj b/Samples/SimpleNoContent/SimpleNoContent_PSVita.csproj index a59bc8d0..fcc41dbf 100644 --- a/Samples/SimpleNoContent/SimpleNoContent_PSVita.csproj +++ b/Samples/SimpleNoContent/SimpleNoContent_PSVita.csproj @@ -38,15 +38,6 @@ - - - - - - - - - diff --git a/Samples/SimpleNoContent/SimpleNoContent_WindowsMetro.csproj b/Samples/SimpleNoContent/SimpleNoContent_WindowsMetro.csproj index 6a1572cb..dea11f15 100644 --- a/Samples/SimpleNoContent/SimpleNoContent_WindowsMetro.csproj +++ b/Samples/SimpleNoContent/SimpleNoContent_WindowsMetro.csproj @@ -11,8 +11,7 @@ 512 {BC8A1FFA-BEE3-4634-8014-F334798102B3};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} en-US - SimpleNoContent_WindowsMetro_TemporaryKey.pfx - 1C2E795E3865B788B3FBA2FE1F8BB56353190C08 + Test_TemporaryKey.pfx AnyCPU @@ -36,6 +35,9 @@ anx.ico + + + @@ -70,7 +72,6 @@ --> - Designer diff --git a/SoundSystems/ANX.SoundSystem.PsVita/ANX.SoundSystem.PsVita_Linux.csproj b/SoundSystems/ANX.SoundSystem.PsVita/ANX.SoundSystem.PsVita_Linux.csproj index 9f3c8c8f..7c3314fa 100644 --- a/SoundSystems/ANX.SoundSystem.PsVita/ANX.SoundSystem.PsVita_Linux.csproj +++ b/SoundSystems/ANX.SoundSystem.PsVita/ANX.SoundSystem.PsVita_Linux.csproj @@ -21,7 +21,7 @@ TRACE;DEBUG;LINUX; prompt 4 - x86 + AnyCPU pdbonly @@ -30,7 +30,7 @@ TRACE;LINUX; prompt 4 - x86 + AnyCPU diff --git a/SoundSystems/ANX.SoundSystem.PsVita/ANX.SoundSystem.PsVita_PSVita.csproj b/SoundSystems/ANX.SoundSystem.PsVita/ANX.SoundSystem.PsVita_PSVita.csproj index 9b10cca5..131a813b 100644 --- a/SoundSystems/ANX.SoundSystem.PsVita/ANX.SoundSystem.PsVita_PSVita.csproj +++ b/SoundSystems/ANX.SoundSystem.PsVita/ANX.SoundSystem.PsVita_PSVita.csproj @@ -21,7 +21,7 @@ TRACE;DEBUG;PSVITA; prompt 4 - x86 + AnyCPU pdbonly @@ -30,7 +30,7 @@ TRACE;PSVITA; prompt 4 - x86 + AnyCPU diff --git a/build/ANX.Framework.build b/build/ANX.Framework.build index 7b4eab43..752f0df4 100644 --- a/build/ANX.Framework.build +++ b/build/ANX.Framework.build @@ -275,12 +275,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + - - - - +