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

Merge pull request #30 from jyapayne/fix_cross_compile_sourcepath

Browse source 
Fix issue with sourcepath building switch on Windows
This commit is contained in:
genotrance 2018-07-16 08:48:59 -05:00 • committed by GitHub
commit aad005e0b1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/nimgen/c2nim.nim
View file

@ -36,12 +36,14 @@ proc c2nim*(fl, outfile: string, c2nimConfig: c2nimConfigObj) =
passC = "import ospaths, strutils\n"
passC &= """const sourcePath = currentSourcePath().split({'\\', '/'})[0..^2].join("/")""" & "\n"
for inc in gIncludes:
if inc.isAbsolute():
passC &= ("""{.passC: "-I\"$#\"".}""" % [inc.sanitizePath()]) & "\n"
else:
passC &= (
"""{.passC: "-I\"" & currentSourcePath().splitPath().head & "$#\"".}""" %
"""{.passC: "-I\"" & sourcePath & "$#\"".}""" %
inc.relativePath()
) & "\n"
@ -82,7 +84,7 @@ proc c2nim*(fl, outfile: string, c2nimConfig: c2nimConfigObj) =
if file.isAbsolute():
passC &= "const header$# = \"$#\"\n" % [fname, file]
else:
passC &= "const header$# = currentSourcePath().splitPath().head & \"$#\"\n" %
passC &= "const header$# = sourcePath & \"$#\"\n" %
[fname, file.relativePath()]
extflags = "--header:header$#" % fname
# Run c2nim on generated file