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:
commit
386be5372a
@ -339,7 +339,6 @@ workspace "iw4x"
|
|||||||
saneCopyToPath = string.gsub(_OPTIONS["copy-to"] .. "\\", "\\\\", "\\")
|
saneCopyToPath = string.gsub(_OPTIONS["copy-to"] .. "\\", "\\\\", "\\")
|
||||||
postbuildcommands {
|
postbuildcommands {
|
||||||
"if not exist \"" .. saneCopyToPath .. "\" mkdir \"" .. saneCopyToPath .. "\"",
|
"if not exist \"" .. saneCopyToPath .. "\" mkdir \"" .. saneCopyToPath .. "\"",
|
||||||
"copy /y \"$(TargetDir)*.dll\" \"" .. saneCopyToPath .. "\"",
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if _OPTIONS["copy-pdb"] then
|
if _OPTIONS["copy-pdb"] then
|
||||||
@ -347,6 +346,11 @@ workspace "iw4x"
|
|||||||
"copy /y \"$(TargetDir)*.pdb\" \"" .. saneCopyToPath .. "\"",
|
"copy /y \"$(TargetDir)*.pdb\" \"" .. saneCopyToPath .. "\"",
|
||||||
}
|
}
|
||||||
end
|
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
|
end
|
||||||
|
|
||||||
-- Specific configurations
|
-- Specific configurations
|
||||||
|
Loading…
x
Reference in New Issue
Block a user