From 0bddb6f1ef710defa799a3aebc6bcc37f66d5f25 Mon Sep 17 00:00:00 2001
From: Joey Yakimowich-Payne <jyapayne@gmail.com>
Date: Fri, 20 Jul 2018 17:00:39 +0900
Subject: [PATCH] Fix more windows issues

---
 libnx.nimble | 8 ++++----
 libnxGen.cfg | 5 ++---
 src/nim.cfg  | 2 --
 3 files changed, 6 insertions(+), 9 deletions(-)
 delete mode 100644 src/nim.cfg

diff --git a/libnx.nimble b/libnx.nimble
index 6f6915e..196da2d 100644
--- a/libnx.nimble
+++ b/libnx.nimble
@@ -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()
diff --git a/libnxGen.cfg b/libnxGen.cfg
index a8f8a94..f13d50d 100644
--- a/libnxGen.cfg
+++ b/libnxGen.cfg
@@ -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
diff --git a/src/nim.cfg b/src/nim.cfg
deleted file mode 100644
index 72c20da..0000000
--- a/src/nim.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-
---path="../ext"