diff options
| author | Araq <rumpf_a@web.de> | 2012-03-04 21:44:56 +0100 |
|---|---|---|
| committer | Araq <rumpf_a@web.de> | 2012-03-04 21:44:56 +0100 |
| commit | ff4a69b6243f8f14cea78d428d2fd78ee4be3823 (patch) | |
| tree | 2713edb2c4805551b08c6e516d514a383604fae2 /compiler/nimrod.nim | |
| parent | 34d3c042af7f70ce579c5ea76c8ca22298da368c (diff) | |
| download | Nim-ff4a69b6243f8f14cea78d428d2fd78ee4be3823.tar.gz | |
win64 is a supported target; bugfix: nimrod c -r on windows; stdlib uses wide char versions of the WinAPI
Diffstat (limited to 'compiler/nimrod.nim')
| -rwxr-xr-x | compiler/nimrod.nim | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/compiler/nimrod.nim b/compiler/nimrod.nim index 10e10e1ec..e9c674a07 100755 --- a/compiler/nimrod.nim +++ b/compiler/nimrod.nim @@ -7,8 +7,11 @@ # distribution, for details about the copyright. # -when defined(gcc) and defined(windows): - {.link: "icons/nimrod.res".} +when defined(gcc) and defined(windows): + when defined(x86): + {.link: "icons/nimrod.res".} + else: + {.link: "icons/nimrod_icon.o".} import times, commands, lexer, condsyms, options, msgs, nversion, nimconf, ropes, @@ -96,7 +99,7 @@ proc HandleCmdLine() = formatSize(getTotalMem())]) if optRun in gGlobalOptions: var ex = quoteIfContainsWhite( - changeFileExt(gProjectFull, "").prependCurDir) + changeFileExt(gProjectFull, exeExt).prependCurDir) execExternalProgram(ex & ' ' & arguments) #GC_disableMarkAndSweep() |