jyapayne/nim-nanovg
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update build info and nim-glfw

Browse source
This commit is contained in:
Joey Yakimowich-Payne 2020-01-12 08:33:20 -07:00
commit 86bd1747fc
2 changed files with 11 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
nanovg.nimble
View file

@ -12,7 +12,7 @@ requires "nim >= 1.0.0",
"nimterop#head", "nimterop#head",
"regex >= 0.12.0", "regex >= 0.12.0",
"opengl >= 1.2.2", "opengl >= 1.2.2",
"https://github.com/jyapayne/nim-glfw#d4f30db", "nim-glfw#head",
"sdl2_nim >= 2.0.5.0" "sdl2_nim >= 2.0.5.0"
import os import os

13
src/nanovg/wrapper.nim
View file

@ -70,12 +70,19 @@ cIncludeDir(srcDir/"src")
# Any global compiler options # Any global compiler options
when defined(macosx): when defined(macosx):
# cDefine("GLFW_INCLUDE_GLCOREARB", "1") # cDefine("GLFW_INCLUDE_GLCOREARB", "1")
{.passC: "-DNANOVG_GL3_IMPLEMENTATION -DNANOVG_GLEW -D_GLFW_USE_RETINA -D_GLFW_COCOA -D_GLFW_USE_CHDir -D_GLFW_USE_MENUBAR".} when defined(useGlfw):
{.passL: "-m64 -lglew -framework GLUT -framework OpenGL -framework Cocoa -framework IOKit -framework CoreVideo -framework Carbon -lm".} {.passC: "-DNANOVG_GL3_IMPLEMENTATION -DNANOVG_GLEW -D_GLFW_USE_RETINA -D_GLFW_COCOA -D_GLFW_USE_CHDir -D_GLFW_USE_MENUBAR".}
{.passL: "-m64 -lglew -framework GLUT -framework OpenGL -framework Cocoa -framework IOKit -framework CoreVideo -framework Carbon -lm".}
else:
{.passC: "-DNANOVG_GL3_IMPLEMENTATION -DNANOVG_GLEW".}
{.passL: "-m64 -lglew -framework GLUT -framework OpenGL -framework Cocoa -framework IOKit -framework CoreVideo -framework Carbon -lm".}
elif defined(unix): elif defined(unix):
{.passC: "-DNANOVG_GL3_IMPLEMENTATION -DNANOVG_GLEW".} {.passC: "-DNANOVG_GL3_IMPLEMENTATION -DNANOVG_GLEW".}
{.passL: "-lGL -lGLU -lGLEW -lm -lglfw".} when defined(useGlfw):
{.passL: "-lGL -lGLU -lGLEW -lm -lglfw".}
else:
{.passL: "-lGL -lGLU -lGLEW -lm -lSDL2".}
elif defined(windows): elif defined(windows):
const inclPath = baseDir/"lib"/"include" const inclPath = baseDir/"lib"/"include"
when defined(amd64): when defined(amd64):