diff options
| author | Araq <rumpf_a@web.de> | 2014-01-18 01:16:45 +0100 |
|---|---|---|
| committer | Araq <rumpf_a@web.de> | 2014-01-18 01:16:45 +0100 |
| commit | 36afdca87f3757c8468cbfa622de693447df7e07 (patch) | |
| tree | 3b739b667574c12dea389a17d9d84291fd355463 /tools/niminst | |
| parent | 5073914b8697a9fd1dc38bebef434b50850f2861 (diff) | |
| parent | 3f8bfb1e988322ab60cc54184d63a00906260665 (diff) | |
| download | Nim-36afdca87f3757c8468cbfa622de693447df7e07.tar.gz | |
resolved conflicts with master
Diffstat (limited to 'tools/niminst')
| -rw-r--r-- | tools/niminst/buildbat.tmpl | 4 | ||||
| -rw-r--r-- | tools/niminst/buildsh.tmpl | 4 | ||||
| -rw-r--r-- | tools/niminst/niminst.nim | 10 |
3 files changed, 9 insertions, 9 deletions
diff --git a/tools/niminst/buildbat.tmpl b/tools/niminst/buildbat.tmpl index ca76b0ef2..9a19fc70b 100644 --- a/tools/niminst/buildbat.tmpl +++ b/tools/niminst/buildbat.tmpl @@ -17,8 +17,8 @@ REM call the compiler: # var linkCmd = "" # for ff in items(c.cfiles[winIndex][cpuIndex]): # let f = ff.toWin -ECHO %CC% %COMP_FLAGS% -Inimcache -c ?{f} -o ?{changeFileExt(f, "o")} -%CC% %COMP_FLAGS% -Inimcache -c ?{f} -o ?{changeFileExt(f, "o")} +ECHO %CC% %COMP_FLAGS% -Ic_code -c ?{f} -o ?{changeFileExt(f, "o")} +%CC% %COMP_FLAGS% -Ic_code -c ?{f} -o ?{changeFileExt(f, "o")} # linkCmd.add(" " & changeFileExt(f, "o")) # end for diff --git a/tools/niminst/buildsh.tmpl b/tools/niminst/buildsh.tmpl index 37ea35bd3..4966af07a 100644 --- a/tools/niminst/buildsh.tmpl +++ b/tools/niminst/buildsh.tmpl @@ -128,8 +128,8 @@ case $myos in # var linkCmd = "" # for ff in items(c.cfiles[osA][cpuA]): # let f = ff.toUnix - echo "$CC $COMP_FLAGS -Inimcache -c ?{f} -o ?{changeFileExt(f, "o")}" - $CC $COMP_FLAGS -Inimcache -c ?{f} -o ?{changeFileExt(f, "o")} + echo "$CC $COMP_FLAGS -Ic_code -c ?{f} -o ?{changeFileExt(f, "o")}" + $CC $COMP_FLAGS -Ic_code -c ?{f} -o ?{changeFileExt(f, "o")} # add(linkCmd, " \\\n" & changeFileExt(f, "o")) # end for echo "$LINKER -o ?{"$binDir/" & toLower(c.name)} ?linkCmd $LINK_FLAGS" diff --git a/tools/niminst/niminst.nim b/tools/niminst/niminst.nim index da0815aa2..bf8a7a84f 100644 --- a/tools/niminst/niminst.nim +++ b/tools/niminst/niminst.nim @@ -392,7 +392,7 @@ proc readCFiles(c: var TConfigData, osA, cpuA: int) = quit("Cannot open: " & f) proc buildDir(os, cpu: int): string = - return "nimcache" / ($os & "_" & $cpu) + return "c_code" / ($os & "_" & $cpu) proc getOutputDir(c: var TConfigData): string = if c.outdir.len > 0: c.outdir else: "build" @@ -432,11 +432,11 @@ proc writeInstallScripts(c: var TConfigData) = writeFile(deinstallShFile, generateDeinstallScript(c), "\10") proc srcdist(c: var TConfigData) = - if not existsDir(getOutputDir(c) / "nimcache"): - createDir(getOutputDir(c) / "nimcache") + if not existsDir(getOutputDir(c) / "c_code"): + createDir(getOutputDir(c) / "c_code") for x in walkFiles(c.libpath / "lib/*.h"): - echo(getOutputDir(c) / "nimcache" / extractFilename(x)) - copyFile(dest=getOutputDir(c) / "nimcache" / extractFilename(x), source=x) + echo(getOutputDir(c) / "c_code" / extractFilename(x)) + copyFile(dest=getOutputDir(c) / "c_code" / extractFilename(x), source=x) var winIndex = -1 var intel32Index = -1 var intel64Index = -1 |