aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/win_crash_logger
diff options
context:
space:
mode:
authorJacek Antonelli2008-09-06 18:24:57 -0500
committerJacek Antonelli2008-09-06 18:25:07 -0500
commit798d367d54a6c6379ad355bd8345fa40e31e7fe9 (patch)
tree1921f1708cd0240648c97bc02df2c2ab5f2fc41e /linden/indra/win_crash_logger
parentSecond Life viewer sources 1.20.15 (diff)
downloadmeta-impy-798d367d54a6c6379ad355bd8345fa40e31e7fe9.zip
meta-impy-798d367d54a6c6379ad355bd8345fa40e31e7fe9.tar.gz
meta-impy-798d367d54a6c6379ad355bd8345fa40e31e7fe9.tar.bz2
meta-impy-798d367d54a6c6379ad355bd8345fa40e31e7fe9.tar.xz
Second Life viewer sources 1.21.0-RC
Diffstat (limited to 'linden/indra/win_crash_logger')
-rw-r--r--linden/indra/win_crash_logger/CMakeLists.txt83
-rw-r--r--linden/indra/win_crash_logger/llcrashloggerwindows.cpp12
-rw-r--r--linden/indra/win_crash_logger/llcrashloggerwindows.h2
-rw-r--r--linden/indra/win_crash_logger/win_crash_logger.vcproj224
-rw-r--r--linden/indra/win_crash_logger/win_crash_logger_vc8.vcproj336
-rw-r--r--linden/indra/win_crash_logger/win_crash_logger_vc9.vcproj337
6 files changed, 90 insertions, 904 deletions
diff --git a/linden/indra/win_crash_logger/CMakeLists.txt b/linden/indra/win_crash_logger/CMakeLists.txt
new file mode 100644
index 0000000..d15377a
--- /dev/null
+++ b/linden/indra/win_crash_logger/CMakeLists.txt
@@ -0,0 +1,83 @@
1# -*- cmake -*-
2
3project(win_crash_logger)
4
5include(00-Common)
6include(LLCommon)
7include(LLCrashLogger)
8include(LLMath)
9include(LLMessage)
10include(LLVFS)
11include(LLWindow)
12include(LLXML)
13include(Linking)
14
15include_directories(
16 ${LLCOMMON_INCLUDE_DIRS}
17 ${LLCRASHLOGGER_INCLUDE_DIRS}
18 ${LLMATH_INCLUDE_DIRS}
19 ${LLWINDOW_INCLUDE_DIRS}
20 ${LLXML_INCLUDE_DIRS}
21 ${LLVFS_INCLUDE_DIRS}
22 )
23
24set(win_crash_logger_SOURCE_FILES
25 win_crash_logger.cpp
26 llcrashloggerwindows.cpp
27 )
28
29set(win_crash_logger_HEADER_FILES
30 CMakeLists.txt
31
32 llcrashloggerwindows.h
33 resource.h
34 StdAfx.h
35 win_crash_logger.h
36 )
37
38set_source_files_properties(${win_crash_logger_HEADER_FILES}
39 PROPERTIES HEADER_FILE_ONLY TRUE)
40
41set(win_crash_logger_RESOURCE_FILES
42 ll_icon.ico
43 )
44
45set_source_files_properties(${win_crash_logger_RESOURCE_FILES}
46 PROPERTIES HEADER_FILE_ONLY TRUE)
47
48set(win_crash_logger_RESOURCE_FILES
49 win_crash_logger.rc
50 ${win_crash_logger_RESOURCE_FILES}
51 )
52
53SOURCE_GROUP("Resource Files" FILES ${win_crash_logger_RESOURCE_FILES})
54
55list(APPEND
56 win_crash_logger_SOURCE_FILES
57 ${win_crash_logger_HEADER_FILES}
58 ${win_crash_logger_RESOURCE_FILES}
59 )
60
61find_library(DXGUID_LIBRARY dxguid ${DIRECTX_LIBRARY_DIR})
62
63add_executable(windows-crash-logger WIN32 ${win_crash_logger_SOURCE_FILES})
64
65target_link_libraries(windows-crash-logger
66 ${LLCRASHLOGGER_LIBRARIES}
67 ${LLWINDOW_LIBRARIES}
68 ${LLVFS_LIBRARIES}
69 ${LLXML_LIBRARIES}
70 ${LLMESSAGE_LIBRARIES}
71 ${LLMATH_LIBRARIES}
72 ${LLCOMMON_LIBRARIES}
73 ${WINDOWS_LIBRARIES}
74 ${DXGUID_LIBRARY}
75 )
76
77if (WINDOWS)
78 set_target_properties(windows-crash-logger
79 PROPERTIES
80 LINK_FLAGS "/NODEFAULTLIB:MSVCRT"
81 LINK_FLAGS_DEBUG "/NODEFAULTLIB:LIBCMT /NODEFAULTLIB:MSVCRTD"
82 )
83endif (WINDOWS)
diff --git a/linden/indra/win_crash_logger/llcrashloggerwindows.cpp b/linden/indra/win_crash_logger/llcrashloggerwindows.cpp
index e719d30..ef1e53e 100644
--- a/linden/indra/win_crash_logger/llcrashloggerwindows.cpp
+++ b/linden/indra/win_crash_logger/llcrashloggerwindows.cpp
@@ -59,7 +59,7 @@ HINSTANCE hInst= NULL; // current instance
59TCHAR szTitle[MAX_LOADSTRING]; /* Flawfinder: ignore */ // The title bar text 59TCHAR szTitle[MAX_LOADSTRING]; /* Flawfinder: ignore */ // The title bar text
60TCHAR szWindowClass[MAX_LOADSTRING]; /* Flawfinder: ignore */ // The title bar text 60TCHAR szWindowClass[MAX_LOADSTRING]; /* Flawfinder: ignore */ // The title bar text
61 61
62LLString gProductName; 62std::string gProductName;
63HWND gHwndReport = NULL; // Send/Don't Send dialog 63HWND gHwndReport = NULL; // Send/Don't Send dialog
64HWND gHwndProgress = NULL; // Progress window 64HWND gHwndProgress = NULL; // Progress window
65HCURSOR gCursorArrow = NULL; 65HCURSOR gCursorArrow = NULL;
@@ -97,7 +97,7 @@ void write_debug(std::string& str)
97 write_debug(str.c_str()); 97 write_debug(str.c_str());
98} 98}
99 99
100void show_progress(const char* message) 100void show_progress(const std::string& message)
101{ 101{
102 std::wstring msg = wstring_to_utf16str(utf8str_to_wstring(message)); 102 std::wstring msg = wstring_to_utf16str(utf8str_to_wstring(message));
103 if (gHwndProgress) 103 if (gHwndProgress)
@@ -198,7 +198,7 @@ bool handle_button_click(WORD button_id)
198 wbuffer, // pointer to buffer for text 198 wbuffer, // pointer to buffer for text
199 20000 // maximum size of string 199 20000 // maximum size of string
200 ); 200 );
201 LLString user_text(ll_convert_wide_to_string(wbuffer)); 201 std::string user_text(ll_convert_wide_to_string(wbuffer));
202 // Activate and show the window. 202 // Activate and show the window.
203 ShowWindow(gHwndProgress, SW_SHOW); 203 ShowWindow(gHwndProgress, SW_SHOW);
204 // Try doing this second to make the progress window go frontmost. 204 // Try doing this second to make the progress window go frontmost.
@@ -341,7 +341,7 @@ bool LLCrashLoggerWindows::mainLoop()
341 ShowWindow(gHwndReport, SW_SHOW ); 341 ShowWindow(gHwndReport, SW_SHOW );
342 342
343 MSG msg; 343 MSG msg;
344 msg.wParam = 0; 344 memset(&msg, 0, sizeof(msg));
345 while (!LLApp::isQuitting() && GetMessage(&msg, NULL, 0, 0)) 345 while (!LLApp::isQuitting() && GetMessage(&msg, NULL, 0, 0))
346 { 346 {
347 TranslateMessage(&msg); 347 TranslateMessage(&msg);
@@ -357,10 +357,10 @@ bool LLCrashLoggerWindows::mainLoop()
357 return 0; 357 return 0;
358} 358}
359 359
360void LLCrashLoggerWindows::updateApplication(LLString message) 360void LLCrashLoggerWindows::updateApplication(const std::string& message)
361{ 361{
362 LLCrashLogger::updateApplication(); 362 LLCrashLogger::updateApplication();
363 if(message != "") show_progress(message.c_str()); 363 if(!message.empty()) show_progress(message);
364 update_messages(); 364 update_messages();
365} 365}
366 366
diff --git a/linden/indra/win_crash_logger/llcrashloggerwindows.h b/linden/indra/win_crash_logger/llcrashloggerwindows.h
index 9f95dc2..dbf2d19 100644
--- a/linden/indra/win_crash_logger/llcrashloggerwindows.h
+++ b/linden/indra/win_crash_logger/llcrashloggerwindows.h
@@ -44,7 +44,7 @@ public:
44 ~LLCrashLoggerWindows(void); 44 ~LLCrashLoggerWindows(void);
45 virtual bool init(); 45 virtual bool init();
46 virtual bool mainLoop(); 46 virtual bool mainLoop();
47 virtual void updateApplication(LLString message = ""); 47 virtual void updateApplication(const std::string& message = LLStringUtil::null);
48 virtual bool cleanup(); 48 virtual bool cleanup();
49 virtual void gatherPlatformSpecificFiles(); 49 virtual void gatherPlatformSpecificFiles();
50 //void annotateCallStack(); 50 //void annotateCallStack();
diff --git a/linden/indra/win_crash_logger/win_crash_logger.vcproj b/linden/indra/win_crash_logger/win_crash_logger.vcproj
deleted file mode 100644
index fa1bf3d..0000000
--- a/linden/indra/win_crash_logger/win_crash_logger.vcproj
+++ /dev/null
@@ -1,224 +0,0 @@
1<?xml version="1.0" encoding="Windows-1252"?>
2<VisualStudioProject
3 ProjectType="Visual C++"
4 Version="7.10"
5 Name="win_crash_logger"
6 ProjectGUID="{648685F3-8760-4CC5-BB2B-CAF9DECC25A4}"
7 RootNamespace="win_crash_logger"
8 Keyword="Win32Proj">
9 <Platforms>
10 <Platform
11 Name="Win32"/>
12 </Platforms>
13 <Configurations>
14 <Configuration
15 Name="Debug|Win32"
16 OutputDirectory="Debug"
17 IntermediateDirectory="Debug"
18 ConfigurationType="1"
19 CharacterSet="1">
20 <Tool
21 Name="VCCLCompilerTool"
22 Optimization="0"
23 AdditionalIncludeDirectories="..\llcrashlogger;..\llcommon;..\llmath;..\llvfs;..\llaudio;..\llmedia;..\llimage;..\llscene;..\llxml;..\llmessage;..\llprimitive;..\llrender;..\llwindow;..\llcharacter;..\llinventory;..\llui;..\lscript;&quot;..\..\libraries\i686-win32\include&quot;;..\..\libraries\include\;&quot;..\..\libraries\i686-win32\include\quicktime&quot;"
24 PreprocessorDefinitions="WIN32;_DEBUG;LL_WINDOWS;LL_DEBUG"
25 MinimalRebuild="TRUE"
26 BasicRuntimeChecks="3"
27 RuntimeLibrary="1"
28 StructMemberAlignment="4"
29 ForceConformanceInForLoopScope="TRUE"
30 UsePrecompiledHeader="0"
31 WarningLevel="3"
32 Detect64BitPortabilityProblems="FALSE"
33 DebugInformationFormat="4"/>
34 <Tool
35 Name="VCCustomBuildTool"/>
36 <Tool
37 Name="VCLinkerTool"
38 AdditionalDependencies="apr-1.lib aprutil-1.lib ws2_32.lib advapi32.lib comdlg32.lib dxguid.lib gdi32.lib kernel32.lib libcurld.lib libeay32.lib libexpatMT.lib netapi32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib ssleay32.lib user32.lib wininet.lib winmm.lib winspool.lib"
39 OutputFile="win_crash_logger.exe"
40 LinkIncremental="1"
41 AdditionalLibraryDirectories="../lib_$(ConfigurationName)/i686-win32;../../libraries/i686-win32/lib_debug"
42 GenerateDebugInformation="TRUE"
43 ProgramDatabaseFile="$(OutDir)/win_crash_logger.pdb"
44 SubSystem="2"
45 TargetMachine="1"/>
46 <Tool
47 Name="VCMIDLTool"/>
48 <Tool
49 Name="VCPostBuildEventTool"/>
50 <Tool
51 Name="VCPreBuildEventTool"/>
52 <Tool
53 Name="VCPreLinkEventTool"/>
54 <Tool
55 Name="VCResourceCompilerTool"/>
56 <Tool
57 Name="VCWebServiceProxyGeneratorTool"/>
58 <Tool
59 Name="VCXMLDataGeneratorTool"/>
60 <Tool
61 Name="VCWebDeploymentTool"/>
62 <Tool
63 Name="VCManagedWrapperGeneratorTool"/>
64 <Tool
65 Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
66 </Configuration>
67 <Configuration
68 Name="Release|Win32"
69 OutputDirectory="Release"
70 IntermediateDirectory="Release"
71 ConfigurationType="1"
72 CharacterSet="1">
73 <Tool
74 Name="VCCLCompilerTool"
75 AdditionalIncludeDirectories="..\llcrashlogger;..\llcommon;..\llmath;..\llvfs;..\llaudio;..\llmedia;..\llimage;..\llscene;..\llxml;..\llmessage;..\llprimitive;..\llrender;..\llwindow;..\llcharacter;..\llinventory;..\llui;..\lscript;&quot;..\..\libraries\i686-win32\include&quot;;..\..\libraries\include\;&quot;..\..\libraries\i686-win32\include\quicktime&quot;"
76 PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;LL_WINDOWS;LL_RELEASE"
77 RuntimeLibrary="0"
78 StructMemberAlignment="0"
79 ForceConformanceInForLoopScope="TRUE"
80 UsePrecompiledHeader="0"
81 WarningLevel="3"
82 Detect64BitPortabilityProblems="FALSE"
83 DebugInformationFormat="3"/>
84 <Tool
85 Name="VCCustomBuildTool"/>
86 <Tool
87 Name="VCLinkerTool"
88 AdditionalDependencies="apr-1.lib aprutil-1.lib ws2_32.lib advapi32.lib comdlg32.lib dxguid.lib gdi32.lib kernel32.lib libexpatMT.lib netapi32.lib ole32.lib oleaut32.lib shell32.lib user32.lib wininet.lib winspool.lib libcurl.lib ssleay32.lib libeay32.lib zlib.lib winmm.lib psapi.lib"
89 OutputFile="win_crash_logger.exe"
90 LinkIncremental="1"
91 AdditionalLibraryDirectories="../lib_$(ConfigurationName)/i686-win32;../../libraries/i686-win32/lib_release"
92 GenerateDebugInformation="TRUE"
93 SubSystem="2"
94 OptimizeReferences="2"
95 EnableCOMDATFolding="2"
96 TargetMachine="1"/>
97 <Tool
98 Name="VCMIDLTool"/>
99 <Tool
100 Name="VCPostBuildEventTool"/>
101 <Tool
102 Name="VCPreBuildEventTool"/>
103 <Tool
104 Name="VCPreLinkEventTool"/>
105 <Tool
106 Name="VCResourceCompilerTool"/>
107 <Tool
108 Name="VCWebServiceProxyGeneratorTool"/>
109 <Tool
110 Name="VCXMLDataGeneratorTool"/>
111 <Tool
112 Name="VCWebDeploymentTool"/>
113 <Tool
114 Name="VCManagedWrapperGeneratorTool"/>
115 <Tool
116 Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
117 </Configuration>
118 <Configuration
119 Name="ReleaseNoOpt|Win32"
120 OutputDirectory="$(ConfigurationName)"
121 IntermediateDirectory="$(ConfigurationName)"
122 ConfigurationType="1"
123 CharacterSet="1">
124 <Tool
125 Name="VCCLCompilerTool"
126 AdditionalIncludeDirectories="..\llcrashlogger;..\llcommon;..\llmath;..\llvfs;..\llaudio;..\llmedia;..\llimage;..\llscene;..\llxml;..\llmessage;..\llprimitive;..\llrender;..\llwindow;..\llcharacter;..\llinventory;..\llui;..\lscript;&quot;..\..\libraries\i686-win32\include&quot;;..\..\libraries\include\;&quot;..\..\libraries\i686-win32\include\quicktime&quot;"
127 PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;LL_WINDOWS;LL_RELEASE"
128 RuntimeLibrary="0"
129 StructMemberAlignment="0"
130 ForceConformanceInForLoopScope="TRUE"
131 UsePrecompiledHeader="0"
132 WarningLevel="3"
133 Detect64BitPortabilityProblems="FALSE"
134 DebugInformationFormat="3"/>
135 <Tool
136 Name="VCCustomBuildTool"/>
137 <Tool
138 Name="VCLinkerTool"
139 AdditionalDependencies="apr-1.lib aprutil-1.lib ws2_32.lib advapi32.lib comdlg32.lib dxguid.lib gdi32.lib kernel32.lib libexpatMT.lib netapi32.lib ole32.lib oleaut32.lib shell32.lib user32.lib wininet.lib winspool.lib libcurl.lib ssleay32.lib libeay32.lib zlib.lib winmm.lib psapi.lib"
140 OutputFile="win_crash_logger.exe"
141 LinkIncremental="1"
142 AdditionalLibraryDirectories="&quot;../lib_releasenoopt/i686-win32&quot;;&quot;../../libraries/i686-win32/lib_release&quot;"
143 GenerateDebugInformation="TRUE"
144 SubSystem="2"
145 OptimizeReferences="2"
146 EnableCOMDATFolding="2"
147 TargetMachine="1"/>
148 <Tool
149 Name="VCMIDLTool"/>
150 <Tool
151 Name="VCPostBuildEventTool"/>
152 <Tool
153 Name="VCPreBuildEventTool"/>
154 <Tool
155 Name="VCPreLinkEventTool"/>
156 <Tool
157 Name="VCResourceCompilerTool"/>
158 <Tool
159 Name="VCWebServiceProxyGeneratorTool"/>
160 <Tool
161 Name="VCXMLDataGeneratorTool"/>
162 <Tool
163 Name="VCWebDeploymentTool"/>
164 <Tool
165 Name="VCManagedWrapperGeneratorTool"/>
166 <Tool
167 Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
168 </Configuration>
169 </Configurations>
170 <References>
171 </References>
172 <Files>
173 <Filter
174 Name="Source Files"
175 Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
176 UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
177 <File
178 RelativePath="..\llcrashlogger\llcrashlogger.cpp">
179 </File>
180 <File
181 RelativePath=".\llcrashloggerwindows.cpp">
182 </File>
183 <File
184 RelativePath=".\StdAfx.cpp">
185 </File>
186 <File
187 RelativePath=".\win_crash_logger.cpp">
188 </File>
189 </Filter>
190 <Filter
191 Name="Header Files"
192 Filter="h;hpp;hxx;hm;inl;inc;xsd"
193 UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
194 <File
195 RelativePath="..\llcrashlogger\llcrashlogger.h">
196 </File>
197 <File
198 RelativePath=".\llcrashloggerwindows.h">
199 </File>
200 <File
201 RelativePath=".\resource.h">
202 </File>
203 <File
204 RelativePath=".\StdAfx.h">
205 </File>
206 <File
207 RelativePath=".\win_crash_logger.h">
208 </File>
209 </Filter>
210 <Filter
211 Name="Resource Files"
212 Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
213 UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
214 <File
215 RelativePath=".\ll_icon.ico">
216 </File>
217 <File
218 RelativePath=".\win_crash_logger.rc">
219 </File>
220 </Filter>
221 </Files>
222 <Globals>
223 </Globals>
224</VisualStudioProject>
diff --git a/linden/indra/win_crash_logger/win_crash_logger_vc8.vcproj b/linden/indra/win_crash_logger/win_crash_logger_vc8.vcproj
deleted file mode 100644
index 29f01bd..0000000
--- a/linden/indra/win_crash_logger/win_crash_logger_vc8.vcproj
+++ /dev/null
@@ -1,336 +0,0 @@
1<?xml version="1.0" encoding="Windows-1252"?>
2<VisualStudioProject
3 ProjectType="Visual C++"
4 Version="8.00"
5 Name="win_crash_logger"
6 ProjectGUID="{648685F3-8760-4CC5-BB2B-CAF9DECC25A4}"
7 RootNamespace="win_crash_logger"
8 Keyword="Win32Proj"
9 >
10 <Platforms>
11 <Platform
12 Name="Win32"
13 />
14 </Platforms>
15 <ToolFiles>
16 </ToolFiles>
17 <Configurations>
18 <Configuration
19 Name="Debug|Win32"
20 OutputDirectory="Debug"
21 IntermediateDirectory="Debug"
22 ConfigurationType="1"
23 InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
24 CharacterSet="1"
25 >
26 <Tool
27 Name="VCPreBuildEventTool"
28 />
29 <Tool
30 Name="VCCustomBuildTool"
31 />
32 <Tool
33 Name="VCXMLDataGeneratorTool"
34 />
35 <Tool
36 Name="VCWebServiceProxyGeneratorTool"
37 />
38 <Tool
39 Name="VCMIDLTool"
40 />
41 <Tool
42 Name="VCCLCompilerTool"
43 Optimization="0"
44 AdditionalIncludeDirectories="..\llcrashlogger;..\llcommon;..\llmath;..\llvfs;..\llaudio;..\llmedia;..\llimage;..\llscene;..\llxml;..\llmessage;..\llprimitive;..\llrender;..\llwindow;..\llcharacter;..\llinventory;..\llui;..\lscript;&quot;..\..\libraries\i686-win32\include&quot;;..\..\libraries\include\;&quot;..\..\libraries\i686-win32\include\quicktime&quot;"
45 PreprocessorDefinitions="WIN32;_DEBUG;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_DEBUG"
46 MinimalRebuild="true"
47 BasicRuntimeChecks="3"
48 RuntimeLibrary="1"
49 StructMemberAlignment="4"
50 TreatWChar_tAsBuiltInType="false"
51 ForceConformanceInForLoopScope="true"
52 UsePrecompiledHeader="0"
53 WarningLevel="3"
54 Detect64BitPortabilityProblems="false"
55 DebugInformationFormat="4"
56 />
57 <Tool
58 Name="VCManagedResourceCompilerTool"
59 />
60 <Tool
61 Name="VCResourceCompilerTool"
62 />
63 <Tool
64 Name="VCPreLinkEventTool"
65 />
66 <Tool
67 Name="VCLinkerTool"
68 AdditionalDependencies="apr-1.lib aprutil-1.lib ws2_32.lib advapi32.lib comdlg32.lib dxguid.lib gdi32.lib kernel32.lib libexpatMT.lib llcommon.lib llmath.lib llwindow.lib llvfs.lib llmessage.lib llxml.lib netapi32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib user32.lib wininet.lib winspool.lib winmm.lib ssleay32.lib zlib.lib libcurld.lib libeay32.lib oldnames.lib"
69 OutputFile="win_crash_logger.exe"
70 LinkIncremental="1"
71 AdditionalLibraryDirectories="../lib_$(ConfigurationName)/i686-win32;../../libraries/i686-win32/lib_debug"
72 GenerateDebugInformation="true"
73 ProgramDatabaseFile="$(OutDir)/win_crash_logger.pdb"
74 SubSystem="2"
75 TargetMachine="1"
76 />
77 <Tool
78 Name="VCALinkTool"
79 />
80 <Tool
81 Name="VCManifestTool"
82 />
83 <Tool
84 Name="VCXDCMakeTool"
85 />
86 <Tool
87 Name="VCBscMakeTool"
88 />
89 <Tool
90 Name="VCFxCopTool"
91 />
92 <Tool
93 Name="VCAppVerifierTool"
94 />
95 <Tool
96 Name="VCWebDeploymentTool"
97 />
98 <Tool
99 Name="VCPostBuildEventTool"
100 />
101 </Configuration>
102 <Configuration
103 Name="Release|Win32"
104 OutputDirectory="Release"
105 IntermediateDirectory="Release"
106 ConfigurationType="1"
107 InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
108 CharacterSet="1"
109 >
110 <Tool
111 Name="VCPreBuildEventTool"
112 />
113 <Tool
114 Name="VCCustomBuildTool"
115 />
116 <Tool
117 Name="VCXMLDataGeneratorTool"
118 />
119 <Tool
120 Name="VCWebServiceProxyGeneratorTool"
121 />
122 <Tool
123 Name="VCMIDLTool"
124 />
125 <Tool
126 Name="VCCLCompilerTool"
127 AdditionalIncludeDirectories="..\llcrashlogger;..\llcommon;..\llmath;..\llvfs;..\llaudio;..\llmedia;..\llimage;..\llscene;..\llxml;..\llmessage;..\llprimitive;..\llrender;..\llwindow;..\llcharacter;..\llinventory;..\llui;..\lscript;&quot;..\..\libraries\i686-win32\include&quot;;..\..\libraries\include\;&quot;..\..\libraries\i686-win32\include\quicktime&quot;"
128 PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE"
129 RuntimeLibrary="0"
130 StructMemberAlignment="0"
131 TreatWChar_tAsBuiltInType="false"
132 ForceConformanceInForLoopScope="true"
133 UsePrecompiledHeader="0"
134 WarningLevel="3"
135 Detect64BitPortabilityProblems="false"
136 DebugInformationFormat="3"
137 />
138 <Tool
139 Name="VCManagedResourceCompilerTool"
140 />
141 <Tool
142 Name="VCResourceCompilerTool"
143 />
144 <Tool
145 Name="VCPreLinkEventTool"
146 />
147 <Tool
148 Name="VCLinkerTool"
149 AdditionalDependencies="apr-1.lib aprutil-1.lib ws2_32.lib advapi32.lib comdlg32.lib dxguid.lib gdi32.lib kernel32.lib libexpatMT.lib llcommon.lib llmath.lib llwindow.lib llvfs.lib llmessage.lib llxml.lib netapi32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib user32.lib wininet.lib winspool.lib winmm.lib ssleay32.lib zlib.lib libcurl.lib libeay32.lib oldnames.lib"
150 OutputFile="win_crash_logger.exe"
151 LinkIncremental="1"
152 AdditionalLibraryDirectories="../lib_$(ConfigurationName)/i686-win32;../../libraries/i686-win32/lib_release"
153 GenerateDebugInformation="true"
154 SubSystem="2"
155 OptimizeReferences="2"
156 EnableCOMDATFolding="2"
157 TargetMachine="1"
158 />
159 <Tool
160 Name="VCALinkTool"
161 />
162 <Tool
163 Name="VCManifestTool"
164 />
165 <Tool
166 Name="VCXDCMakeTool"
167 />
168 <Tool
169 Name="VCBscMakeTool"
170 />
171 <Tool
172 Name="VCFxCopTool"
173 />
174 <Tool
175 Name="VCAppVerifierTool"
176 />
177 <Tool
178 Name="VCWebDeploymentTool"
179 />
180 <Tool
181 Name="VCPostBuildEventTool"
182 />
183 </Configuration>
184 <Configuration
185 Name="ReleaseNoOpt|Win32"
186 OutputDirectory="$(ConfigurationName)"
187 IntermediateDirectory="$(ConfigurationName)"
188 ConfigurationType="1"
189 InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
190 CharacterSet="1"
191 >
192 <Tool
193 Name="VCPreBuildEventTool"
194 />
195 <Tool
196 Name="VCCustomBuildTool"
197 />
198 <Tool
199 Name="VCXMLDataGeneratorTool"
200 />
201 <Tool
202 Name="VCWebServiceProxyGeneratorTool"
203 />
204 <Tool
205 Name="VCMIDLTool"
206 />
207 <Tool
208 Name="VCCLCompilerTool"
209 Optimization="0"
210 AdditionalIncludeDirectories="..\llcrashlogger;..\llcommon;..\llmath;..\llvfs;..\llaudio;..\llmedia;..\llimage;..\llscene;..\llxml;..\llmessage;..\llprimitive;..\llrender;..\llwindow;..\llcharacter;..\llinventory;..\llui;..\lscript;&quot;..\..\libraries\i686-win32\include&quot;;..\..\libraries\include\;&quot;..\..\libraries\i686-win32\include\quicktime&quot;"
211 PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE"
212 RuntimeLibrary="0"
213 StructMemberAlignment="0"
214 TreatWChar_tAsBuiltInType="false"
215 ForceConformanceInForLoopScope="true"
216 UsePrecompiledHeader="0"
217 WarningLevel="3"
218 Detect64BitPortabilityProblems="false"
219 DebugInformationFormat="3"
220 />
221 <Tool
222 Name="VCManagedResourceCompilerTool"
223 />
224 <Tool
225 Name="VCResourceCompilerTool"
226 />
227 <Tool
228 Name="VCPreLinkEventTool"
229 />
230 <Tool
231 Name="VCLinkerTool"
232 AdditionalDependencies="apr-1.lib aprutil-1.lib ws2_32.lib advapi32.lib comdlg32.lib dxguid.lib gdi32.lib kernel32.lib libexpatMT.lib llcommon.lib llmath.lib llwindow.lib llvfs.lib llmessage.lib llxml.lib netapi32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib user32.lib wininet.lib winspool.lib winmm.lib ssleay32.lib zlib.lib libcurl.lib libeay32.lib oldnames.lib"
233 OutputFile="win_crash_logger.exe"
234 LinkIncremental="1"
235 AdditionalLibraryDirectories="../lib_$(ConfigurationName)/i686-win32;../../libraries/i686-win32/lib_release"
236 GenerateDebugInformation="true"
237 SubSystem="2"
238 OptimizeReferences="2"
239 EnableCOMDATFolding="2"
240 TargetMachine="1"
241 />
242 <Tool
243 Name="VCALinkTool"
244 />
245 <Tool
246 Name="VCManifestTool"
247 />
248 <Tool
249 Name="VCXDCMakeTool"
250 />
251 <Tool
252 Name="VCBscMakeTool"
253 />
254 <Tool
255 Name="VCFxCopTool"
256 />
257 <Tool
258 Name="VCAppVerifierTool"
259 />
260 <Tool
261 Name="VCWebDeploymentTool"
262 />
263 <Tool
264 Name="VCPostBuildEventTool"
265 />
266 </Configuration>
267 </Configurations>
268 <References>
269 </References>
270 <Files>
271 <Filter
272 Name="Source Files"
273 Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
274 UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
275 >
276 <File
277 RelativePath="..\llcrashlogger\llcrashlogger.cpp"
278 >
279 </File>
280 <File
281 RelativePath=".\llcrashloggerwindows.cpp"
282 >
283 </File>
284 <File
285 RelativePath=".\StdAfx.cpp"
286 >
287 </File>
288 <File
289 RelativePath=".\win_crash_logger.cpp"
290 >
291 </File>
292 </Filter>
293 <Filter
294 Name="Header Files"
295 Filter="h;hpp;hxx;hm;inl;inc;xsd"
296 UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
297 >
298 <File
299 RelativePath="..\llcrashlogger\llcrashlogger.h"
300 >
301 </File>
302 <File
303 RelativePath=".\llcrashloggerwindows.h"
304 >
305 </File>
306 <File
307 RelativePath=".\resource.h"
308 >
309 </File>
310 <File
311 RelativePath=".\StdAfx.h"
312 >
313 </File>
314 <File
315 RelativePath=".\win_crash_logger.h"
316 >
317 </File>
318 </Filter>
319 <Filter
320 Name="Resource Files"
321 Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
322 UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
323 >
324 <File
325 RelativePath=".\ll_icon.ico"
326 >
327 </File>
328 <File
329 RelativePath=".\win_crash_logger.rc"
330 >
331 </File>
332 </Filter>
333 </Files>
334 <Globals>
335 </Globals>
336</VisualStudioProject>
diff --git a/linden/indra/win_crash_logger/win_crash_logger_vc9.vcproj b/linden/indra/win_crash_logger/win_crash_logger_vc9.vcproj
deleted file mode 100644
index 0413ae9..0000000
--- a/linden/indra/win_crash_logger/win_crash_logger_vc9.vcproj
+++ /dev/null
@@ -1,337 +0,0 @@
1<?xml version="1.0" encoding="Windows-1252"?>
2<VisualStudioProject
3 ProjectType="Visual C++"
4 Version="9.00"
5 Name="win_crash_logger"
6 ProjectGUID="{648685F3-8760-4CC5-BB2B-CAF9DECC25A4}"
7 RootNamespace="win_crash_logger"
8 Keyword="Win32Proj"
9 TargetFrameworkVersion="131072"
10 >
11 <Platforms>
12 <Platform
13 Name="Win32"
14 />
15 </Platforms>
16 <ToolFiles>
17 </ToolFiles>
18 <Configurations>
19 <Configuration
20 Name="Debug|Win32"
21 OutputDirectory="Debug"
22 IntermediateDirectory="Debug"
23 ConfigurationType="1"
24 InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
25 CharacterSet="1"
26 >
27 <Tool
28 Name="VCPreBuildEventTool"
29 />
30 <Tool
31 Name="VCCustomBuildTool"
32 />
33 <Tool
34 Name="VCXMLDataGeneratorTool"
35 />
36 <Tool
37 Name="VCWebServiceProxyGeneratorTool"
38 />
39 <Tool
40 Name="VCMIDLTool"
41 />
42 <Tool
43 Name="VCCLCompilerTool"
44 Optimization="0"
45 AdditionalIncludeDirectories="..\llcrashlogger;..\llcommon;..\llmath;..\llvfs;..\llaudio;..\llmedia;..\llimage;..\llscene;..\llxml;..\llmessage;..\llprimitive;..\llrender;..\llwindow;..\llcharacter;..\llinventory;..\llui;..\lscript;&quot;..\..\libraries\i686-win32\include&quot;;..\..\libraries\include\;&quot;..\..\libraries\i686-win32\include\quicktime&quot;"
46 PreprocessorDefinitions="WIN32;_DEBUG;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_DEBUG"
47 MinimalRebuild="true"
48 BasicRuntimeChecks="3"
49 RuntimeLibrary="1"
50 StructMemberAlignment="4"
51 TreatWChar_tAsBuiltInType="false"
52 ForceConformanceInForLoopScope="true"
53 UsePrecompiledHeader="0"
54 WarningLevel="3"
55 Detect64BitPortabilityProblems="false"
56 DebugInformationFormat="4"
57 />
58 <Tool
59 Name="VCManagedResourceCompilerTool"
60 />
61 <Tool
62 Name="VCResourceCompilerTool"
63 />
64 <Tool
65 Name="VCPreLinkEventTool"
66 />
67 <Tool
68 Name="VCLinkerTool"
69 AdditionalDependencies="apr-1.lib aprutil-1.lib ws2_32.lib advapi32.lib comdlg32.lib dxguid.lib gdi32.lib kernel32.lib libexpatMT.lib llcommon.lib llmath.lib llwindow.lib llvfs.lib llmessage.lib llxml.lib netapi32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib user32.lib wininet.lib winspool.lib winmm.lib ssleay32.lib zlib.lib libcurld.lib libeay32.lib oldnames.lib"
70 OutputFile="win_crash_logger.exe"
71 LinkIncremental="1"
72 AdditionalLibraryDirectories="../lib_$(ConfigurationName)/i686-win32;../../libraries/i686-win32/lib_debug"
73 GenerateDebugInformation="true"
74 ProgramDatabaseFile="$(OutDir)/win_crash_logger.pdb"
75 SubSystem="2"
76 TargetMachine="1"
77 />
78 <Tool
79 Name="VCALinkTool"
80 />
81 <Tool
82 Name="VCManifestTool"
83 />
84 <Tool
85 Name="VCXDCMakeTool"
86 />
87 <Tool
88 Name="VCBscMakeTool"
89 />
90 <Tool
91 Name="VCFxCopTool"
92 />
93 <Tool
94 Name="VCAppVerifierTool"
95 />
96 <Tool
97 Name="VCWebDeploymentTool"
98 />
99 <Tool
100 Name="VCPostBuildEventTool"
101 />
102 </Configuration>
103 <Configuration
104 Name="Release|Win32"
105 OutputDirectory="Release"
106 IntermediateDirectory="Release"
107 ConfigurationType="1"
108 InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
109 CharacterSet="1"
110 >
111 <Tool
112 Name="VCPreBuildEventTool"
113 />
114 <Tool
115 Name="VCCustomBuildTool"
116 />
117 <Tool
118 Name="VCXMLDataGeneratorTool"
119 />
120 <Tool
121 Name="VCWebServiceProxyGeneratorTool"
122 />
123 <Tool
124 Name="VCMIDLTool"
125 />
126 <Tool
127 Name="VCCLCompilerTool"
128 AdditionalIncludeDirectories="..\llcrashlogger;..\llcommon;..\llmath;..\llvfs;..\llaudio;..\llmedia;..\llimage;..\llscene;..\llxml;..\llmessage;..\llprimitive;..\llrender;..\llwindow;..\llcharacter;..\llinventory;..\llui;..\lscript;&quot;..\..\libraries\i686-win32\include&quot;;..\..\libraries\include\;&quot;..\..\libraries\i686-win32\include\quicktime&quot;"
129 PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE"
130 RuntimeLibrary="0"
131 StructMemberAlignment="0"
132 TreatWChar_tAsBuiltInType="false"
133 ForceConformanceInForLoopScope="true"
134 UsePrecompiledHeader="0"
135 WarningLevel="3"
136 Detect64BitPortabilityProblems="false"
137 DebugInformationFormat="3"
138 />
139 <Tool
140 Name="VCManagedResourceCompilerTool"
141 />
142 <Tool
143 Name="VCResourceCompilerTool"
144 />
145 <Tool
146 Name="VCPreLinkEventTool"
147 />
148 <Tool
149 Name="VCLinkerTool"
150 AdditionalDependencies="apr-1.lib aprutil-1.lib ws2_32.lib advapi32.lib comdlg32.lib dxguid.lib gdi32.lib kernel32.lib libexpatMT.lib llcommon.lib llmath.lib llwindow.lib llvfs.lib llmessage.lib llxml.lib netapi32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib user32.lib wininet.lib winspool.lib winmm.lib ssleay32.lib zlib.lib libcurl.lib libeay32.lib oldnames.lib"
151 OutputFile="win_crash_logger.exe"
152 LinkIncremental="1"
153 AdditionalLibraryDirectories="../lib_$(ConfigurationName)/i686-win32;../../libraries/i686-win32/lib_release"
154 GenerateDebugInformation="true"
155 SubSystem="2"
156 OptimizeReferences="2"
157 EnableCOMDATFolding="2"
158 TargetMachine="1"
159 />
160 <Tool
161 Name="VCALinkTool"
162 />
163 <Tool
164 Name="VCManifestTool"
165 />
166 <Tool
167 Name="VCXDCMakeTool"
168 />
169 <Tool
170 Name="VCBscMakeTool"
171 />
172 <Tool
173 Name="VCFxCopTool"
174 />
175 <Tool
176 Name="VCAppVerifierTool"
177 />
178 <Tool
179 Name="VCWebDeploymentTool"
180 />
181 <Tool
182 Name="VCPostBuildEventTool"
183 />
184 </Configuration>
185 <Configuration
186 Name="ReleaseNoOpt|Win32"
187 OutputDirectory="$(ConfigurationName)"
188 IntermediateDirectory="$(ConfigurationName)"
189 ConfigurationType="1"
190 InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
191 CharacterSet="1"
192 >
193 <Tool
194 Name="VCPreBuildEventTool"
195 />
196 <Tool
197 Name="VCCustomBuildTool"
198 />
199 <Tool
200 Name="VCXMLDataGeneratorTool"
201 />
202 <Tool
203 Name="VCWebServiceProxyGeneratorTool"
204 />
205 <Tool
206 Name="VCMIDLTool"
207 />
208 <Tool
209 Name="VCCLCompilerTool"
210 Optimization="0"
211 AdditionalIncludeDirectories="..\llcrashlogger;..\llcommon;..\llmath;..\llvfs;..\llaudio;..\llmedia;..\llimage;..\llscene;..\llxml;..\llmessage;..\llprimitive;..\llrender;..\llwindow;..\llcharacter;..\llinventory;..\llui;..\lscript;&quot;..\..\libraries\i686-win32\include&quot;;..\..\libraries\include\;&quot;..\..\libraries\i686-win32\include\quicktime&quot;"
212 PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE"
213 RuntimeLibrary="0"
214 StructMemberAlignment="0"
215 TreatWChar_tAsBuiltInType="false"
216 ForceConformanceInForLoopScope="true"
217 UsePrecompiledHeader="0"
218 WarningLevel="3"
219 Detect64BitPortabilityProblems="false"
220 DebugInformationFormat="3"
221 />
222 <Tool
223 Name="VCManagedResourceCompilerTool"
224 />
225 <Tool
226 Name="VCResourceCompilerTool"
227 />
228 <Tool
229 Name="VCPreLinkEventTool"
230 />
231 <Tool
232 Name="VCLinkerTool"
233 AdditionalDependencies="apr-1.lib aprutil-1.lib ws2_32.lib advapi32.lib comdlg32.lib dxguid.lib gdi32.lib kernel32.lib libexpatMT.lib llcommon.lib llmath.lib llwindow.lib llvfs.lib llmessage.lib llxml.lib netapi32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib user32.lib wininet.lib winspool.lib winmm.lib ssleay32.lib zlib.lib libcurl.lib libeay32.lib oldnames.lib"
234 OutputFile="win_crash_logger.exe"
235 LinkIncremental="1"
236 AdditionalLibraryDirectories="../lib_$(ConfigurationName)/i686-win32;../../libraries/i686-win32/lib_release"
237 GenerateDebugInformation="true"
238 SubSystem="2"
239 OptimizeReferences="2"
240 EnableCOMDATFolding="2"
241 TargetMachine="1"
242 />
243 <Tool
244 Name="VCALinkTool"
245 />
246 <Tool
247 Name="VCManifestTool"
248 />
249 <Tool
250 Name="VCXDCMakeTool"
251 />
252 <Tool
253 Name="VCBscMakeTool"
254 />
255 <Tool
256 Name="VCFxCopTool"
257 />
258 <Tool
259 Name="VCAppVerifierTool"
260 />
261 <Tool
262 Name="VCWebDeploymentTool"
263 />
264 <Tool
265 Name="VCPostBuildEventTool"
266 />
267 </Configuration>
268 </Configurations>
269 <References>
270 </References>
271 <Files>
272 <Filter
273 Name="Source Files"
274 Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
275 UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
276 >
277 <File
278 RelativePath="..\llcrashlogger\llcrashlogger.cpp"
279 >
280 </File>
281 <File
282 RelativePath=".\llcrashloggerwindows.cpp"
283 >
284 </File>
285 <File
286 RelativePath=".\StdAfx.cpp"
287 >
288 </File>
289 <File
290 RelativePath=".\win_crash_logger.cpp"
291 >
292 </File>
293 </Filter>
294 <Filter
295 Name="Header Files"
296 Filter="h;hpp;hxx;hm;inl;inc;xsd"
297 UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
298 >
299 <File
300 RelativePath="..\llcrashlogger\llcrashlogger.h"
301 >
302 </File>
303 <File
304 RelativePath=".\llcrashloggerwindows.h"
305 >
306 </File>
307 <File
308 RelativePath=".\resource.h"
309 >
310 </File>
311 <File
312 RelativePath=".\StdAfx.h"
313 >
314 </File>
315 <File
316 RelativePath=".\win_crash_logger.h"
317 >
318 </File>
319 </Filter>
320 <Filter
321 Name="Resource Files"
322 Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
323 UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
324 >
325 <File
326 RelativePath=".\ll_icon.ico"
327 >
328 </File>
329 <File
330 RelativePath=".\win_crash_logger.rc"
331 >
332 </File>
333 </Filter>
334 </Files>
335 <Globals>
336 </Globals>
337</VisualStudioProject>