From 487930b14e06d67ffce90f44b9f6c1cff71f4db8 Mon Sep 17 00:00:00 2001 From: McCabe Maxsted Date: Sun, 29 Nov 2009 03:44:40 -0700 Subject: Make sure windows always uses the Imprudence icon --- linden/indra/newview/res/imp_icon.ico | Bin 0 -> 533678 bytes linden/indra/newview/res/viewerRes.rc | 6 +++--- 2 files changed, 3 insertions(+), 3 deletions(-) create mode 100644 linden/indra/newview/res/imp_icon.ico (limited to 'linden') diff --git a/linden/indra/newview/res/imp_icon.ico b/linden/indra/newview/res/imp_icon.ico new file mode 100644 index 0000000..3b1250a Binary files /dev/null and b/linden/indra/newview/res/imp_icon.ico differ diff --git a/linden/indra/newview/res/viewerRes.rc b/linden/indra/newview/res/viewerRes.rc index 5e57841..18d8d55 100644 --- a/linden/indra/newview/res/viewerRes.rc +++ b/linden/indra/newview/res/viewerRes.rc @@ -61,8 +61,8 @@ END // Icon with lowest ID value placed first to ensure application icon // remains consistent on all systems. -IDI_LL_ICON ICON "ll_icon.ico" -IDI_LCD_LL_ICON ICON "icon1.ico" +IDI_LL_ICON ICON "imp_icon.ico" +//IDI_LCD_LL_ICON ICON "icon1.ico" ///////////////////////////////////////////////////////////////////////////// // @@ -74,7 +74,7 @@ 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 + LTEXT "Loading Imprudence...",666,36,13,91,8 END -- cgit v1.1 From 0f0141b8fc755e36d73bbb59286b23aece82c27d Mon Sep 17 00:00:00 2001 From: McCabe Maxsted Date: Sun, 29 Nov 2009 05:13:17 -0700 Subject: Removed VS2003 boost references from CMake --- linden/indra/cmake/Boost.cmake | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) (limited to 'linden') diff --git a/linden/indra/cmake/Boost.cmake b/linden/indra/cmake/Boost.cmake index 50b8eff..a84a09f 100644 --- a/linden/indra/cmake/Boost.cmake +++ b/linden/indra/cmake/Boost.cmake @@ -16,17 +16,7 @@ else (STANDALONE) if (WINDOWS) set(BOOST_VERSION 1_36) - if (MSVC71) - set(BOOST_PROGRAM_OPTIONS_LIBRARY - optimized libboost_program_options-vc71-mt-${BOOST_VERSION} - debug libboost_program_options-vc71-mt-gd-${BOOST_VERSION}) - set(BOOST_REGEX_LIBRARY - optimized libboost_regex-vc71-mt-${BOOST_VERSION} - debug libboost_regex-vc71-mt-gd-${BOOST_VERSION}) - set(BOOST_SIGNALS_LIBRARY - optimized libboost_signals-vc71-mt-${BOOST_VERSION} - debug libboost_signals-vc71-mt-gd-${BOOST_VERSION}) - elseif (MSVC80) + if (MSVC80) set(BOOST_PROGRAM_OPTIONS_LIBRARY optimized libboost_program_options-vc80-mt-${BOOST_VERSION} debug libboost_program_options-vc80-mt-gd-${BOOST_VERSION}) @@ -46,7 +36,7 @@ else (STANDALONE) set(BOOST_SIGNALS_LIBRARY optimized libboost_signals-vc90-mt-${BOOST_VERSION} debug libboost_signals-vc90-mt-gd-${BOOST_VERSION}) - endif (MSVC71) + endif (MSVC80) elseif (DARWIN) set(BOOST_PROGRAM_OPTIONS_LIBRARY boost_program_options-mt) set(BOOST_REGEX_LIBRARY boost_regex-mt) -- cgit v1.1 From 6e25f129ca0f0d06eed0024a2e39acf6d19cc004 Mon Sep 17 00:00:00 2001 From: McCabe Maxsted Date: Mon, 30 Nov 2009 16:42:12 -0700 Subject: Added Imprudence viewer artwork to install.xml --- linden/indra/cmake/00-Common.cmake | 5 +++ linden/indra/newview/CMakeLists.txt | 3 +- linden/indra/newview/res-sdl/imprudence_icon.BMP | Bin 4662 -> 0 bytes linden/indra/newview/res/imp_icon.ico | Bin 533678 -> 0 bytes linden/indra/newview/res/imprudence_icon.png | Bin 32529 -> 0 bytes .../html/en-us/loading/imprudence_loading.png | Bin 10714 -> 0 bytes .../newview/skins/default/textures/arrow_left.tga | Bin 510 -> 0 bytes .../newview/skins/default/textures/arrow_right.tga | Bin 510 -> 0 bytes .../skins/default/textures/map_avatar_32.tga | Bin 2894 -> 0 bytes .../skins/default/textures/map_avatar_above_32.tga | Bin 2909 -> 0 bytes .../skins/default/textures/map_avatar_below_32.tga | Bin 3037 -> 0 bytes .../skins/default/textures/map_avatar_you_32.tga | Bin 3395 -> 0 bytes .../newview/skins/silver/textures/arrow_left.tga | Bin 424 -> 0 bytes .../newview/skins/silver/textures/arrow_right.tga | Bin 424 -> 0 bytes linden/install.xml | 38 +++++++++++++++++++++ 15 files changed, 44 insertions(+), 2 deletions(-) delete mode 100644 linden/indra/newview/res-sdl/imprudence_icon.BMP delete mode 100644 linden/indra/newview/res/imp_icon.ico delete mode 100644 linden/indra/newview/res/imprudence_icon.png delete mode 100644 linden/indra/newview/skins/default/html/en-us/loading/imprudence_loading.png delete mode 100644 linden/indra/newview/skins/default/textures/arrow_left.tga delete mode 100644 linden/indra/newview/skins/default/textures/arrow_right.tga delete mode 100644 linden/indra/newview/skins/default/textures/map_avatar_32.tga delete mode 100644 linden/indra/newview/skins/default/textures/map_avatar_above_32.tga delete mode 100644 linden/indra/newview/skins/default/textures/map_avatar_below_32.tga delete mode 100644 linden/indra/newview/skins/default/textures/map_avatar_you_32.tga delete mode 100644 linden/indra/newview/skins/silver/textures/arrow_left.tga delete mode 100644 linden/indra/newview/skins/silver/textures/arrow_right.tga (limited to 'linden') diff --git a/linden/indra/cmake/00-Common.cmake b/linden/indra/cmake/00-Common.cmake index 49fdb5b..1b5e9d2 100644 --- a/linden/indra/cmake/00-Common.cmake +++ b/linden/indra/cmake/00-Common.cmake @@ -3,6 +3,11 @@ # Compilation options shared by all Second Life components. include(Variables) +include(Prebuilt) + +# Download viewer artwork + + use_prebuilt_binary(artwork) # Portable compilation flags. diff --git a/linden/indra/newview/CMakeLists.txt b/linden/indra/newview/CMakeLists.txt index 197857b..26c9b21 100644 --- a/linden/indra/newview/CMakeLists.txt +++ b/linden/indra/newview/CMakeLists.txt @@ -976,7 +976,7 @@ if (WINDOWS) res/arrowcopmulti.cur res/arrowdrag.cur res/circleandline.cur - res/icon1.ico + res/imp_icon.ico res/imprudence_icon.png res/llarrow.cur res/llarrowdrag.cur @@ -997,7 +997,6 @@ if (WINDOWS) res/lltooltranslate.cur res/lltoolzoomin.cur res/lltoolzoomout.cur - res/ll_icon.ico res/resource.h res/toolbuy.cur res/toolopen.cur diff --git a/linden/indra/newview/res-sdl/imprudence_icon.BMP b/linden/indra/newview/res-sdl/imprudence_icon.BMP deleted file mode 100644 index c3f4887..0000000 Binary files a/linden/indra/newview/res-sdl/imprudence_icon.BMP and /dev/null differ diff --git a/linden/indra/newview/res/imp_icon.ico b/linden/indra/newview/res/imp_icon.ico deleted file mode 100644 index 3b1250a..0000000 Binary files a/linden/indra/newview/res/imp_icon.ico and /dev/null differ diff --git a/linden/indra/newview/res/imprudence_icon.png b/linden/indra/newview/res/imprudence_icon.png deleted file mode 100644 index 8795fa7..0000000 Binary files a/linden/indra/newview/res/imprudence_icon.png and /dev/null differ diff --git a/linden/indra/newview/skins/default/html/en-us/loading/imprudence_loading.png b/linden/indra/newview/skins/default/html/en-us/loading/imprudence_loading.png deleted file mode 100644 index f9ea7a2..0000000 Binary files a/linden/indra/newview/skins/default/html/en-us/loading/imprudence_loading.png and /dev/null differ diff --git a/linden/indra/newview/skins/default/textures/arrow_left.tga b/linden/indra/newview/skins/default/textures/arrow_left.tga deleted file mode 100644 index 68e6280..0000000 Binary files a/linden/indra/newview/skins/default/textures/arrow_left.tga and /dev/null differ diff --git a/linden/indra/newview/skins/default/textures/arrow_right.tga b/linden/indra/newview/skins/default/textures/arrow_right.tga deleted file mode 100644 index 7a5a30e..0000000 Binary files a/linden/indra/newview/skins/default/textures/arrow_right.tga and /dev/null differ diff --git a/linden/indra/newview/skins/default/textures/map_avatar_32.tga b/linden/indra/newview/skins/default/textures/map_avatar_32.tga deleted file mode 100644 index aebeab4..0000000 Binary files a/linden/indra/newview/skins/default/textures/map_avatar_32.tga and /dev/null differ diff --git a/linden/indra/newview/skins/default/textures/map_avatar_above_32.tga b/linden/indra/newview/skins/default/textures/map_avatar_above_32.tga deleted file mode 100644 index 65bd056..0000000 Binary files a/linden/indra/newview/skins/default/textures/map_avatar_above_32.tga and /dev/null differ diff --git a/linden/indra/newview/skins/default/textures/map_avatar_below_32.tga b/linden/indra/newview/skins/default/textures/map_avatar_below_32.tga deleted file mode 100644 index 496c44b..0000000 Binary files a/linden/indra/newview/skins/default/textures/map_avatar_below_32.tga and /dev/null differ diff --git a/linden/indra/newview/skins/default/textures/map_avatar_you_32.tga b/linden/indra/newview/skins/default/textures/map_avatar_you_32.tga deleted file mode 100644 index 782207e..0000000 Binary files a/linden/indra/newview/skins/default/textures/map_avatar_you_32.tga and /dev/null differ diff --git a/linden/indra/newview/skins/silver/textures/arrow_left.tga b/linden/indra/newview/skins/silver/textures/arrow_left.tga deleted file mode 100644 index 43fbf12..0000000 Binary files a/linden/indra/newview/skins/silver/textures/arrow_left.tga and /dev/null differ diff --git a/linden/indra/newview/skins/silver/textures/arrow_right.tga b/linden/indra/newview/skins/silver/textures/arrow_right.tga deleted file mode 100644 index a92ac9c..0000000 Binary files a/linden/indra/newview/skins/silver/textures/arrow_right.tga and /dev/null differ diff --git a/linden/install.xml b/linden/install.xml index 4f13d84..0b0dd4c 100644 --- a/linden/install.xml +++ b/linden/install.xml @@ -152,6 +152,39 @@ + artwork + + copyright + Second Life(TM) Viewer Artwork. Copyright (C) 2008 Linden Research, Inc. With additions by the Imprudence team. + description + The artwork used in the client, such as UI textures and branding. + license + creative commons attribution-share alike 3.0 + packages + + darwin + + md5sum + ad3f838d58338e5fce8e4770f67a04c5 + url + http://imprudenceviewer.org/download/extras/imprudence-artwork-20091130.tar.bz2 + + linux + + md5sum + ad3f838d58338e5fce8e4770f67a04c5 + url + http://imprudenceviewer.org/download/extras/imprudence-artwork-20091130.tar.bz2 + + windows + + md5sum + ad3f838d58338e5fce8e4770f67a04c5 + url + http://imprudenceviewer.org/download/extras/imprudence-artwork-20091130.tar.bz2 + + + berkeley copyright @@ -1416,6 +1449,11 @@ Copyright (C) 2004-2005 Vladimir Berezniker @ http://public.xdi.org/=vmpn text http://daniel.haxx.se/projects/c-ares/license.html + creative commons attribution-share alike 3.0 + + url + http://creativecommons.org/licenses/by-sa/3.0/legalcode + curl url -- cgit v1.1 From 18b5636b74d80034867e2e8273706db4dc490b15 Mon Sep 17 00:00:00 2001 From: McCabe Maxsted Date: Tue, 1 Dec 2009 08:14:11 -0700 Subject: Made downloading the artwork work while using the --standalone flag --- linden/indra/cmake/00-Common.cmake | 9 +++++++-- linden/indra/cmake/Variables.cmake | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) (limited to 'linden') diff --git a/linden/indra/cmake/00-Common.cmake b/linden/indra/cmake/00-Common.cmake index 1b5e9d2..746a3bf 100644 --- a/linden/indra/cmake/00-Common.cmake +++ b/linden/indra/cmake/00-Common.cmake @@ -5,10 +5,15 @@ include(Variables) include(Prebuilt) -# Download viewer artwork +# Download viewer artwork even when using standalone +if (STANDALONE) + set(STANDALONE OFF) + use_prebuilt_binary(artwork) + set(STANDALONE ON) +else (STANDALONE) use_prebuilt_binary(artwork) - +endif (STANDALONE) # Portable compilation flags. diff --git a/linden/indra/cmake/Variables.cmake b/linden/indra/cmake/Variables.cmake index 8f33a95..5d4dffe 100644 --- a/linden/indra/cmake/Variables.cmake +++ b/linden/indra/cmake/Variables.cmake @@ -82,7 +82,7 @@ set(VIEWER ON CACHE BOOL "Build Second Life viewer.") set(VIEWER_CHANNEL "Imprudence" CACHE STRING "Viewer Channel Name") set(VIEWER_LOGIN_CHANNEL ${VIEWER_CHANNEL} CACHE STRING "Fake login channel for A/B Testing") -set(STANDALONE OFF CACHE BOOL "Do not use Linden-supplied prebuilt libraries.") +set(STANDALONE OFF CACHE BOOL "Do not use Imprudence-supplied prebuilt libraries.") if (NOT STANDALONE AND EXISTS ${CMAKE_SOURCE_DIR}/llphysics) set(SERVER ON CACHE BOOL "Build Second Life server software.") -- cgit v1.1 From d8fc77c432c6e960757884e0f9f5396ee00ea7ea Mon Sep 17 00:00:00 2001 From: McCabe Maxsted Date: Tue, 1 Dec 2009 08:35:56 -0700 Subject: Removed libpng12-0.dll from CopyWinLibs.cmake --- linden/indra/cmake/CopyWinLibs.cmake | 1 - 1 file changed, 1 deletion(-) (limited to 'linden') diff --git a/linden/indra/cmake/CopyWinLibs.cmake b/linden/indra/cmake/CopyWinLibs.cmake index 52f000f..59081bd 100644 --- a/linden/indra/cmake/CopyWinLibs.cmake +++ b/linden/indra/cmake/CopyWinLibs.cmake @@ -62,7 +62,6 @@ set(debug_files libogg-0.dll liboil-0.3-0.dll libopenjpeg-2.dll - libpng12-0.dll libschroedinger-1.0-0.dll libspeex-1.dll libtheora-0.dll -- cgit v1.1 From 247125f56cb33e171577bdfae0a5370916cbb212 Mon Sep 17 00:00:00 2001 From: Patrick Sapinski Date: Tue, 1 Dec 2009 01:55:30 -0500 Subject: develop.py support for VS2010 Signed-off-by: Jacek Antonelli --- linden/indra/develop.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'linden') diff --git a/linden/indra/develop.py b/linden/indra/develop.py index 8d432fc..7e7350e 100755 --- a/linden/indra/develop.py +++ b/linden/indra/develop.py @@ -460,11 +460,16 @@ class WindowsSetup(PlatformSetup): 'vc90' : { 'gen' : r'Visual Studio 9 2008', 'ver' : r'9.0' + }, + 'vc100' : { + 'gen' : r'Visual Studio 10', + 'ver' : r'10.0' } } gens['vs2003'] = gens['vc71'] gens['vs2005'] = gens['vc80'] gens['vs2008'] = gens['vc90'] + gens['vs2010'] = gens['vc100'] search_path = r'C:\windows' exe_suffixes = ('.exe', '.bat', '.com') @@ -476,14 +481,14 @@ class WindowsSetup(PlatformSetup): def _get_generator(self): if self._generator is None: - for version in 'vc80 vc90 vc71'.split(): + for version in 'vc80 vc90 vc100 vc71'.split(): if self.find_visual_studio(version): self._generator = version print 'Building with ', self.gens[version]['gen'] break else: print >> sys.stderr, 'Cannot find a Visual Studio installation, testing for express editions' - for version in 'vc80 vc90 vc71'.split(): + for version in 'vc80 vc90 vc100 vc71'.split(): if self.find_visual_studio_express(version): self._generator = version print 'Building with ', self.gens[version]['gen'] , "Express edition" -- cgit v1.1 From 7e1321a8159f91eb05ca334d57db30cef7aeb454 Mon Sep 17 00:00:00 2001 From: Patrick Sapinski Date: Tue, 1 Dec 2009 01:52:05 -0500 Subject: vstool VS2010 support Signed-off-by: Jacek Antonelli --- linden/indra/tools/vstool/VSTool.exe | Bin 24576 -> 24576 bytes linden/indra/tools/vstool/main.cs | 8 ++++++++ 2 files changed, 8 insertions(+) (limited to 'linden') diff --git a/linden/indra/tools/vstool/VSTool.exe b/linden/indra/tools/vstool/VSTool.exe index 6d1497d..ac1cf44 100755 Binary files a/linden/indra/tools/vstool/VSTool.exe and b/linden/indra/tools/vstool/VSTool.exe differ diff --git a/linden/indra/tools/vstool/main.cs b/linden/indra/tools/vstool/main.cs index 5c41c91..4c33141 100644 --- a/linden/indra/tools/vstool/main.cs +++ b/linden/indra/tools/vstool/main.cs @@ -550,6 +550,10 @@ namespace VSTool case "10.00": version = "VC90"; break; + + case "11.00": + version = "VC100"; + break; default: throw new ApplicationException("Unknown .sln version: " + format); } @@ -585,6 +589,10 @@ namespace VSTool case "VC90": progid = "VisualStudio.DTE.9.0"; break; + + case "VC100": + progid = "VisualStudio.DTE.10.0"; + break; default: throw new ApplicationException("Can't handle VS version: " + version); } -- cgit v1.1 From c319b23e7ab7f95bad43dbaf15542eb4a97c59a5 Mon Sep 17 00:00:00 2001 From: McCabe Maxsted Date: Tue, 1 Dec 2009 10:10:27 -0700 Subject: Moved the viewer artwork to its own CMake file --- linden/indra/cmake/00-Common.cmake | 10 ---------- linden/indra/cmake/ViewerArtwork.cmake | 14 ++++++++++++++ linden/indra/llaudio/CMakeLists.txt | 1 + linden/indra/newview/CMakeLists.txt | 1 + 4 files changed, 16 insertions(+), 10 deletions(-) create mode 100644 linden/indra/cmake/ViewerArtwork.cmake (limited to 'linden') diff --git a/linden/indra/cmake/00-Common.cmake b/linden/indra/cmake/00-Common.cmake index 746a3bf..49fdb5b 100644 --- a/linden/indra/cmake/00-Common.cmake +++ b/linden/indra/cmake/00-Common.cmake @@ -3,17 +3,7 @@ # Compilation options shared by all Second Life components. include(Variables) -include(Prebuilt) -# Download viewer artwork even when using standalone - -if (STANDALONE) - set(STANDALONE OFF) - use_prebuilt_binary(artwork) - set(STANDALONE ON) -else (STANDALONE) - use_prebuilt_binary(artwork) -endif (STANDALONE) # Portable compilation flags. diff --git a/linden/indra/cmake/ViewerArtwork.cmake b/linden/indra/cmake/ViewerArtwork.cmake new file mode 100644 index 0000000..f01109a --- /dev/null +++ b/linden/indra/cmake/ViewerArtwork.cmake @@ -0,0 +1,14 @@ +# -*- cmake -*- +# +# Download viewer artwork even when using standalone + +include(Variables) +include(Prebuilt) + +if (NOT STANDALONE) + use_prebuilt_binary(artwork) +else (NOT STANDALONE) + set(STANDALONE OFF) + use_prebuilt_binary(artwork) + set(STANDALONE ON) +endif (NOT STANDALONE) diff --git a/linden/indra/llaudio/CMakeLists.txt b/linden/indra/llaudio/CMakeLists.txt index 70041e7..0a668f9 100644 --- a/linden/indra/llaudio/CMakeLists.txt +++ b/linden/indra/llaudio/CMakeLists.txt @@ -2,6 +2,7 @@ project(llaudio) +# Current starting point for CMake. Seems rather arbitrary - MC include(00-Common) include(Audio) include(OPENAL) diff --git a/linden/indra/newview/CMakeLists.txt b/linden/indra/newview/CMakeLists.txt index 26c9b21..cafe004 100644 --- a/linden/indra/newview/CMakeLists.txt +++ b/linden/indra/newview/CMakeLists.txt @@ -35,6 +35,7 @@ include(GooglePerfTools) include(TemplateCheck) include(UI) include(UnixInstall) +include(ViewerArtwork) include(ViewerMiscLibs) if (WINDOWS) -- cgit v1.1 From 97fa8b1b286e254cc329cfc73331209cd2b9680c Mon Sep 17 00:00:00 2001 From: McCabe Maxsted Date: Wed, 2 Dec 2009 14:52:01 -0700 Subject: Downgraded OpenAL-soft back to 1.6.372 for the time being (reverts 4633284f) --- linden/install.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'linden') diff --git a/linden/install.xml b/linden/install.xml index 0b0dd4c..f163ff4 100644 --- a/linden/install.xml +++ b/linden/install.xml @@ -1100,9 +1100,9 @@ Copyright (C) 2004-2005 Vladimir Berezniker @ http://public.xdi.org/=vmpn windows md5sum - 3dc9b085b2a1b23501396ef9a87a393e + 7c33758dc0a047c244de03133dd76c2a url - http://imprudenceviewer.org/download/libs/openal-soft-1.10.622-windows-20091124.tar.bz2 + http://imprudence.s3.amazonaws.com/extras/openal-soft-1.6.372-windows-01262009.tar.bz2 -- cgit v1.1 From 5563a47293ccccce2160914cbe0d350b923e0d17 Mon Sep 17 00:00:00 2001 From: McCabe Maxsted Date: Fri, 4 Dec 2009 11:26:23 -0700 Subject: Forgot to remove the debug entry for libpng12-0.dll from CopyWinLibs.cmake --- linden/indra/cmake/CopyWinLibs.cmake | 1 - 1 file changed, 1 deletion(-) (limited to 'linden') diff --git a/linden/indra/cmake/CopyWinLibs.cmake b/linden/indra/cmake/CopyWinLibs.cmake index 59081bd..808c693 100644 --- a/linden/indra/cmake/CopyWinLibs.cmake +++ b/linden/indra/cmake/CopyWinLibs.cmake @@ -136,7 +136,6 @@ set(release_files libogg-0.dll liboil-0.3-0.dll libopenjpeg-2.dll - libpng12-0.dll libschroedinger-1.0-0.dll libspeex-1.dll libtheora-0.dll -- cgit v1.1 From 58f0017d201b87a4ee7db7d118379c7c7e71a7e0 Mon Sep 17 00:00:00 2001 From: McCabe Maxsted Date: Fri, 4 Dec 2009 12:57:57 -0700 Subject: Added Imprudence VC80 .config files to the repo --- linden/indra/cmake/CopyWinLibs.cmake | 8 ++++---- linden/indra/newview/Imprudence.exe.config | 20 ++++++++++++++++++++ linden/indra/newview/ImprudenceDebug.exe.config | 20 ++++++++++++++++++++ 3 files changed, 44 insertions(+), 4 deletions(-) create mode 100644 linden/indra/newview/Imprudence.exe.config create mode 100644 linden/indra/newview/ImprudenceDebug.exe.config (limited to 'linden') diff --git a/linden/indra/cmake/CopyWinLibs.cmake b/linden/indra/cmake/CopyWinLibs.cmake index 808c693..add94dd 100644 --- a/linden/indra/cmake/CopyWinLibs.cmake +++ b/linden/indra/cmake/CopyWinLibs.cmake @@ -1,7 +1,7 @@ # -*- cmake -*- # The copy_win_libs folder contains file lists and a script used to -# copy dlls, exes and such needed to run the SecondLife from within +# copy dlls, exes and such needed to run Imprudence from within # VisualStudio. include(CMakeCopyIfDifferent) @@ -196,7 +196,7 @@ if (MSVC80) ARGS ${CMAKE_CURRENT_SOURCE_DIR}/build_win32_appConfig.py ${CMAKE_CURRENT_BINARY_DIR}/Debug/Microsoft.VC80.DebugCRT.manifest - ${CMAKE_CURRENT_SOURCE_DIR}/SecondLifeDebug.exe.config + ${CMAKE_CURRENT_SOURCE_DIR}/ImprudenceDebug.exe.config ${debug_appconfig_file} DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/Debug/Microsoft.VC80.DebugCRT.manifest COMMENT "Creating debug app config file" @@ -241,7 +241,7 @@ if (MSVC80) ARGS ${CMAKE_CURRENT_SOURCE_DIR}/build_win32_appConfig.py ${CMAKE_CURRENT_BINARY_DIR}/Release/Microsoft.VC80.CRT.manifest - ${CMAKE_CURRENT_SOURCE_DIR}/SecondLife.exe.config + ${CMAKE_CURRENT_SOURCE_DIR}/Imprudence.exe.config ${release_appconfig_file} DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/Release/Microsoft.VC80.CRT.manifest COMMENT "Creating release app config file" @@ -254,7 +254,7 @@ if (MSVC80) ARGS ${CMAKE_CURRENT_SOURCE_DIR}/build_win32_appConfig.py ${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo/Microsoft.VC80.CRT.manifest - ${CMAKE_CURRENT_SOURCE_DIR}/SecondLife.exe.config + ${CMAKE_CURRENT_SOURCE_DIR}/Imprudence.exe.config ${relwithdebinfo_appconfig_file} DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo/Microsoft.VC80.CRT.manifest COMMENT "Creating relwithdebinfo app config file" diff --git a/linden/indra/newview/Imprudence.exe.config b/linden/indra/newview/Imprudence.exe.config new file mode 100644 index 0000000..293a9ba --- /dev/null +++ b/linden/indra/newview/Imprudence.exe.config @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/linden/indra/newview/ImprudenceDebug.exe.config b/linden/indra/newview/ImprudenceDebug.exe.config new file mode 100644 index 0000000..04d0e00 --- /dev/null +++ b/linden/indra/newview/ImprudenceDebug.exe.config @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + -- cgit v1.1