Fix more windows issues

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

View file

@ -10,10 +10,10 @@ srcDir = "src"
import distros
var prefix = ""
var username = "$USER"
var username = getEnv("USER")
if detectOs(Windows):
prefix = "cmd /c "
username = "%username%"
username = getEnv("USERNAME")
# Deps
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"
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/accounts/account_ex.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"
before install:
setupTask()

View file

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

View file

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