Skip to content
Snippets Groups Projects
Commit 5b0d510c authored by Alain Linden's avatar Alain Linden
Browse files

windows build fixes.

parent c89cc27f
No related branches found
No related tags found
No related merge requests found
...@@ -91,14 +91,14 @@ if (WINDOWS) ...@@ -91,14 +91,14 @@ if (WINDOWS)
# Copy over OpenJPEG.dll # Copy over OpenJPEG.dll
# *NOTE: On Windows with VS2005, only the first comment prints # *NOTE: On Windows with VS2005, only the first comment prints
set(OPENJPEG_RELEASE 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 add_custom_command( TARGET llui_libtest POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy_if_different COMMAND ${CMAKE_COMMAND} -E copy_if_different
${OPENJPEG_RELEASE} ${CMAKE_CURRENT_BINARY_DIR} ${OPENJPEG_RELEASE} ${CMAKE_CURRENT_BINARY_DIR}
COMMENT "Copying OpenJPEG DLLs to binary directory" COMMENT "Copying OpenJPEG DLLs to binary directory"
) )
set(OPENJPEG_DEBUG 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 add_custom_command( TARGET llui_libtest POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy_if_different COMMAND ${CMAKE_COMMAND} -E copy_if_different
${OPENJPEG_DEBUG} ${CMAKE_CURRENT_BINARY_DIR} ${OPENJPEG_DEBUG} ${CMAKE_CURRENT_BINARY_DIR}
......
...@@ -300,6 +300,7 @@ def construct(self): ...@@ -300,6 +300,7 @@ def construct(self):
self.path("vivoxoal.dll") self.path("vivoxoal.dll")
# For use in crash reporting (generates minidumps) # For use in crash reporting (generates minidumps)
if self.args['configuration'].lower() != 'debug':
self.path("dbghelp.dll") self.path("dbghelp.dll")
# For google-perftools tcmalloc allocator. # For google-perftools tcmalloc allocator.
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment