From e8d5379897f5c2f89e91fe6bd452dcda6b6451fe Mon Sep 17 00:00:00 2001
From: Joey Yakimowich-Payne <jyapayne@gmail.com>
Date: Wed, 9 Sep 2020 20:26:24 -0600
Subject: [PATCH] Use nimFile

---
 .gitignore            | 1 +
 nanovg.nimble         | 4 ++--
 src/nanovg/nanovg.nim | 9 ++++++---
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index 384b6eb..2f5d299 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,6 +9,7 @@ build
 
 nimcache/
 
+generated/
 build/
 examples/demo
 demo.exe
diff --git a/nanovg.nimble b/nanovg.nimble
index 8667e07..d4b6019 100644
--- a/nanovg.nimble
+++ b/nanovg.nimble
@@ -12,8 +12,8 @@ requires "nim >= 1.0.6",
          "https://github.com/jyapayne/nimterop#367ec05",
          "opengl >= 1.2.6",
          "sdl2#head",
-         "https://github.com/jyapayne/nim-glew#c6a3e51",
-         "https://github.com/jyapayne/nim-glfw#8414225"
+         "https://github.com/jyapayne/nim-glew#472f904",
+         "https://github.com/jyapayne/nim-glfw#41b7a74"
 
 import os
 
diff --git a/src/nanovg/nanovg.nim b/src/nanovg/nanovg.nim
index d896c12..e8aa351 100644
--- a/src/nanovg/nanovg.nim
+++ b/src/nanovg/nanovg.nim
@@ -1,3 +1,4 @@
+import macros
 import os
 import strutils
 import glew
@@ -11,6 +12,8 @@ import nimterop/[cimport, build]
 const
   baseDir = currentSourcePath.parentDir().parentDir().parentDir()
   srcDir = baseDir/"build"/"nanovg"
+  currentPath = getProjectPath().parentDir().sanitizePath
+  generatedPath = (currentPath / "generated" / "nanovg").replace("\\", "/")
   symbolPluginPath = currentSourcePath.parentDir() / "cleansymbols.nim"
 
   defs = """
@@ -121,6 +124,6 @@ cPluginPath(symbolPluginPath)
 
 # Finally import wrapped header file. Recurse if #include files should also
 # be wrapped. Set dynlib if binding to dynamic library.
-cImport(srcDir/"src"/"nanovg.h", flags = "-f=ast2 -H")
-cImport(srcDir/"src"/"nanovg_gl.h", flags = "-f=ast2 -H")
-cImport(srcDir/"src"/"nanovg_gl_utils.h", flags = "-f=ast2 -H")
+cImport(srcDir/"src"/"nanovg.h", flags = "-f=ast2 -H", nimFile = generatedPath / "nanovg.nim")
+cImport(srcDir/"src"/"nanovg_gl.h", flags = "-f=ast2 -H", nimFile = generatedPath / "nanovg_gl.nim")
+cImport(srcDir/"src"/"nanovg_gl_utils.h", flags = "-f=ast2 -H", nimFile = generatedPath / "nanovg_gl_utils.nim")