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

Fix more windows issues

Browse source
This commit is contained in:
Joey Yakimowich-Payne 2018-07-20 17:00:39 +09:00
commit 0bddb6f1ef
3 changed files with 6 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

8
libnx.nimble
View file

@ -10,10 +10,10 @@ srcDir = "src"
import distros import distros
var prefix = "" var prefix = ""
var username = "$USER" var username = getEnv("USER")
if detectOs(Windows): if detectOs(Windows):
prefix = "cmd /c " prefix = "cmd /c "
username = "%username%" username = getEnv("USERNAME")
# Deps # Deps
requires "nim >= 0.18.1", "https://github.com/genotrance/nimgen#head" requires "nim >= 0.18.1", "https://github.com/genotrance/nimgen#head"
@ -24,8 +24,8 @@ task setup, "Download and generate bindings":
exec prefix & "nimgen libnxGen.cfg" exec prefix & "nimgen libnxGen.cfg"
task buildExamples, "Build switch examples": task buildExamples, "Build switch examples":
exec prefix & "switch_build --libnxPath='" & thisDir() & "/src/libnx/wrapper/nx/' --author=\"" & username & "\" --version='1.0.0' examples/helloworld/helloworld.nim" exec prefix & "switch_build --libnxPath=\"" & thisDir() & "/src/libnx/wrapper/nx/\" --author=\"" & username & "\" --version=\"1.0.0\" examples/helloworld/helloworld.nim"
exec prefix & "switch_build --libnxPath='" & thisDir() & "/src/libnx/wrapper/nx/' --author=\"" & username & "\" --version='1.0.0' examples/accounts/account_ex.nim" exec prefix & "switch_build --libnxPath=\"" & thisDir() & "/src/libnx/wrapper/nx/\" --author=\"" & username & "\" --version=\"1.0.0\" examples/accounts/account_ex.nim"
before install: before install:
setupTask() setupTask()

5
libnxGen.cfg
View file

@ -16,7 +16,6 @@ filter=lock
"${output}/nx/include/switch/runtime/util" "${output}/nx/include/switch/runtime/util"
"${output}/nx/include/switch/runtime/devices" "${output}/nx/include/switch/runtime/devices"
"${DEVKITPRO}/devkitA64/aarch64-none-elf/include/" "${DEVKITPRO}/devkitA64/aarch64-none-elf/include/"
"${DEVKITA64}/aarch64-none-elf/include/"
[n.exclude] [n.exclude]
"${output}/nim.cfg" "${output}/nim.cfg"
@ -102,8 +101,8 @@ replace.cdecl = "cdecl"
[n.prepare] [n.prepare]
git = "https://github.com/switchbrew/libnx" git = "https://github.com/switchbrew/libnx"
execute.lin = """cd ${output}; make;""" execute-lin = """cd ${output}; make;"""
execute.mac = """cd ${output}; make;""" execute-mac = """cd ${output}; make;"""
[n.post] [n.post]
reset=true reset=true

2
src/nim.cfg
View file

@ -1,2 +0,0 @@
--path="../ext"