From 5e3c0999e0f969f7fb18fa14b8587b177e52666e Mon Sep 17 00:00:00 2001
From: Joey Yakimowich-Payne <jyapayne@gmail.com>
Date: Tue, 17 Jul 2018 18:11:39 +0900
Subject: Fix windows not processing headers

---
 src/nimgen/c2nim.nim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/nimgen/c2nim.nim b/src/nimgen/c2nim.nim
index f171e8d..fe257f2 100644
--- a/src/nimgen/c2nim.nim
+++ b/src/nimgen/c2nim.nim
@@ -6,7 +6,7 @@ template relativePath(path: untyped): untyped =
   path.multiReplace([(gOutput, ""), ("\\", "/"), ("//", "/")])
 
 proc c2nim*(fl, outfile: string, c2nimConfig: c2nimConfigObj) =
-  var file = search(fl)
+  var file = search(fl).sanitizePath
   if file.len() == 0:
     return
 
-- 
cgit v1.2.3


From 6343567a9182dccac9edb61c636bd5ddf2732cfe Mon Sep 17 00:00:00 2001
From: Joey Yakimowich-Payne <jyapayne@gmail.com>
Date: Wed, 18 Jul 2018 07:52:45 +0900
Subject: Put sanitizePath in search()

---
 src/nimgen/c2nim.nim    | 2 +-
 src/nimgen/external.nim | 2 +-
 src/nimgen/file.nim     | 4 ++--
 src/nimgen/runcfg.nim   | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/nimgen/c2nim.nim b/src/nimgen/c2nim.nim
index fe257f2..f171e8d 100644
--- a/src/nimgen/c2nim.nim
+++ b/src/nimgen/c2nim.nim
@@ -6,7 +6,7 @@ template relativePath(path: untyped): untyped =
   path.multiReplace([(gOutput, ""), ("\\", "/"), ("//", "/")])
 
 proc c2nim*(fl, outfile: string, c2nimConfig: c2nimConfigObj) =
-  var file = search(fl).sanitizePath
+  var file = search(fl)
   if file.len() == 0:
     return
 
diff --git a/src/nimgen/external.nim b/src/nimgen/external.nim
index 350c841..c0d5fdc 100644
--- a/src/nimgen/external.nim
+++ b/src/nimgen/external.nim
@@ -118,7 +118,7 @@ proc runPreprocess*(file, ppflags, flags: string, inline: bool): string =
   var
     rdata: Rope
     start = false
-    sfile = file.replace("\\", "/")
+    sfile = file.sanitizePath
 
   if inline:
     sfile = sfile.parentDir()
diff --git a/src/nimgen/file.nim b/src/nimgen/file.nim
index d78c692..708ae4a 100644
--- a/src/nimgen/file.nim
+++ b/src/nimgen/file.nim
@@ -1,6 +1,6 @@
 import os, ospaths, pegs, regex, strutils, tables
 
-import globals
+import globals, external
 
 # ###
 # File loction
@@ -44,7 +44,7 @@ proc search*(file: string): string =
       quit(1)
 
   # Only keep relative directory
-  return result.multiReplace([("\\", $DirSep), ("//", $DirSep), (gProjectDir & $DirSep, "")])
+  return result.sanitizePath.replace(gProjectDir & "/", "")
 
 proc rename*(file: string, renfile: string) =
   if file.splitFile().ext == ".nim":
diff --git a/src/nimgen/runcfg.nim b/src/nimgen/runcfg.nim
index cafb48e..7255c52 100644
--- a/src/nimgen/runcfg.nim
+++ b/src/nimgen/runcfg.nim
@@ -25,7 +25,7 @@ proc getKey(ukey: string): tuple[key: string, val: bool] =
 proc runFile*(file: string, cfgin: OrderedTableRef = newOrderedTable[string, string]()) =
   var
     cfg = cfgin
-    sfile = search(file).sanitizePath
+    sfile = search(file)
 
   if sfile in gDoneRecursive:
     return
-- 
cgit v1.2.3


From f3c01e53f985a5f479ee4c58c492cc88e6d7af98 Mon Sep 17 00:00:00 2001
From: Joey Yakimowich-Payne <jyapayne@gmail.com>
Date: Wed, 18 Jul 2018 12:25:13 +0900
Subject: Fix a few more issues with windows paths

---
 src/nimgen/runcfg.nim | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/nimgen/runcfg.nim b/src/nimgen/runcfg.nim
index 7255c52..03c0013 100644
--- a/src/nimgen/runcfg.nim
+++ b/src/nimgen/runcfg.nim
@@ -161,13 +161,13 @@ proc runCfg*(cfg: string) =
     echo "Config doesn't exist: " & cfg
     quit(1)
 
-  gProjectDir = parentDir(cfg.expandFilename())
+  gProjectDir = parentDir(cfg.expandFilename()).sanitizePath
 
   gConfig = loadConfig(cfg)
 
   if gConfig.hasKey("n.global"):
     if gConfig["n.global"].hasKey("output"):
-      gOutput = gConfig["n.global"]["output"]
+      gOutput = gConfig["n.global"]["output"].sanitizePath
       if dirExists(gOutput):
         if "-f" in commandLineParams():
           try:
@@ -207,11 +207,11 @@ proc runCfg*(cfg: string) =
 
   if gConfig.hasKey("n.include"):
     for inc in gConfig["n.include"].keys():
-      gIncludes.add(inc.addEnv())
+      gIncludes.add(inc.addEnv().sanitizePath)
 
   if gConfig.hasKey("n.exclude"):
     for excl in gConfig["n.exclude"].keys():
-      gExcludes.add(excl.addEnv())
+      gExcludes.add(excl.addEnv().sanitizePath)
 
   if gConfig.hasKey("n.prepare"):
     for prep in gConfig["n.prepare"].keys():
-- 
cgit v1.2.3