diff --git a/README_BUILD_FIRESTORM_WIN32.txt b/README_BUILD_FIRESTORM_WIN32.txt index 8bccfedf49..46c529b62a 100644 --- a/README_BUILD_FIRESTORM_WIN32.txt +++ b/README_BUILD_FIRESTORM_WIN32.txt @@ -1,15 +1,17 @@ Before you start configuring your Windows build system, be aware of our tested configurations: Memory: You will need at least 2GB RAM - CPU: Multiple CPUs are strongly recommended. A build can take over an hour. + CPU: Multiple CPUs are strongly recommended. + A build can take over an hour. Tested Build Environments: - WinXPSP3, 32bit, 2GB RAM, Visual Studio Pro 2005 SP1, latest VC++ runtime installed + WinXPSP3, 32bit, 2GB RAM, Visual Studio Pro 2005 SP1, + latest VC++ runtime installed -If you are not using something that closely matches a tested configuration, you may run into trouble, -particularly with different versions of Visual Studio. If you are running VS2008, you may be able to build -the viewer for your local machine, but not package it into an installer. +If you are not using something that closely matches a tested configuration, you +may run into trouble, particularly with different versions of Visual Studio. If you are running VS2008, you may be able to build the viewer for your local machine, but not package it into an installer. -To get started, follow the snowstorm instructions for setting up a windows build environment at this page: -http://wiki.secondlife.com/wiki/Viewer_2_Microsoft_Windows_Builds +A free download of VS2005Express can be used to compile firestorm. You can download this at http://download.microsoft.com/download/8/3/a/83aad8f9-38ba-4503-b3cd-ba28c360c27b/ENU/vcsetup.exe + +To get started, follow the snowstorm instructions for setting up a windows build environment at this page: http://wiki.secondlife.com/wiki/Viewer_2_Microsoft_Windows_Builds GET THE PHOENIX SOURCE diff --git a/indra/newview/res/viewerRes.rc b/indra/newview/res/viewerRes.rc index 7fad4bc739..9d2d4ad77f 100644 --- a/indra/newview/res/viewerRes.rc +++ b/indra/newview/res/viewerRes.rc @@ -2,12 +2,24 @@ // #include "resource.h" +#ifdef IDC_STATIC + +#undef IDC_STATIC + +#endif + +#define IDC_STATIC (-1) + +#include "WinResrc.h" + + + #define APSTUDIO_READONLY_SYMBOLS ///////////////////////////////////////////////////////////////////////////// // // Generated from the TEXTINCLUDE 2 resource. // -#include "winres.h" +//#include "winres.h" ///////////////////////////////////////////////////////////////////////////// #undef APSTUDIO_READONLY_SYMBOLS