diff --git a/src/sdl2/sdl2.nim b/src/sdl2/sdl2.nim index 2dee40c..2eaa3b7 100644 --- a/src/sdl2/sdl2.nim +++ b/src/sdl2/sdl2.nim @@ -7,6 +7,8 @@ const srcDir = (baseDir / "sdl2").sanitizePath buildDir = (srcDir / "build" / ".libs").sanitizePath includeDir = (srcDir / "include").sanitizePath + currentPath = currentSourcePath().parentDir().parentDir().sanitizePath + generatedPath = (currentPath / "generated" / "sdl2").replace("\\", "/") symbolPluginPath = (currentSourcePath.parentDir() / "cleansymbols.nim").sanitizePath defs = """ @@ -231,9 +233,9 @@ else: {.passC: "-fPIC".} when isDefined(SDLStatic): - cImport(srcDir/"include"/"SDL.h", recurse = true, flags = "-f=ast2 -H -DDOXYGEN_SHOULD_IGNORE_THIS -E__,_ -F__,_") + cImport(srcDir/"include"/"SDL.h", recurse = true, flags = "-f=ast2 -H -DDOXYGEN_SHOULD_IGNORE_THIS -E__,_ -F__,_", nimFile = generatedPath / "sdl2.nim") else: - cImport(srcDir/"include"/"SDL.h", recurse = true, dynlib = "SDL_LPath", flags = "-f=ast2 -H -DDOXYGEN_SHOULD_IGNORE_THIS -E__,_ -F__,_") + cImport(srcDir/"include"/"SDL.h", recurse = true, dynlib = "SDL_LPath", flags = "-f=ast2 -H -DDOXYGEN_SHOULD_IGNORE_THIS -E__,_ -F__,_", nimFile = generatedPath / "sdl2.nim") const WINDOWPOS_UNDEFINED* = WINDOWPOS_UNDEFINED_DISPLAY(0) diff --git a/src/sdl2/sdl2_gfx.nim b/src/sdl2/sdl2_gfx.nim index 96f68f5..56cf846 100644 --- a/src/sdl2/sdl2_gfx.nim +++ b/src/sdl2/sdl2_gfx.nim @@ -6,6 +6,8 @@ const baseDir = SDLCacheDir srcDir = baseDir / "sdl2_gfx" buildDir = srcDir / ".libs" + currentPath = currentSourcePath().parentDir().parentDir().sanitizePath + generatedPath = (currentPath / "generated" / "sdl2_gfx").replace("\\", "/") symbolPluginPath = currentSourcePath.parentDir() / "cleansymbols.nim" defs = """ @@ -43,12 +45,12 @@ static: cPluginPath(symbolPluginPath) when isDefined(SDL2gfxPrimitivesStatic): - cImport(srcDir / "SDL2_gfxPrimitives.h", recurse = false, flags = &"-I={SDLIncludeDir} -f=ast2 -H") - cImport(srcDir / "SDL2_rotozoom.h", recurse = false, flags = &"-I={SDLIncludeDir} -f=ast2 -H") - cImport(srcDir / "SDL2_framerate.h", recurse = false, flags = &"-I={SDLIncludeDir} -f=ast2 -H") - cImport(srcDir / "SDL2_imageFilter.h", recurse = false, flags = &"-I={SDLIncludeDir} -f=ast2 -H") + cImport(srcDir / "SDL2_gfxPrimitives.h", recurse = false, flags = &"-I={SDLIncludeDir} -f=ast2 -H", nimFile = generatedPath / "sdl2_gfxprimitives.nim") + cImport(srcDir / "SDL2_rotozoom.h", recurse = false, flags = &"-I={SDLIncludeDir} -f=ast2 -H", nimFile = generatedPath / "sdl2_rotozoom.nim") + cImport(srcDir / "SDL2_framerate.h", recurse = false, flags = &"-I={SDLIncludeDir} -f=ast2 -H", nimFile = generatedPath / "sdl2_framerate.nim") + cImport(srcDir / "SDL2_imageFilter.h", recurse = false, flags = &"-I={SDLIncludeDir} -f=ast2 -H", nimFile = generatedPath / "sdl2_imagefilter.nim") else: - cImport(srcDir / "SDL2_gfxPrimitives.h", recurse = false, dynlib="SDL2_GfxPrimitives_LPath", flags = &"-I={SDLIncludeDir} -f=ast2 -H") - cImport(srcDir / "SDL2_rotozoom.h", recurse = false, dynlib="SDL2_GfxPrimitives_LPath", flags = &"-I={SDLIncludeDir} -f=ast2 -H") - cImport(srcDir / "SDL2_framerate.h", recurse = false, dynlib="SDL2_GfxPrimitives_LPath", flags = &"-I={SDLIncludeDir} -f=ast2 -H") - cImport(srcDir / "SDL2_imageFilter.h", recurse = false, dynlib="SDL2_GfxPrimitives_LPath", flags = &"-I={SDLIncludeDir} -f=ast2 -H") + cImport(srcDir / "SDL2_gfxPrimitives.h", recurse = false, dynlib="SDL2_GfxPrimitives_LPath", flags = &"-I={SDLIncludeDir} -f=ast2 -H", nimFile = generatedPath / "sdl2_gfxprimitives.nim") + cImport(srcDir / "SDL2_rotozoom.h", recurse = false, dynlib="SDL2_GfxPrimitives_LPath", flags = &"-I={SDLIncludeDir} -f=ast2 -H", nimFile = generatedPath / "sdl2_rotozoom.nim") + cImport(srcDir / "SDL2_framerate.h", recurse = false, dynlib="SDL2_GfxPrimitives_LPath", flags = &"-I={SDLIncludeDir} -f=ast2 -H", nimFile = generatedPath / "sdl2_framerate.nim") + cImport(srcDir / "SDL2_imageFilter.h", recurse = false, dynlib="SDL2_GfxPrimitives_LPath", flags = &"-I={SDLIncludeDir} -f=ast2 -H", nimFile = generatedPath / "sdl2_imagefilter.nim") diff --git a/src/sdl2/sdl2_gpu.nim b/src/sdl2/sdl2_gpu.nim index d2c0a6a..c37b631 100644 --- a/src/sdl2/sdl2_gpu.nim +++ b/src/sdl2/sdl2_gpu.nim @@ -7,6 +7,7 @@ const sdlDir = (baseDir / "sdl2").sanitizePath srcDir = (baseDir / "sdl2_gpu").sanitizePath currentPath = currentSourcePath().parentDir().parentDir().sanitizePath + generatedPath = (currentPath / "generated").replace("\\", "/") cmakeModPath = (currentPath / "cmake" / "sdl2").replace("\\", "/") symbolPluginPath = (currentPath / "sdl2" / "cleansymbols.nim").sanitizePath @@ -111,9 +112,9 @@ cOverride: cPluginPath(symbolPluginPath) when isDefined(SDLgpuStatic): - cImport(srcDir/"include"/"SDL_gpu.h", recurse = false, flags = &"-I={SDLIncludeDir} -f=ast2 -H") + cImport(srcDir/"include"/"SDL_gpu.h", recurse = false, flags = &"-I={SDLIncludeDir} -f=ast2 -H", nimFile = generatedPath / "sdl2_gpu.nim") else: - cImport(srcDir/"include"/"SDL_gpu.h", recurse = false, dynlib = "SDL_gpuLPath", flags = &"-I={SDLIncludeDir} -f=ast2 -H") + cImport(srcDir/"include"/"SDL_gpu.h", recurse = false, dynlib = "SDL_gpuLPath", flags = &"-I={SDLIncludeDir} -f=ast2 -H", nimFile = generatedPath / "sdl2_gpu.nim") let diff --git a/src/sdl2/sdl2_image.nim b/src/sdl2/sdl2_image.nim index 5538be5..53c3f45 100644 --- a/src/sdl2/sdl2_image.nim +++ b/src/sdl2/sdl2_image.nim @@ -6,6 +6,8 @@ const baseDir = SDLCacheDir srcDir = baseDir / "sdl2_image" buildDir = srcDir / ".libs" + currentPath = currentSourcePath().parentDir().parentDir().sanitizePath + generatedPath = (currentPath / "generated").replace("\\", "/") symbolPluginPath = currentSourcePath.parentDir() / "cleansymbols.nim" defs = """ @@ -62,6 +64,6 @@ cIncludeDir(SDLIncludeDir) {.passL: "-lwebp -lpng -ltiff -ljpeg".} when isDefined(SDLimageStatic): - cImport(srcDir/"SDL_image.h", recurse = false, flags = &"-f=ast2 -H") + cImport(srcDir/"SDL_image.h", recurse = false, flags = &"-f=ast2 -H", nimFile = generatedPath / "sdl2_image.nim") else: - cImport(srcDir/"SDL_image.h", recurse = false, dynlib = "SDL_image_LPath", flags = &"-f=ast2 -H") + cImport(srcDir/"SDL_image.h", recurse = false, dynlib = "SDL_image_LPath", flags = &"-f=ast2 -H", nimFile = generatedPath / "sdl2_image.nim") diff --git a/src/sdl2/sdl2_mixer.nim b/src/sdl2/sdl2_mixer.nim index 27b3034..267993d 100644 --- a/src/sdl2/sdl2_mixer.nim +++ b/src/sdl2/sdl2_mixer.nim @@ -6,6 +6,8 @@ const baseDir = SDLCacheDir srcDir = baseDir / "sdl2_mixer" buildDir = srcDir / "build" / ".libs" + currentPath = currentSourcePath().parentDir().parentDir().sanitizePath + generatedPath = (currentPath / "generated").replace("\\", "/") symbolPluginPath = currentSourcePath.parentDir() / "cleansymbols.nim" defs = """ @@ -53,6 +55,6 @@ cOverride: cPluginPath(symbolPluginPath) when isDefined(SDLmixerStatic): - cImport(srcDir/"SDL_mixer.h", recurse = false, flags = &"-I={SDLIncludeDir} -f=ast2 -H") + cImport(srcDir/"SDL_mixer.h", recurse = false, flags = &"-I={SDLIncludeDir} -f=ast2 -H", nimFile = generatedPath / "sdl2_mixer.nim") else: - cImport(srcDir/"SDL_mixer.h", recurse = false, dynlib = "SDL_mixer_LPath", flags = &"-I={SDLIncludeDir} -f=ast2 -H") + cImport(srcDir/"SDL_mixer.h", recurse = false, dynlib = "SDL_mixer_LPath", flags = &"-I={SDLIncludeDir} -f=ast2 -H", nimFile = generatedPath / "sdl2_mixer.nim") diff --git a/src/sdl2/sdl2_net.nim b/src/sdl2/sdl2_net.nim index 37cd89f..ff3a344 100644 --- a/src/sdl2/sdl2_net.nim +++ b/src/sdl2/sdl2_net.nim @@ -6,6 +6,8 @@ const baseDir = SDLCacheDir srcDir = baseDir / "sdl2_net" buildDir = srcDir / ".libs" + currentPath = currentSourcePath().parentDir().parentDir().sanitizePath + generatedPath = (currentPath / "generated" / "sdl2_net").replace("\\", "/") symbolPluginPath = currentSourcePath.parentDir() / "cleansymbols.nim" defs = """ @@ -51,8 +53,8 @@ cOverride: cPluginPath(symbolPluginPath) when isDefined(SDLnetStatic): - cImport(srcDir / "SDL_net.h", recurse = false, flags = &"-I={SDLIncludeDir} -f=ast2 -H") - cImport(srcDir / "SDLnetsys.h", recurse = false, flags = &"-I={SDLIncludeDir} -f=ast2 -H") + cImport(srcDir / "SDL_net.h", recurse = false, flags = &"-I={SDLIncludeDir} -f=ast2 -H", nimFile = generatedPath / "sdl2_net.nim") + cImport(srcDir / "SDLnetsys.h", recurse = false, flags = &"-I={SDLIncludeDir} -f=ast2 -H", nimFile = generatedPath / "sdl2_netsys.nim") else: - cImport(srcDir / "SDL_net.h", recurse = false, dynlib = "SDL_net_LPath", flags = &"-I={sdlIncludeDir} -f=ast2 -H") - cImport(srcDir / "SDLnetsys.h", recurse = false, flags = &"-I={SDLIncludeDir} -f=ast2 -H") + cImport(srcDir / "SDL_net.h", recurse = false, dynlib = "SDL_net_LPath", flags = &"-I={sdlIncludeDir} -f=ast2 -H", nimFile = generatedPath / "sdl2_net.nim") + cImport(srcDir / "SDLnetsys.h", recurse = false, flags = &"-I={SDLIncludeDir} -f=ast2 -H", nimFile = generatedPath / "sdl2_netsys.nim") diff --git a/src/sdl2/sdl2_ttf.nim b/src/sdl2/sdl2_ttf.nim index ca800b6..c4878ae 100644 --- a/src/sdl2/sdl2_ttf.nim +++ b/src/sdl2/sdl2_ttf.nim @@ -8,6 +8,7 @@ const srcDir = (baseDir / "sdl2_ttf").sanitizePath buildDir = srcDir / ".libs" currentPath = currentSourcePath().parentDir().parentDir().sanitizePath + generatedPath = (currentPath / "generated").replace("\\", "/") symbolPluginPath = (currentPath / "sdl2" / "cleansymbols.nim").sanitizePath defs = """ @@ -55,6 +56,6 @@ cOverride: SetError* = "" when isDefined(SDLttfStatic): - cImport(srcDir / "SDL_ttf.h", recurse = false, flags = &"-I={SDLIncludeDir} -f=ast2 -H") + cImport(srcDir / "SDL_ttf.h", recurse = false, flags = &"-I={SDLIncludeDir} -f=ast2 -H", nimFile = generatedPath / "sdl2_ttf.nim") else: - cImport(srcDir / "SDL_ttf.h", recurse = false, dynlib = "SDL_ttf_LPath", flags = &"-I={SDLIncludeDir} -f=ast2 -H") + cImport(srcDir / "SDL_ttf.h", recurse = false, dynlib = "SDL_ttf_LPath", flags = &"-I={SDLIncludeDir} -f=ast2 -H", nimFile = generatedPath / "sdl2_ttf.nim")