svn merge -r88066:88786 svn+ssh://svn.lindenlab.com/svn/linden/branches/cmake-9-merge

dataserver-is-deprecated
for-fucks-sake-whats-with-these-commit-markers

2 files changed, 66 insertions, 1 deletions

diff --git a/indra/win_crash_logger/CMakeLists.txt b/indra/win_crash_logger/CMakeLists.txt
new file mode 100644
index 0000000000..9be6c5c5bf
--- /dev/null
+++ b/indra/win_crash_logger/CMakeLists.txt
@@ -0,0 +1,65 @@
+# -*- cmake -*-
+
+project(win_crash_logger)
+
+include(00-Common)
+include(LLCommon)
+include(LLCrashLogger)
+include(LLMath)
+include(LLMessage)
+include(LLVFS)
+include(LLWindow)
+include(LLXML)
+include(Linking)
+
+include_directories(
+    ${LLCOMMON_INCLUDE_DIRS}
+    ${LLCRASHLOGGER_INCLUDE_DIRS}
+    ${LLMATH_INCLUDE_DIRS}
+    ${LLWINDOW_INCLUDE_DIRS}
+    ${LLXML_INCLUDE_DIRS}
+    ${LLVFS_INCLUDE_DIRS}
+    )
+
+set(win_crash_logger_SOURCE_FILES
+    win_crash_logger.cpp
+    llcrashloggerwindows.cpp
+    )
+
+set(win_crash_logger_HEADER_FILES
+    CMakeLists.txt
+
+    llcrashloggerwindows.h
+    resource.h
+    StdAfx.h
+    win_crash_logger.h
+    )
+
+set_source_files_properties(${win_crash_logger_HEADER_FILES}
+                            PROPERTIES HEADER_FILE_ONLY TRUE)
+
+list(APPEND win_crash_logger_SOURCE_FILES ${win_crash_logger_HEADER_FILES})
+
+find_library(DXGUID_LIBRARY dxguid ${DIRECTX_LIBRARY_DIR})
+
+add_executable(windows-crash-logger WIN32 ${win_crash_logger_SOURCE_FILES})
+
+target_link_libraries(windows-crash-logger
+    ${LLCRASHLOGGER_LIBRARIES}
+    ${LLWINDOW_LIBRARIES}
+    ${LLVFS_LIBRARIES}
+    ${LLXML_LIBRARIES}
+    ${LLMESSAGE_LIBRARIES}
+    ${LLMATH_LIBRARIES}
+    ${LLCOMMON_LIBRARIES}
+    ${WINDOWS_LIBRARIES}
+    ${DXGUID_LIBRARY}
+    )
+    
+if (WINDOWS)
+    set_target_properties(windows-crash-logger
+        PROPERTIES 
+        LINK_FLAGS "/NODEFAULTLIB:MSVCRT"
+        LINK_FLAGS_DEBUG "/NODEFAULTLIB:LIBCMT /NODEFAULTLIB:MSVCRTD"
+        )
+endif (WINDOWS)
diff --git a/indra/win_crash_logger/llcrashloggerwindows.cpp b/indra/win_crash_logger/llcrashloggerwindows.cpp
index e6d859a08a..b09821977d 100644
--- a/indra/win_crash_logger/llcrashloggerwindows.cpp
+++ b/indra/win_crash_logger/llcrashloggerwindows.cpp
@@ -341,7 +341,7 @@ bool LLCrashLoggerWindows::mainLoop()
 		ShowWindow(gHwndReport, SW_SHOW );
 		
 		MSG msg;
-		msg.wParam = 0;
+		memset(&msg, 0, sizeof(msg));
 		while (!LLApp::isQuitting() && GetMessage(&msg, NULL, 0, 0))
 		{
 			TranslateMessage(&msg);