diff options
| author | Araq <rumpf_a@web.de> | 2018-12-12 18:16:53 +0100 |
|---|---|---|
| committer | Araq <rumpf_a@web.de> | 2018-12-12 18:16:53 +0100 |
| commit | 0ab1229c6988ed9ad2f9f1f87f41cddc17a849e0 (patch) | |
| tree | 94b2b4ffb1631ac1b1bc51cb0b9cfa3de274c1e8 /config/nim.cfg | |
| parent | ac8274c60f860b334a08199c4c0a65620962ef2a (diff) | |
| parent | caeb6110e6742e01a4daf07ed45752b5466f5d1c (diff) | |
| download | Nim-0ab1229c6988ed9ad2f9f1f87f41cddc17a849e0.tar.gz | |
resolve merge conflicts
Diffstat (limited to 'config/nim.cfg')
| -rw-r--r-- | config/nim.cfg | 49 |
1 files changed, 29 insertions, 20 deletions
diff --git a/config/nim.cfg b/config/nim.cfg index 932e80331..38683b304 100644 --- a/config/nim.cfg +++ b/config/nim.cfg @@ -23,7 +23,7 @@ hint[LineTooLong]=off arm.linux.gcc.exe = "arm-linux-gnueabihf-gcc" arm.linux.gcc.linkerexe = "arm-linux-gnueabihf-gcc" -# For OpenWRT, you will also need to adjust PATH to point to your toolchain. +# For OpenWRT, you will also need to adjust PATH to point to your toolchain. mips.linux.gcc.exe = "mips-openwrt-linux-gcc" mips.linux.gcc.linkerexe = "mips-openwrt-linux-gcc" @@ -225,9 +225,13 @@ clang.options.speed = "-O3" clang.options.size = "-Os" # Configuration for the Visual C/C++ compiler: -vcc.exe = "vccexe.exe" +# VCCEXE is a tool that invokes the Visual Studio Developer Command Prompt +# before calling the compiler. +# Please make sure either Visual Studio or C++ Build SKU is installed when using the vcc compiler backend. + +vcc.exe = "vccexe.exe" vcc.cpp.exe = "vccexe.exe" -vcc.linkerexe = "vccexe.exe" +vcc.linkerexe = "vccexe.exe" vcc.cpp.linkerexe = "vccexe.exe" # set the options for specific platforms: @@ -238,30 +242,35 @@ vcc.options.always = "/nologo" vcc.options.always %= "${vcc.options.always} /Z7" # Get VCC to output full debug symbols in the obj file @end vcc.cpp.options.always %= "${vcc.options.always} /EHsc" -vcc.options.linker = "/nologo /DEBUG /Zi /F33554432" # set the stack size to 32 MiB +vcc.options.linker = "/nologo /DEBUG /Zi /F33554432" # set the stack size to 32 MiB vcc.cpp.options.linker %= "${vcc.options.linker}" @if i386: -vcc.options.always %= "--platform:x86 ${vcc.options.always}" -vcc.cpp.options.always %= "--platform:x86 ${vcc.cpp.options.always}" -vcc.options.linker %= "--platform:x86 ${vcc.options.linker}" -vcc.cpp.options.linker %= "--platform:x86 ${vcc.cpp.options.linker}" + vcc.options.always = "--platform:x86 /nologo" + vcc.cpp.options.always = "--platform:x86 /nologo /EHsc" + vcc.options.linker = "--platform:x86 /nologo /DEBUG /Zi /F33554432" # set the stack size to 32 MiB + vcc.cpp.options.linker = "--platform:x86 /nologo /DEBUG /Zi /F33554432" # set the stack size to 32 MiB @elif amd64: -vcc.options.always %= "--platform:amd64 ${vcc.options.always}" -vcc.cpp.options.always %= "--platform:amd64 ${vcc.cpp.options.always}" -vcc.options.linker %= "--platform:amd64 ${vcc.options.linker}" -vcc.cpp.options.linker %= "--platform:amd64 ${vcc.cpp.options.linker}" + vcc.options.always = "--platform:amd64 /nologo" + vcc.cpp.options.always = "--platform:amd64 /nologo /EHsc" + vcc.options.linker = "--platform:amd64 /nologo /DEBUG /Zi /F33554432" # set the stack size to 32 MiB + vcc.cpp.options.linker = "--platform:amd64 /nologo /DEBUG /Zi /F33554432" # set the stack size to 32 MiB @elif arm: -vcc.options.always %= "--platform:arm ${vcc.options.always}" -vcc.cpp.options.always %= "--platform:arm ${vcc.cpp.options.always}" -vcc.options.linker %= "--platform:arm ${vcc.options.linker}" -vcc.cpp.options.linker %= "--platform:arm ${vcc.cpp.options.linker}" + vcc.options.always = "--platform:arm /nologo" + vcc.cpp.options.always = "--platform:arm /nologo /EHsc" + vcc.options.linker = "--platform:arm /nologo /DEBUG /Zi /F33554432" # set the stack size to 32 MiB + vcc.cpp.options.linker = "--platform:arm /nologo /DEBUG /Zi /F33554432" # set the stack size to 32 MiB +@else: + vcc.options.always = "/nologo" + vcc.cpp.options.always = "/nologo /EHsc" + vcc.options.linker = "/nologo /DEBUG /Zi /F33554432" # set the stack size to 32 MiB + vcc.cpp.options.linker = "/nologo /DEBUG /Zi /F33554432" # set the stack size to 32 MiB @end -vcc.options.debug = "/Od" -vcc.cpp.options.debug = "/Od" -vcc.options.speed = "/O2" +vcc.options.debug = "/Zi /FS /Od" +vcc.cpp.options.debug = "/Zi /FS /Od" +vcc.options.speed = "/O2" vcc.cpp.options.speed = "/O2" -vcc.options.size = "/O1" +vcc.options.size = "/O1" vcc.cpp.options.size = "/O1" # Configuration for the Tiny C Compiler: |