From 2c96d8cf446c5a9c1c8da85c5dafa4a71b196037 Mon Sep 17 00:00:00 2001 From: ramapcsx2 Date: Tue, 6 Mar 2012 18:28:59 +0000 Subject: [PATCH] GSdx: Attempt to fix the resource files so MSVC likes them again. There's still line ending inconsistencies in the .rc though. git-svn-id: http://pcsx2.googlecode.com/svn/trunk@5115 96395faa-99c1-11dd-bbfe-3dabce05a288 --- plugins/GSdx/GSdx.rc | 20 ++++++++++---------- plugins/GSdx/resource.h | 8 ++++---- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/plugins/GSdx/GSdx.rc b/plugins/GSdx/GSdx.rc index a022d1a667..e21e665780 100644 --- a/plugins/GSdx/GSdx.rc +++ b/plugins/GSdx/GSdx.rc @@ -42,7 +42,7 @@ BEGIN "#include ""res/interlace.fx""\r\n" "#include ""res/merge.fx""\r\0" "#include ""res/fxaa.fx""\r\0" - "#include ""res/shadeboost.fx""\r\0" + "#include ""res/shadeboost.fx""\r\0" END #endif // APSTUDIO_INVOKED @@ -58,7 +58,7 @@ IDR_TFX_FX RCDATA "res\\tfx.fx" IDR_MERGE_FX RCDATA "res\\merge.fx" IDR_INTERLACE_FX RCDATA "res\\interlace.fx" IDR_FXAA_FX RCDATA "res\\fxaa.fx" -IDR_CS_FX RCDATA "res\\cs.fx" +IDR_CS_FX RCDATA "res\\cs.fx" IDR_SHADEBOOST_FX RCDATA "res\\shadeboost.fx" ///////////////////////////////////////////////////////////////////////////// @@ -245,6 +245,14 @@ END #ifdef APSTUDIO_INVOKED GUIDELINES DESIGNINFO BEGIN + IDD_SHADEBOOST, DIALOG + BEGIN + LEFTMARGIN, 7 + RIGHTMARGIN, 309 + TOPMARGIN, 7 + BOTTOMMARGIN, 122 + END + IDD_CONFIG, DIALOG BEGIN LEFTMARGIN, 7 @@ -283,14 +291,6 @@ BEGIN TOPMARGIN, 6 BOTTOMMARGIN, 335 END - - IDD_SHADEBOOST, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 309 - TOPMARGIN, 7 - BOTTOMMARGIN, 122 - END END #endif // APSTUDIO_INVOKED diff --git a/plugins/GSdx/resource.h b/plugins/GSdx/resource.h index ed2799f09a..9c31d6fbf9 100644 --- a/plugins/GSdx/resource.h +++ b/plugins/GSdx/resource.h @@ -1,3 +1,7 @@ +//{{NO_DEPENDENCIES}} +// Microsoft Visual C++ generated include file. +// Used by GSdx.rc +// /* * Copyright (C) 2007-2009 Gabest * http://www.gabest.org @@ -19,10 +23,6 @@ * */ -//{{NO_DEPENDENCIES}} -// Microsoft Visual C++ generated include file. -// Used by GSdx.rc -// #define IDC_NATIVERES 2001 #define IDC_VSYNC 2002 #define IDC_PALTEX 2003