Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
runner: windows-latest
}
# Earliest supported and latest nim
nim: [1.6.18, "stable"]
nim: [2.2.12, "stable"]
name: ${{ matrix.platform.icon }} ${{ matrix.platform.label }} - Nim v${{ matrix.nim }}
runs-on: ${{ matrix.platform.runner }}
defaults:
Expand Down
9 changes: 7 additions & 2 deletions leopard/wrapper.nim
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,11 @@ const

LeopardExtraLinkerFlags {.strdefine.} = ""

# CMake would otherwise take the first compiler on PATH, e.g. MSVC from vcvars.
leopardCmakeCompilers =
when defined(gcc): "-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++"
else: ""

static:
if buildOS == "windows":
func pathUnix2Win(path: string): string =
Expand All @@ -125,8 +130,8 @@ static:
if (bashEx("ls", LeopardLib.pathWin2Unix)).exitCode != 0:
discard bash("mkdir -p", buildDirUnix)
let cmd =
@["cd", buildDirUnix, "&& cmake", leopardDirUnix, LeopardCmakeFlags,
"&& make libleopard"]
@["cd", buildDirUnix, "&& cmake", leopardDirUnix, leopardCmakeCompilers,
LeopardCmakeFlags, "&& make libleopard"]
echo "\nBuilding Leopard-RS: " & cmd.join(" ")
let (output, exitCode) = bashEx cmd
echo output
Expand Down
Loading