From 4002bdf8738860f835c8b8af440b2d34672c1695 Mon Sep 17 00:00:00 2001 From: Fredrik Høisæther Rasch Date: Mon, 20 Mar 2017 11:20:22 +0100 Subject: Added missing VCC C++ options to nim.cfg --- config/nim.cfg | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'config/nim.cfg') diff --git a/config/nim.cfg b/config/nim.cfg index 9374e2b88..273497546 100644 --- a/config/nim.cfg +++ b/config/nim.cfg @@ -181,26 +181,39 @@ clang.options.size = "-Os" # Configuration for the Visual C/C++ compiler: vcc.exe = "vccexe.exe" +vcc.cpp.exe = "vccexe.exe" vcc.linkerexe = "vccexe.exe" +vcc.cpp.linkerexe = "vccexe.exe" # set the options for specific platforms: @if i386: 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 /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 /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 = "/Zi /FS /Od" +vcc.cpp.options.debug = "/Zi /FS /Od" vcc.options.speed = "/O2" +vcc.cpp.options.speed = "/O2" vcc.options.size = "/O1" +vcc.cpp.options.size = "/O1" # Configuration for the Tiny C Compiler: tcc.options.always = "-w" -- cgit 1.4.1-2-gfad0 From 86206b253346ac221ca4392b339741064f031970 Mon Sep 17 00:00:00 2001 From: Fredrik Høisæther Rasch Date: Mon, 20 Mar 2017 22:32:17 +0100 Subject: Added explanatory comments about vccexe and its path argument in nim.cfg --- config/nim.cfg | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) (limited to 'config/nim.cfg') diff --git a/config/nim.cfg b/config/nim.cfg index 273497546..aff74af53 100644 --- a/config/nim.cfg +++ b/config/nim.cfg @@ -180,6 +180,39 @@ clang.options.speed = "-O3" clang.options.size = "-Os" # Configuration for the Visual C/C++ compiler: +# 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. + +# With Side-by-side installation support in VS2017, the VCC SDK no longer defines global environment variables +# that can be used to discover the path for your SDK installation. +# Because of that and greater flexibility you have to specify the path to the vcvarsall file that initializes +# the C/C++ Devloper Environment for a specified target architecture. + +# The following are the default paths for vcvarsall ordered by Visual Studio versions. +# Uncomment ONE of the following lines and/or adjust it to match your specific installation + +# Visual Studio 2008 +# --passC:"--vcvarsall:\"%VS90COMNTOOLS%..\\\..\\VC\\vcvarsall\"" +# --passL:"--vcvarsall:\"%VS90COMNTOOLS%..\\\..\\VC\\vcvarsall\"" +# Visual Studio 2010 +# --passC:"--vcvarsall:\"%VS100COMNTOOLS%..\\\..\\VC\\vcvarsall\"" +# --passL:"--vcvarsall:\"%VS100COMNTOOLS%..\\\..\\VC\\vcvarsall\"" +# Visual Studio 2012 +# --passC:"--vcvarsall:\"%VS110COMNTOOLS%..\\\..\\VC\\vcvarsall\"" +# --passL:"--vcvarsall:\"%VS110COMNTOOLS%..\\\..\\VC\\vcvarsall\"" +# Visual Studio 2013 +# --passC:"--vcvarsall:\"%VS120COMNTOOLS%..\\\..\\VC\\vcvarsall\"" +# --passL:"--vcvarsall:\"%VS120COMNTOOLS%..\\\..\\VC\\vcvarsall\"" +# Visual Studio 2015 +# --passC:"--vcvarsall:\"%VS140COMNTOOLS%..\\\..\\VC\\vcvarsall\"" +# --passL:"--vcvarsall:\"%VS140COMNTOOLS%..\\\..\\VC\\vcvarsall\"" +# Visual Studio 2017 Community Edition (replace the 'Community' path segment, with the Installation Instance name for your installtion) +# --passC:"--vcvarsall:\"C:\\Program Files (x86)\\Microsoft Visual Studio\\2107\\Community\\VC\\Auxiliary\\Build\\vcvarsall\"" +# --passL:"--vcvarsall:\"C:\\Program Files (x86)\\Microsoft Visual Studio\\2107\\Community\\VC\\Auxiliary\\Build\\vcvarsall\"" + +# Note that there are two entries, one 'passC' and one 'passL' entry, so that nim loads the tools both for compilation and linking. + vcc.exe = "vccexe.exe" vcc.cpp.exe = "vccexe.exe" vcc.linkerexe = "vccexe.exe" -- cgit 1.4.1-2-gfad0 From 513b0fed4da0a3bab46bc55b83e21575f41c2145 Mon Sep 17 00:00:00 2001 From: Fredrik Høisæther Rasch Date: Tue, 21 Mar 2017 01:35:46 +0100 Subject: vcvarsallpath explaination no longer needed with vccdiscover This reverts commit 7c4911d --- config/nim.cfg | 29 ----------------------------- 1 file changed, 29 deletions(-) (limited to 'config/nim.cfg') diff --git a/config/nim.cfg b/config/nim.cfg index aff74af53..9c9479363 100644 --- a/config/nim.cfg +++ b/config/nim.cfg @@ -184,35 +184,6 @@ clang.options.size = "-Os" # before calling the compiler. # Please make sure either Visual Studio or C++ Build SKU is installed when using the vcc compiler backend. -# With Side-by-side installation support in VS2017, the VCC SDK no longer defines global environment variables -# that can be used to discover the path for your SDK installation. -# Because of that and greater flexibility you have to specify the path to the vcvarsall file that initializes -# the C/C++ Devloper Environment for a specified target architecture. - -# The following are the default paths for vcvarsall ordered by Visual Studio versions. -# Uncomment ONE of the following lines and/or adjust it to match your specific installation - -# Visual Studio 2008 -# --passC:"--vcvarsall:\"%VS90COMNTOOLS%..\\\..\\VC\\vcvarsall\"" -# --passL:"--vcvarsall:\"%VS90COMNTOOLS%..\\\..\\VC\\vcvarsall\"" -# Visual Studio 2010 -# --passC:"--vcvarsall:\"%VS100COMNTOOLS%..\\\..\\VC\\vcvarsall\"" -# --passL:"--vcvarsall:\"%VS100COMNTOOLS%..\\\..\\VC\\vcvarsall\"" -# Visual Studio 2012 -# --passC:"--vcvarsall:\"%VS110COMNTOOLS%..\\\..\\VC\\vcvarsall\"" -# --passL:"--vcvarsall:\"%VS110COMNTOOLS%..\\\..\\VC\\vcvarsall\"" -# Visual Studio 2013 -# --passC:"--vcvarsall:\"%VS120COMNTOOLS%..\\\..\\VC\\vcvarsall\"" -# --passL:"--vcvarsall:\"%VS120COMNTOOLS%..\\\..\\VC\\vcvarsall\"" -# Visual Studio 2015 -# --passC:"--vcvarsall:\"%VS140COMNTOOLS%..\\\..\\VC\\vcvarsall\"" -# --passL:"--vcvarsall:\"%VS140COMNTOOLS%..\\\..\\VC\\vcvarsall\"" -# Visual Studio 2017 Community Edition (replace the 'Community' path segment, with the Installation Instance name for your installtion) -# --passC:"--vcvarsall:\"C:\\Program Files (x86)\\Microsoft Visual Studio\\2107\\Community\\VC\\Auxiliary\\Build\\vcvarsall\"" -# --passL:"--vcvarsall:\"C:\\Program Files (x86)\\Microsoft Visual Studio\\2107\\Community\\VC\\Auxiliary\\Build\\vcvarsall\"" - -# Note that there are two entries, one 'passC' and one 'passL' entry, so that nim loads the tools both for compilation and linking. - vcc.exe = "vccexe.exe" vcc.cpp.exe = "vccexe.exe" vcc.linkerexe = "vccexe.exe" -- cgit 1.4.1-2-gfad0