From 4b7874c83704f3c0afc48448d4347d9e8fecb036 Mon Sep 17 00:00:00 2001
From: Joey Yakimowich-Payne <jyapayne@gmail.com>
Date: Sat, 29 Sep 2018 11:10:42 -0600
Subject: [PATCH] Fix more build script issues

---
 libnxGen.cfg | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/libnxGen.cfg b/libnxGen.cfg
index e2e4ecf..4404075 100644
--- a/libnxGen.cfg
+++ b/libnxGen.cfg
@@ -34,6 +34,9 @@ defines=true
 [result.h]
 defines = true
 
+[thread_context.h]
+preprocess = false
+
 [hid.h]
 defines = true
 search.static_assert = "static_assert"
@@ -166,6 +169,26 @@ import libnx/ext/integer128
 template BIT*(n): auto = (1.uint shl n)
 """
 
+[thread_context.nim]
+search.timport = "../types"
+replace.timport = "libnx/wrapper/types"
+
+prepend.o = """
+import libnx/ext/integer128
+"""
+
+search.cpuall = "RegisterGroup_CpuAll ="
+comment.cpuall = 1
+
+search.fpugprs = "RegisterGroup_FpuGprs ="
+prepend.fpugprs = "RegisterGroup_CpuAll = BIT(0) or BIT(1), ## /< All CPU registers."
+
+search.fpuall = "RegisterGroup_FpuGprs or RegisterGroup_FpuSprs"
+replace.fpuall = "BIT(2) or BIT(3)"
+
+search.groupall = "RegisterGroup_CpuAll or RegisterGroup_FpuAll"
+replace.groupall = "BIT(0) or BIT(1) or BIT(2) or BIT(3)"
+
 [svc.nim]
 search.timport = "../types"
 replace.timport = "libnx/wrapper/types"
@@ -310,6 +333,11 @@ prepend.o = """
 import libnx/ext/integer128
 """
 
+[fence.nim]
+prepend.o = """
+import libnx/wrapper/types
+"""
+
 [cons.nim]
 search.o = "type\n"
 prepend.o = """
@@ -346,11 +374,16 @@ replace.threedmoo = "debugDevice_3DMOO*"
 search.timport = "../types"
 replace.timport = "libnx/wrapper/types"
 
+search.fimport = "../nvidia/fence"
+replace.fimport = "libnx/wrapper/fence"
+
 [romfs_dev.nim]
 search.timport = "../types"
 replace.timport = "libnx/wrapper/types"
 search.servimport = "../services/"
 replace.servimport = "libnx/wrapper/"
+search.o = "../libnx"
+replace.o = "libnx"
 
 [n.sourcefile]
 "${output}/*.nim"