resolve merge conflicts
This commit is contained in:
commit
0ab1229c69
9 changed files with 367 additions and 147 deletions
|
|
@ -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",
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue