diff --git a/.vscode/launch.json b/.vscode/launch.json index efee8ec..6615f71 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -4,42 +4,33 @@ // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387 "version": "0.2.0", "configurations": [ - { - "name": "Nim Debug GLFW Windows", + "name": "Nim Debug GLFW", "type": "gdb", "request": "launch", - "target": "${workspaceFolder}\\build\\demo\\demo_glfw_debug.exe", + "valuesFormatting": "parseText", + "target": "${workspaceFolder}/build/demo/demo_glfw_debug", "cwd": "${workspaceRoot}", - "gdbpath": "${workspaceFolder}\\nim-gdb.bat", - "valuesFormatting": "parseText" - }, - { - "name": "Nim Debug SDL2 Windows", - "type": "gdb", - "request": "launch", - "target": "${workspaceFolder}\\build\\demosdl2\\demo_sdl2_debug.exe", - "cwd": "${workspaceRoot}", - "gdbpath": "${workspaceFolder}\\nim-gdb.bat", - "valuesFormatting": "parseText" + "gdbpath": "${workspaceFolder}/nim-gdb", + "windows": { + "target": "${workspaceFolder}\\build\\demo\\demo_glfw_debug.exe", + "cwd": "${workspaceRoot}", + "gdbpath": "${workspaceFolder}\\nim-gdb.bat" + } }, { "name": "Nim Debug SDL2", "type": "gdb", "request": "launch", + "valuesFormatting": "parseText", "target": "${workspaceFolder}/build/demosdl2/demo_sdl2_debug", "cwd": "${workspaceRoot}", "gdbpath": "${workspaceFolder}/nim-gdb", - "valuesFormatting": "parseText" - }, - { - "name": "Nim Debug GLFW", - "type": "gdb", - "request": "launch", - "target": "${workspaceFolder}/build/demo/demo_glfw_debug", - "cwd": "${workspaceRoot}", - "gdbpath": "${workspaceFolder}/nim-gdb", - "valuesFormatting": "parseText" - }, + "windows": { + "target": "${workspaceFolder}\\build\\demosdl2\\demo_sdl2_debug.exe", + "cwd": "${workspaceRoot}", + "gdbpath": "${workspaceFolder}\\nim-gdb.bat", + } + } ] } \ No newline at end of file diff --git a/nanovg.nimble b/nanovg.nimble index 8a23a58..f75208a 100644 --- a/nanovg.nimble +++ b/nanovg.nimble @@ -13,7 +13,7 @@ requires "nim >= 1.0.0", "regex >= 0.12.0", "opengl >= 1.2.2", "nim-glfw#head", - "sdl2_nim >= 2.0.5.0" + "sdl2_nim >= 2.0.12.0" import os @@ -50,16 +50,16 @@ proc setupSDL2(): string = task buildSDL2Example, "Build SDL2 example": let buildDir = setupSDL2() - exec "nim c --app:gui -d:release -d:danger -o:" & buildDir & "/" & "demo_sdl2".toExe & " -r examples/demo_sdl2.nim" + exec "nimble c --app:gui -d:release -d:danger -o:" & buildDir & "/" & "demo_sdl2".toExe & " -r examples/demo_sdl2.nim" task buildSDL2ExampleDebug, "Build SDL2 example debug": let buildDir = setupSDL2() - exec "nim c --app:gui --debugger:native -o:" & buildDir & "/" & "demo_sdl2_debug".toExe & " -r examples/demo_sdl2.nim" + exec "nimble c --app:gui --debugger:native -o:" & buildDir & "/" & "demo_sdl2_debug".toExe & " -r examples/demo_sdl2.nim" task buildGLFWExample, "Build GLFW example": let buildDir = setupGLFW() - exec "nim c --app:gui -d:useGlfw -d:release -d:danger -o:" & buildDir & "/" & "demo_glfw".toExe & " -r examples/demo.nim" + exec "nimble c --app:gui -d:useGlfw -d:release -d:danger -o:" & buildDir & "/" & "demo_glfw".toExe & " -r examples/demo.nim" task buildGLFWExampleDebug, "Build GLFW example debug": let buildDir = setupGLFW() - exec "nim c --app:gui --debugger:native -o:" & buildDir & "/" & "demo_glfw_debug".toExe & " -r examples/demo.nim" \ No newline at end of file + exec "nimble c --app:gui --debugger:native -o:" & buildDir & "/" & "demo_glfw_debug".toExe & " -r examples/demo.nim" \ No newline at end of file