3 files changed, 12 insertions, 4 deletions
diff --git a/compiler/extccomp.nim b/compiler/extccomp.nim
index eaaf4a578..fb2e5f3f5 100755
--- a/compiler/extccomp.nim
+++ b/compiler/extccomp.nim
@@ -403,7 +403,7 @@ proc execExternalProgram*(cmd: string) =
   if execCmd(cmd) != 0: rawMessage(errExecutionOfProgramFailed, "")
 
 proc generateScript(projectFile: string, script: PRope) = 
-  var (dir, name, ext) = splitFile(projectFile)
+  let (dir, name, ext) = splitFile(projectFile)
   WriteRope(script, dir / addFileExt("compile_" & name, 
                                      platform.os[targetOS].scriptExt))
 
diff --git a/compiler/nimrod.ini b/compiler/nimrod.ini
index b689ec1c4..9fd6f0ce6 100755
--- a/compiler/nimrod.ini
+++ b/compiler/nimrod.ini
@@ -43,9 +43,11 @@ Files: "koch.nim"
 Files: "icons/nimrod.ico"
 Files: "icons/nimrod.rc"
 Files: "icons/nimrod.res"
+Files: "icons/nimrod_icon.o"
 Files: "icons/koch.ico"
 Files: "icons/koch.rc"
 Files: "icons/koch.res"
+Files: "icons/koch_icon.o"
 
 Files: "compiler/readme.txt"
 Files: "compiler/nimrod.ini"
@@ -101,6 +103,8 @@ Files: "examples/*.tmpl"
 Files: "bin/nimrod.exe"
 Files: "bin/c2nim.exe"
 Files: "bin/niminst.exe"
+Files: "bin/nimgrep.exe"
+
 Files: "dist/*.dll"
 Files: "koch.exe"
 Files: "dist/mingw"
@@ -128,3 +132,4 @@ buildDepends: "gcc (>= 4:4.3.2)"
 pkgDepends: "gcc (>= 4:4.3.2)"
 shortDesc: "The Nimrod Compiler"
 licenses: "bin/nimrod,gpl2;lib/*,lgpl;"
+
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()