resolve merge conflicts

This commit is contained in:
Araq 2018-12-12 18:16:53 +01:00
commit 0ab1229c69
9 changed files with 367 additions and 147 deletions

View file

@ -134,7 +134,7 @@ compiler vcc:
result = (
name: "vcc",
objExt: "obj",
optSpeed: " /Ogityb2 /G7 /arch:SSE2 ",
optSpeed: " /Ogityb2 /G7 ",
optSize: " /O1 /G7 ",
compilerExe: "cl",
cppCompiler: "cl",