From 86bd1747fc82c3e4fb9baf75aa6c90340cdb27ed Mon Sep 17 00:00:00 2001 From: Joey Yakimowich-Payne Date: Sun, 12 Jan 2020 08:33:20 -0700 Subject: [PATCH] Update build info and nim-glfw --- nanovg.nimble | 2 +- src/nanovg/wrapper.nim | 13 ++++++++++--- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/nanovg.nimble b/nanovg.nimble index 66e0111..8a23a58 100644 --- a/nanovg.nimble +++ b/nanovg.nimble @@ -12,7 +12,7 @@ requires "nim >= 1.0.0", "nimterop#head", "regex >= 0.12.0", "opengl >= 1.2.2", - "https://github.com/jyapayne/nim-glfw#d4f30db", + "nim-glfw#head", "sdl2_nim >= 2.0.5.0" import os diff --git a/src/nanovg/wrapper.nim b/src/nanovg/wrapper.nim index f934e52..1e779db 100644 --- a/src/nanovg/wrapper.nim +++ b/src/nanovg/wrapper.nim @@ -70,12 +70,19 @@ cIncludeDir(srcDir/"src") # Any global compiler options when defined(macosx): # 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".} - {.passL: "-m64 -lglew -framework GLUT -framework OpenGL -framework Cocoa -framework IOKit -framework CoreVideo -framework Carbon -lm".} + when defined(useGlfw): + {.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): {.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): const inclPath = baseDir/"lib"/"include" when defined(amd64):