diff --git a/src/sdl2/sdl2.nim b/src/sdl2/sdl2.nim index 2eaa3b7..6d28356 100644 --- a/src/sdl2/sdl2.nim +++ b/src/sdl2/sdl2.nim @@ -1,3 +1,4 @@ +import macros import os, strutils, strformat import nimterop/[cimport, build, globals] @@ -7,7 +8,7 @@ const srcDir = (baseDir / "sdl2").sanitizePath buildDir = (srcDir / "build" / ".libs").sanitizePath includeDir = (srcDir / "include").sanitizePath - currentPath = currentSourcePath().parentDir().parentDir().sanitizePath + currentPath = getProjectPath().parentDir().sanitizePath generatedPath = (currentPath / "generated" / "sdl2").replace("\\", "/") symbolPluginPath = (currentSourcePath.parentDir() / "cleansymbols.nim").sanitizePath diff --git a/src/sdl2/sdl2_gfx.nim b/src/sdl2/sdl2_gfx.nim index 56cf846..241ec05 100644 --- a/src/sdl2/sdl2_gfx.nim +++ b/src/sdl2/sdl2_gfx.nim @@ -1,3 +1,4 @@ +import macros import os, strutils, strformat import sdl2 import nimterop/[cimport, build, globals] @@ -6,7 +7,7 @@ const baseDir = SDLCacheDir srcDir = baseDir / "sdl2_gfx" buildDir = srcDir / ".libs" - currentPath = currentSourcePath().parentDir().parentDir().sanitizePath + currentPath = getProjectPath().parentDir().sanitizePath generatedPath = (currentPath / "generated" / "sdl2_gfx").replace("\\", "/") symbolPluginPath = currentSourcePath.parentDir() / "cleansymbols.nim" diff --git a/src/sdl2/sdl2_gpu.nim b/src/sdl2/sdl2_gpu.nim index c37b631..cd4d946 100644 --- a/src/sdl2/sdl2_gpu.nim +++ b/src/sdl2/sdl2_gpu.nim @@ -1,3 +1,4 @@ +import macros import os, strformat, strutils import sdl2 import nimterop/[build, cimport, globals] @@ -6,8 +7,8 @@ const baseDir = SDLCacheDir sdlDir = (baseDir / "sdl2").sanitizePath srcDir = (baseDir / "sdl2_gpu").sanitizePath - currentPath = currentSourcePath().parentDir().parentDir().sanitizePath - generatedPath = (currentPath / "generated").replace("\\", "/") + currentPath = getProjectPath().parentDir().sanitizePath + generatedPath = (currentPath / "generated" / "sdl2_gpu").replace("\\", "/") cmakeModPath = (currentPath / "cmake" / "sdl2").replace("\\", "/") symbolPluginPath = (currentPath / "sdl2" / "cleansymbols.nim").sanitizePath diff --git a/src/sdl2/sdl2_image.nim b/src/sdl2/sdl2_image.nim index 53c3f45..401a140 100644 --- a/src/sdl2/sdl2_image.nim +++ b/src/sdl2/sdl2_image.nim @@ -1,3 +1,4 @@ +import macros import os, strutils, strformat import sdl2 import nimterop/[cimport, build, globals] @@ -6,8 +7,8 @@ const baseDir = SDLCacheDir srcDir = baseDir / "sdl2_image" buildDir = srcDir / ".libs" - currentPath = currentSourcePath().parentDir().parentDir().sanitizePath - generatedPath = (currentPath / "generated").replace("\\", "/") + currentPath = getProjectPath().parentDir().sanitizePath + generatedPath = (currentPath / "generated" / "sdl2_image").replace("\\", "/") symbolPluginPath = currentSourcePath.parentDir() / "cleansymbols.nim" defs = """ diff --git a/src/sdl2/sdl2_mixer.nim b/src/sdl2/sdl2_mixer.nim index 267993d..5daf3ab 100644 --- a/src/sdl2/sdl2_mixer.nim +++ b/src/sdl2/sdl2_mixer.nim @@ -1,3 +1,4 @@ +import macros import os, strutils, strformat import sdl2 import nimterop/[cimport, build, globals] @@ -6,8 +7,8 @@ const baseDir = SDLCacheDir srcDir = baseDir / "sdl2_mixer" buildDir = srcDir / "build" / ".libs" - currentPath = currentSourcePath().parentDir().parentDir().sanitizePath - generatedPath = (currentPath / "generated").replace("\\", "/") + currentPath = getProjectPath().parentDir().sanitizePath + generatedPath = (currentPath / "generated" / "sdl2_mixer").replace("\\", "/") symbolPluginPath = currentSourcePath.parentDir() / "cleansymbols.nim" defs = """ diff --git a/src/sdl2/sdl2_net.nim b/src/sdl2/sdl2_net.nim index ff3a344..badd90d 100644 --- a/src/sdl2/sdl2_net.nim +++ b/src/sdl2/sdl2_net.nim @@ -1,3 +1,4 @@ +import macros import os, strutils, strformat import sdl2 import nimterop/[cimport, build, globals] @@ -6,7 +7,7 @@ const baseDir = SDLCacheDir srcDir = baseDir / "sdl2_net" buildDir = srcDir / ".libs" - currentPath = currentSourcePath().parentDir().parentDir().sanitizePath + currentPath = getProjectPath().parentDir().sanitizePath generatedPath = (currentPath / "generated" / "sdl2_net").replace("\\", "/") symbolPluginPath = currentSourcePath.parentDir() / "cleansymbols.nim" diff --git a/src/sdl2/sdl2_ttf.nim b/src/sdl2/sdl2_ttf.nim index c4878ae..a39cbd8 100644 --- a/src/sdl2/sdl2_ttf.nim +++ b/src/sdl2/sdl2_ttf.nim @@ -1,3 +1,4 @@ +import macros import os, strutils, strformat import sdl2 import nimterop/[cimport, build, globals] @@ -7,8 +8,8 @@ const sdlDir = (baseDir / "sdl2").sanitizePath srcDir = (baseDir / "sdl2_ttf").sanitizePath buildDir = srcDir / ".libs" - currentPath = currentSourcePath().parentDir().parentDir().sanitizePath - generatedPath = (currentPath / "generated").replace("\\", "/") + currentPath = getProjectPath().parentDir().sanitizePath + generatedPath = (currentPath / "generated" / "sdl2_ttf").replace("\\", "/") symbolPluginPath = (currentPath / "sdl2" / "cleansymbols.nim").sanitizePath defs = """