Merge commit into minidump

# Conflicts:
#	src/Components/Modules/Exception.cpp
#	src/Components/Modules/Exception.hpp
#	src/Utils/WebIO.cpp
#	src/Utils/WebIO.hpp
This commit is contained in:
/dev/urandom 2016-08-28 21:21:41 +02:00
commit 386be5372a
No known key found for this signature in database
GPG Key ID: 41322B973E0F295E

View File

@ -339,7 +339,6 @@ workspace "iw4x"
saneCopyToPath = string.gsub(_OPTIONS["copy-to"] .. "\\", "\\\\", "\\")
postbuildcommands {
"if not exist \"" .. saneCopyToPath .. "\" mkdir \"" .. saneCopyToPath .. "\"",
"copy /y \"$(TargetDir)*.dll\" \"" .. saneCopyToPath .. "\"",
}
if _OPTIONS["copy-pdb"] then
@ -347,6 +346,11 @@ workspace "iw4x"
"copy /y \"$(TargetDir)*.pdb\" \"" .. saneCopyToPath .. "\"",
}
end
-- This has to be the last one, as otherwise VisualStudio will succeed building even if copying fails
postbuildcommands {
"copy /y \"$(TargetDir)*.dll\" \"" .. saneCopyToPath .. "\"",
}
end
-- Specific configurations