jyapayne/nimgenEx
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix for absolute paths in includes and headers

Browse source
This commit is contained in:
Ganesh Viswanathan 2018-07-08 19:11:41 -05:00
commit 60d94e9114
1 changed files with 12 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

18
nimgen.nim
View file

@ -493,10 +493,13 @@ proc c2nim(fl, outfile: string, c2nimConfig: c2nimConfigObj) =
passC = "import ospaths, strutils\n" passC = "import ospaths, strutils\n"
for inc in gIncludes: for inc in gIncludes:
passC &= ( if inc.isAbsolute():
"""{.passC: "-I\"" & currentSourcePath().splitPath().head & "$#\"".}""" % passC &= ("""{.passC: "-I\"$#\"".}""" % [inc]) & "\n"
inc.relativePath() else:
) & "\n" passC &= (
"""{.passC: "-I\"" & currentSourcePath().splitPath().head & "$#\"".}""" %
inc.relativePath()
) & "\n"
for prag in c2nimConfig.pragma: for prag in c2nimConfig.pragma:
outpragma &= "{." & prag & ".}\n" outpragma &= "{." & prag & ".}\n"
@ -532,8 +535,11 @@ proc c2nim(fl, outfile: string, c2nimConfig: c2nimConfigObj) =
if outlib != "": if outlib != "":
extflags &= " --dynlib:dynlib$#" % fname extflags &= " --dynlib:dynlib$#" % fname
else: else:
passC &= "const header$# = currentSourcePath().splitPath().head & \"$#\"\n" % if file.isAbsolute():
[fname, file.relativePath()] passC &= "const header$# = \"$#\"\n" % [fname, file]
else:
passC &= "const header$# = currentSourcePath().splitPath().head & \"$#\"\n" %
[fname, file.relativePath()]
extflags = "--header:header$#" % fname extflags = "--header:header$#" % fname
# Run c2nim on generated file # Run c2nim on generated file