Fix for absolute paths in includes and headers
This commit is contained in:
parent
a717b9d140
commit
60d94e9114
1 changed files with 12 additions and 6 deletions
|
|
@ -493,6 +493,9 @@ 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:
|
||||||
|
if inc.isAbsolute():
|
||||||
|
passC &= ("""{.passC: "-I\"$#\"".}""" % [inc]) & "\n"
|
||||||
|
else:
|
||||||
passC &= (
|
passC &= (
|
||||||
"""{.passC: "-I\"" & currentSourcePath().splitPath().head & "$#\"".}""" %
|
"""{.passC: "-I\"" & currentSourcePath().splitPath().head & "$#\"".}""" %
|
||||||
inc.relativePath()
|
inc.relativePath()
|
||||||
|
|
@ -531,6 +534,9 @@ proc c2nim(fl, outfile: string, c2nimConfig: c2nimConfigObj) =
|
||||||
|
|
||||||
if outlib != "":
|
if outlib != "":
|
||||||
extflags &= " --dynlib:dynlib$#" % fname
|
extflags &= " --dynlib:dynlib$#" % fname
|
||||||
|
else:
|
||||||
|
if file.isAbsolute():
|
||||||
|
passC &= "const header$# = \"$#\"\n" % [fname, file]
|
||||||
else:
|
else:
|
||||||
passC &= "const header$# = currentSourcePath().splitPath().head & \"$#\"\n" %
|
passC &= "const header$# = currentSourcePath().splitPath().head & \"$#\"\n" %
|
||||||
[fname, file.relativePath()]
|
[fname, file.relativePath()]
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue