From 5b0d510ca0e136b0fb20b56b1c921666054bd7cc Mon Sep 17 00:00:00 2001
From: Alain Linden <alain@lindenlab.com>
Date: Tue, 18 Jan 2011 12:41:49 -0800
Subject: [PATCH] windows build fixes.
---
indra/integration_tests/llui_libtest/CMakeLists.txt | 4 ++--
indra/newview/viewer_manifest.py | 3 ++-
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/indra/integration_tests/llui_libtest/CMakeLists.txt b/indra/integration_tests/llui_libtest/CMakeLists.txt
index e0772e55ca3..df471671545 100644
--- a/indra/integration_tests/llui_libtest/CMakeLists.txt
+++ b/indra/integration_tests/llui_libtest/CMakeLists.txt
@@ -91,14 +91,14 @@ if (WINDOWS)
# Copy over OpenJPEG.dll
# *NOTE: On Windows with VS2005, only the first comment prints
set(OPENJPEG_RELEASE
- "${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/release/openjpeg.dll")
+ "${ARCH_PREBUILT_DIRS_RELEASE}/openjpeg.dll")
add_custom_command( TARGET llui_libtest POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy_if_different
${OPENJPEG_RELEASE} ${CMAKE_CURRENT_BINARY_DIR}
COMMENT "Copying OpenJPEG DLLs to binary directory"
)
set(OPENJPEG_DEBUG
- "${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/debug/openjpegd.dll")
+ "${ARCH_PREBUILT_DIRS_DEBUG}/openjpegd.dll")
add_custom_command( TARGET llui_libtest POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy_if_different
${OPENJPEG_DEBUG} ${CMAKE_CURRENT_BINARY_DIR}
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index 4a1ad6c8934..cb74422ca28 100644
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -300,7 +300,8 @@ def construct(self):
self.path("vivoxoal.dll")
# For use in crash reporting (generates minidumps)
- self.path("dbghelp.dll")
+ if self.args['configuration'].lower() != 'debug':
+ self.path("dbghelp.dll")
# For google-perftools tcmalloc allocator.
try:
--
GitLab