From 000f102722b2aa478a96a7e5b674d5e3d78aeb53 Mon Sep 17 00:00:00 2001 From: Shyotl Date: Tue, 15 Feb 2011 17:17:45 -0600 Subject: [PATCH] Backwards compatability for pre VC9 installs lacking updated resource compiler. (Uses pre-vista icon format) To support newer icon with VC8: -Replace VC/bin/rcdll.dll with newer from Windows SDK 7.0 -Run develop.py with -DVISTA_ICON:BOOL=ON setting --- indra/cmake/Variables.cmake | 1 + indra/develop.py | 3 + indra/newview/CMakeLists.txt | 20 ++- indra/newview/res/singularity_icon_bc.ico | Bin 0 -> 5430 bytes indra/newview/res/viewerRes_bc.rc | 193 ++++++++++++++++++++++ 5 files changed, 211 insertions(+), 6 deletions(-) create mode 100644 indra/newview/res/singularity_icon_bc.ico create mode 100644 indra/newview/res/viewerRes_bc.rc diff --git a/indra/cmake/Variables.cmake b/indra/cmake/Variables.cmake index 2f6dd3fe4..adfa08429 100644 --- a/indra/cmake/Variables.cmake +++ b/indra/cmake/Variables.cmake @@ -31,6 +31,7 @@ set(SCRIPTS_DIR ${CMAKE_SOURCE_DIR}/${SCRIPTS_PREFIX}) set(SERVER_DIR ${CMAKE_SOURCE_DIR}/${SERVER_PREFIX}) set(VIEWER_DIR ${CMAKE_SOURCE_DIR}/${VIEWER_PREFIX}) set(LL_TESTS ON CACHE BOOL "Build and run unit and integration tests (disable for build timing runs to reduce variation)") +set(VISTA_ICON OFF CACHE BOOL "Allow vista icon with pre 2008 Visual Studio IDEs. (Assumes replacement old rcdll.dll with new rcdll.dll from win sdk 7.0 or later)") set(LIBS_PREBUILT_DIR ${CMAKE_SOURCE_DIR}/../libraries CACHE PATH "Location of prebuilt libraries.") diff --git a/indra/develop.py b/indra/develop.py index a4b251e19..35b8aa753 100755 --- a/indra/develop.py +++ b/indra/develop.py @@ -755,6 +755,9 @@ Command-options for "configure": -DVIEWER:BOOL=OFF Don't configure the viewer -DPACKAGE:BOOL=ON Create "package" target to make installers -DLOCALIZESETUP:BOOL=ON Create one win_setup target per supported language + -DLL_TESTS:BOOL=OFF Don't generate unit test projects + -DEXAMPLEPLUGIN:BOOL=OFF Don't generate example plugin project + -VISTA_ICON:BOOL=ON Allow pre-2008 VS to use vista-optimized resource file. (Requires updated rcdll.dll!) Examples: Set up a viewer-only project for your system: diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index c4137963b..d856b9893 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -1118,12 +1118,20 @@ if (WINDOWS) include_directories(${ARTWORK_DIR}/res) endif(NOT ARTWORK_IN_SOURCE) - set(viewer_RESOURCE_FILES - res/resource.h - res/viewerRes.rc - ${viewer_RESOURCE_FILES} - ) - + if (MSVC71 OR MSVC80 AND NOT VISTA_ICON) + set(viewer_RESOURCE_FILES + res/resource.h + res/viewerRes_bc.rc + ${viewer_RESOURCE_FILES} + ) + else (MSVC71 OR MSVC80 AND NOT VISTA_ICON) + set(viewer_RESOURCE_FILES + res/resource.h + res/viewerRes.rc + ${viewer_RESOURCE_FILES} + ) + endif (MSVC71 OR MSVC80 AND NOT VISTA_ICON) + SOURCE_GROUP("Resource Files" FILES ${viewer_RESOURCE_FILES}) list(APPEND viewer_SOURCE_FILES ${viewer_RESOURCE_FILES}) diff --git a/indra/newview/res/singularity_icon_bc.ico b/indra/newview/res/singularity_icon_bc.ico new file mode 100644 index 0000000000000000000000000000000000000000..1287f3e2096bd5f8df46fafca3ee055a80d1eddd GIT binary patch literal 5430 zcma)=cTAS+8OC1_L~($)aR4rG@4ffLz4rze)`45Wz4xfvI2vuV#8GSNF-9ZWYK*a- zM%$dz6-|>iZU30#1k38_z0)gb_dB692pXa*gb>Ht71YtpVkeC=~O$@Ha z20@b`2x7JJIXxl>Ug|nU_w-26N5Xygm%n`aP^$l7dMdnq`}UEN=w{8D#WiZwsBV0G zd~&sF)!J38Sg}V`R8)V-KvsS3sr&6~*RGw?uwlb`DJdycTeWIcf&H8#;k*+6va+(m zCrp@7cI3#Bl_c?f`}S?#ty{OgI%A6PSLob5b?Vf)ARWG_S+nM^YSgIljI~y+TDQ3` z{r0zP*)p?3hYr(w^ytxl;J|?`IEV8VE?kHnMd=VG+=x}HR#iw(Pp>g|?%d=lQ>OG7 zH*Vb65hF&V4Hz(BL&uIC&&i%In>1^nVA{Ca^=dDrAwD~TCiZj zfH`yKj2Sd&&^p=uIw>hBFEKIE8Z>BNto~Z|T5@u-)1yU;7S_6TYm*Mvy?ggJ(%}dC zYp{O(`s&zLl>OkJIddjbYqTU*&(_?yabp5{$et4k2?-zS)vITS;_5`cx4L!fx_kQG z>D0J!V*}soApe{EZ}Q!>@#DwG72|jB3j80Qlao^hT@?Qq*?G%jD#li|YE_Gii*qZV zt5>gXin%G~R=otE*s)_1JXlGqo{x}ke*w1g%HhSv z##-gdl}-8WgzG9*s+e-!Jwxoh4&;R5h=*JZ$N}+? zsUA(7U^8aS`03~P;*;Na-xGh%7&U5?O`bg24jw#cSFc`mtGL45C!RXTRI7IS^l7_w z>z3WPal`qDTBHu(0&<{h*RC!HJ-&SSK~l@>pl7wEv4QV#v3cLVeYS4hI_uS|m&-3~ zK!5R~vxU4SzQo$|ApFExMb$tEzRjOMKRpD05od^VU5j0rfyW zk|Wdzxk22(M&M?T@8d5XD)7H})zZ?^ay-6x>WAV+n>TNs9Y22DmM>rKgnZ>(@YLU& zP-6yR)(Lz<~qbp@VXG3wfNKo$X@Dxts~N z;9oE31Mh*4&%yS60Gr_+U;Eha`LAEUel~pgaF;jgg?9e@d3*i(_0PQhs^1^u7ve_z zumygB2RzrK3)kEO7mnf?YK1-G4!0lMeci!7o_nZ$>hsZ~M|S`IeY<({=I_j`3_9q! zYwTe!x$AYnHm{5CeIC<)hp$4heg7lx@IAJx2iv`S_w4!e=dO<7FZH^2!gsTPp4~;i z!e?-|*MYOa$3`!F$34D7PkfHw&>d`eRmN}ENu?-x!5%Ip}J9Hu5@Bn+^tF2qNI*xq$^r>CCbjjs2xlO*FJ9o|w zA3khr)~ta`k9vIhsZy6NUH(J9P&3#;Jn#kQqYGGwdZ=yQyxH}dqeqXrn!!GNOI$TS z*sfi>jCzJ2XU?2yM~)n^3l}b!<|`Kq_(d@o?D1JuBUj-`{NQ7O9$Zty_?Noey?eLa zzI~hc*|lreoL^6!I_3C^x+c%4H?WT#J7#Ckp0%}W*P7-z*PAq7q2FJngC_ODKl!jD z+)Le(xA+2V{6SuD4}K7DIBd9CGaCKO^>*qTp2Rl##m=2O;aF3zbG%0XqEFMK_5IpH zX-+h5AZzu&ZJ)1Os)&s6U@%I|fWAKI1nJf2ezGJ79omRrUwJIwNe zAnT*(@Y^6rcpn5YlBl5pNbX6MR^U9$3MsAj(X>L-6tKl?y0%YSG3D8BoXcx9`2s|oMS+8@Rl?3a{NoU5uA z{77>^9&{M%m?Vge%^V(rtjzG=FSyHD!TFvILuS{ zl52!>>G9YNEyg#VNxxR>h>5rPbIuQfK z^b2x>_|V(g$MfPS$6Ih4zGXh*Jl=2xmvmxGE&Tj702%y}a3mZIKjSlc z5A&}0Al1j8Rqr$l)I0L%m&BL%NbIH85L0*+T;(0Pu`_h9zm{JoO5VZ$_!vB};YIWo z@BdqS3-ZqI3th$CapKc8;?PIpw7-eB{~^q0`W<1L^0;p3vs_zN5WJ5Gg11pYkgKU3 S$(C1&6TW{dVb4eX^7CJ4U0M?W literal 0 HcmV?d00001 diff --git a/indra/newview/res/viewerRes_bc.rc b/indra/newview/res/viewerRes_bc.rc new file mode 100644 index 000000000..bbcecf38c --- /dev/null +++ b/indra/newview/res/viewerRes_bc.rc @@ -0,0 +1,193 @@ +// Microsoft Visual C++ generated resource script. +// +#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. +// +// Commented out because it only compiles if you have MFC installed. +//#include "winres.h" + +///////////////////////////////////////////////////////////////////////////// +#undef APSTUDIO_READONLY_SYMBOLS + +///////////////////////////////////////////////////////////////////////////// +// English (U.S.) resources + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) +#ifdef _WIN32 +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US +#pragma code_page(1252) +#endif //_WIN32 + +#ifdef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// TEXTINCLUDE +// + +1 TEXTINCLUDE +BEGIN + "resource.h\0" +END + +2 TEXTINCLUDE +BEGIN + "#include ""winres.h""\r\n" + "\0" +END + +3 TEXTINCLUDE +BEGIN + "\r\n" + "\0" +END + +#endif // APSTUDIO_INVOKED + + +///////////////////////////////////////////////////////////////////////////// +// +// Icon +// + +// Icon with lowest ID value placed first to ensure application icon +// remains consistent on all systems. +IDI_LL_ICON ICON "singularity_icon_bc.ico" +IDI_LCD_LL_ICON ICON "singularity_icon_bc.ico" + +///////////////////////////////////////////////////////////////////////////// +// +// Dialog +// + +SPLASHSCREEN DIALOG 32, 32, 144, 34 +STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE +FONT 8, "MS Sans Serif" +BEGIN + ICON IDI_LL_ICON,IDC_STATIC,7,7,20,20 + LTEXT "Loading Second Life...",666,36,13,91,8 +END + + +///////////////////////////////////////////////////////////////////////////// +// +// DESIGNINFO +// + +#ifdef APSTUDIO_INVOKED +GUIDELINES DESIGNINFO +BEGIN + + "SPLASHSCREEN", DIALOG + BEGIN + LEFTMARGIN, 7 + RIGHTMARGIN, 137 + VERTGUIDE, 36 + TOPMARGIN, 7 + BOTTOMMARGIN, 27 + END +END +#endif // APSTUDIO_INVOKED + + +///////////////////////////////////////////////////////////////////////////// +// +// Cursor +// + +TOOLGRAB CURSOR "lltoolgrab.cur" +TOOLLAND CURSOR "lltoolland.cur" +TOOLZOOMIN CURSOR "lltoolzoomin.cur" +TOOLCREATE CURSOR "lltoolcreate.cur" +ARROWDRAG CURSOR "llarrowdrag.cur" +ARROW CURSOR "llarrow.cur" +NOLOCKED CURSOR "llnolocked.cur" +ARROWLOCKED CURSOR "llarrowlocked.cur" +GRABLOCKED CURSOR "llgrablocked.cur" +TOOLROTATE CURSOR "lltoolrotate.cur" +TOOLTRANSLATE CURSOR "lltooltranslate.cur" +TOOLSCALE CURSOR "lltoolscale.cur" +TOOLCAMERA CURSOR "lltoolcamera.cur" +TOOLPAN CURSOR "lltoolpan.cur" +TOOLFOCUS CURSOR "lltoolfocus.cur" +TOOLPICKOBJECT3 CURSOR "toolpickobject3.cur" +ARROWCOPY CURSOR "arrowcop.cur" +ARROWDRAGMULTI CURSOR "llarrowdragmulti.cur" +ARROWCOPYMULTI CURSOR "arrowcopmulti.cur" +TOOLSIT CURSOR "toolsit.cur" +TOOLBUY CURSOR "toolbuy.cur" +TOOLPAY CURSOR "toolpay.cur" +TOOLOPEN CURSOR "toolopen.cur" +TOOLPIPETTE CURSOR "toolpipette.cur" +TOOLPLAY CURSOR "toolplay.cur" +TOOLPAUSE CURSOR "toolpause.cur" +TOOLMEDIAOPEN CURSOR "toolmediaopen.cur" + +///////////////////////////////////////////////////////////////////////////// +// +// Version +// + +VS_VERSION_INFO VERSIONINFO + FILEVERSION 1,5,0,0 + PRODUCTVERSION 1,5,0,0 + FILEFLAGSMASK 0x3fL +#ifdef _DEBUG + FILEFLAGS 0x1L +#else + FILEFLAGS 0x0L +#endif + FILEOS 0x40004L + FILETYPE 0x1L + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904b0" + BEGIN + VALUE "CompanyName", "Siana Gears" + VALUE "FileDescription", "Singularity Viewer" + VALUE "FileVersion", "1.5.0.0" + VALUE "InternalName", "Second Life" + VALUE "LegalCopyright", "Copyright © 2001-2010, Linden Research, Inc., Copyright 2010 Siana Gearz" + VALUE "OriginalFilename", "singularity.exe" + VALUE "ProductName", "Singularity Viewer" + VALUE "ProductVersion", "1.5.0.0" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1200 + END +END + + +///////////////////////////////////////////////////////////////////////////// +// +// Bitmap +// + +#endif // English (U.S.) resources +///////////////////////////////////////////////////////////////////////////// + + + +#ifndef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 3 resource. +// + + +///////////////////////////////////////////////////////////////////////////// +#endif // not APSTUDIO_INVOKED +