From d7d94460d06b959cad5fc12aa72092b89fbd1abc Mon Sep 17 00:00:00 2001 From: Wolfpup Lowenhar Date: Sun, 15 May 2011 21:57:27 -0400 Subject: STORM-859 : Replacing winres.h with windows.h so that the viewer will build with-out having to copy any files to the source tree when useing express versions of Visual Studio. --- indra/newview/res/resource.h | 1 + indra/newview/res/viewerRes.rc | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'indra/newview/res') diff --git a/indra/newview/res/resource.h b/indra/newview/res/resource.h index 28813be896..01d90da971 100644 --- a/indra/newview/res/resource.h +++ b/indra/newview/res/resource.h @@ -38,6 +38,7 @@ #define IDC_CURSOR5 154 #define IDI_LCD_LL_ICON 157 #define IDC_CURSOR6 158 +#define IDC_STATIC 1000 #define IDC_RADIO_56 1000 #define IDC_RADIO_128 1001 #define IDC_RADIO_256 1002 diff --git a/indra/newview/res/viewerRes.rc b/indra/newview/res/viewerRes.rc index 5e8cee1f5f..38d04b4b5c 100644 --- a/indra/newview/res/viewerRes.rc +++ b/indra/newview/res/viewerRes.rc @@ -7,7 +7,7 @@ // // Generated from the TEXTINCLUDE 2 resource. // -#include "winres.h" +#include "windows.h" ///////////////////////////////////////////////////////////////////////////// #undef APSTUDIO_READONLY_SYMBOLS @@ -34,7 +34,7 @@ END 2 TEXTINCLUDE BEGIN - "#include ""winres.h""\r\n" + "#include ""windows.h""\r\n" "\0" END -- cgit v1.2.3