diff --git a/plugins/GSdx/GSdx.rc b/plugins/GSdx/GSdx.rc index 7b8e9e4250..b5d9f1abdb 100644 --- a/plugins/GSdx/GSdx.rc +++ b/plugins/GSdx/GSdx.rc @@ -34,14 +34,15 @@ END 2 TEXTINCLUDE BEGIN - "#include ""afxres.h""\r\n" - "\0" + "#include ""afxres.h""\r\0" END 3 TEXTINCLUDE BEGIN - "\r\n" - "\0" + "#include ""res/tfx.fx""\r\n" + "#include ""res/convert.fx""\r\n" + "#include ""res/interlace.fx""\r\n" + "#include ""res/merge.fx""\r\0" END #endif // APSTUDIO_INVOKED @@ -301,7 +302,10 @@ END // // Generated from the TEXTINCLUDE 3 resource. // - +#include "res/tfx.fx" +#include "res/convert.fx" +#include "res/interlace.fx" +#include "res/merge.fx" ///////////////////////////////////////////////////////////////////////////// #endif // not APSTUDIO_INVOKED diff --git a/plugins/GSdx/GSdx_vs2008.vcproj b/plugins/GSdx/GSdx_vs2008.vcproj index bd785f7eef..058cdf34d4 100644 --- a/plugins/GSdx/GSdx_vs2008.vcproj +++ b/plugins/GSdx/GSdx_vs2008.vcproj @@ -2231,10 +2231,6 @@ RelativePath=".\GSdx.rc" > - - diff --git a/plugins/GSdx/res/convert.fx b/plugins/GSdx/res/convert.fx index 84fabfdbd3..0aec085cc8 100644 --- a/plugins/GSdx/res/convert.fx +++ b/plugins/GSdx/res/convert.fx @@ -1,3 +1,4 @@ +#ifdef SHADER_MODEL // make safe to include in resource file to enforce dependency #if SHADER_MODEL >= 0x400 struct VS_INPUT @@ -237,4 +238,5 @@ PS_OUTPUT ps_main6(PS_INPUT input) // diagonal return output; } -#endif \ No newline at end of file +#endif +#endif diff --git a/plugins/GSdx/res/interlace.fx b/plugins/GSdx/res/interlace.fx index f726051260..9f60713d93 100644 --- a/plugins/GSdx/res/interlace.fx +++ b/plugins/GSdx/res/interlace.fx @@ -1,3 +1,4 @@ +#ifdef SHADER_MODEL // make safe to include in resource file to enforce dependency #if SHADER_MODEL >= 0x400 Texture2D Texture; @@ -81,3 +82,4 @@ float4 ps_main3(float2 tex : TEXCOORD0) : COLOR } #endif +#endif diff --git a/plugins/GSdx/res/merge.fx b/plugins/GSdx/res/merge.fx index fc014c4a4e..1c68a552a1 100644 --- a/plugins/GSdx/res/merge.fx +++ b/plugins/GSdx/res/merge.fx @@ -1,3 +1,4 @@ +#ifdef SHADER_MODEL // make safe to include in resource file to enforce dependency #if SHADER_MODEL >= 0x400 Texture2D Texture; @@ -55,4 +56,5 @@ float4 ps_main1(PS_INPUT input) : COLOR return c.bgra; } -#endif \ No newline at end of file +#endif +#endif diff --git a/plugins/GSdx/res/tfx.fx b/plugins/GSdx/res/tfx.fx index 606fe4879f..b45bc70f28 100644 --- a/plugins/GSdx/res/tfx.fx +++ b/plugins/GSdx/res/tfx.fx @@ -1,3 +1,4 @@ +#ifdef SHADER_MODEL // make safe to include in resource file to enforce dependency #define FMT_32 0 #define FMT_24 1 #define FMT_16 2 @@ -726,4 +727,5 @@ float4 ps_main(PS_INPUT input) : COLOR return c; } -#endif \ No newline at end of file +#endif +#endif