Fix RenderLib sometimes using old shaders.

sq · Feb 14, 2013 · 208c0e4 · 208c0e4
1 parent 94daf9c
commit 208c0e4
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/Squared/DummyContentContainer/DummyContentContainer.csproj b/Squared/DummyContentContainer/DummyContentContainer.csproj
@@ -21,7 +21,7 @@
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>bin\x86\Debug</OutputPath>
+    <OutputPath>bin\</OutputPath>
     <DefineConstants>DEBUG;TRACE;WINDOWS</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
@@ -33,7 +33,7 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>bin\x86\Release</OutputPath>
+    <OutputPath>bin\</OutputPath>
     <DefineConstants>TRACE;WINDOWS</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>

diff --git a/Squared/RenderLib/Shaders.resx b/Squared/RenderLib/Shaders.resx
@@ -119,15 +119,15 @@
   </resheader>
   <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
   <data name="GaussianBlur" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\DummyContentContainer\bin\x86\Debug\RenderLibContent\GaussianBlur.xnb;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>..\DummyContentContainer\bin\RenderLibContent\GaussianBlur.xnb;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name="Lightmap" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\DummyContentContainer\bin\x86\Debug\RenderLibContent\Lightmap.xnb;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>..\DummyContentContainer\bin\RenderLibContent\Lightmap.xnb;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name="SquaredBitmapShader" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\DummyContentContainer\bin\x86\Debug\RenderLibContent\SquaredBitmapShader.xnb;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>..\DummyContentContainer\bin\RenderLibContent\SquaredBitmapShader.xnb;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name="SquaredGeometryShader" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\DummyContentContainer\bin\x86\Debug\RenderLibContent\SquaredGeometryShader.xnb;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>..\DummyContentContainer\bin\RenderLibContent\SquaredGeometryShader.xnb;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
 </root>