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

Rearrange wrapper to be in line with module

Browse source
This commit is contained in:
Joey Yakimowich-Payne 2018-06-23 13:21:08 +09:00
commit 8c84f11bbb
130 changed files with 178 additions and 176 deletions
Download patch file Download diff file Expand all files Collapse all files

45
libnxGen.cfg
View file

@ -1,5 +1,5 @@
[n.global]
output="src/libnx_wrapper"
output="src/libnx/wrapper"
c_compiler="aarch64-none-elf-gcc"
cpp_compiler="aarch64-none-elf-g++"
filter=lock
@ -44,23 +44,23 @@ replace.u32 = "uint32"
search.u64 = "u64"
replace.u64 = "uint64"
search.lib = " src/libnx_wrapper"
replace.lib = " libnx_wrapper"
search.lib = " src/libnx/wrapper"
replace.lib = " libnx/wrapper"
search.timport = "../types"
replace.timport = "libnx_wrapper/types"
replace.timport = "libnx/wrapper/types"
search.kimport = "../kernel/"
replace.kimport = "libnx_wrapper/"
replace.kimport = "libnx/wrapper/"
search.servimport = "../services/"
replace.servimport = "libnx_wrapper/"
replace.servimport = "libnx/wrapper/"
search.resimport = "../result"
replace.resimport = "libnx_wrapper/result"
replace.resimport = "libnx/wrapper/result"
search.armimport = "../arm/"
replace.armimport = "libnx_wrapper/"
replace.armimport = "libnx/wrapper/"
search.lock = "_LOCK"
replace.lock = "LOCK"
@ -68,9 +68,10 @@ replace.lock = "LOCK"
search.cdecl = "stdcall"
replace.cdecl = "cdecl"
[src/libnx_wrapper/nim.cfg]
[src/libnx/wrapper/nim.cfg]
create = """
--path:"../"
--path:"../../"
"""
[result.h]
@ -171,7 +172,7 @@ template BIT*(n): auto = (1.uint shl n)
search.import = "type\n"
prepend.import = """
import libnx_wrapper/types
import libnx/wrapper/types
"""
search.permx = "Perm_X = BIT(2), ## /< Execute permission."
@ -186,13 +187,13 @@ replace.permrx = "Perm_Rx = Perm_R.int or Perm_X.int, ## /< Read/execute permi
[shmem.nim]
search.import = "type\n"
prepend.import = """
import libnx_wrapper/svc
import libnx/wrapper/svc
"""
[nacp.nim]
search.t = "type"
prepend.t = """
import libnx_wrapper/types
import libnx/wrapper/types
"""
[lock.nim]
@ -204,7 +205,7 @@ replace.nlock_t = "= DUlock_t"
search.import = "type"
prepend.import = """
import libnx_wrapper/types
import libnx/wrapper/types
"""
search.proc_under = "proc __"
@ -216,19 +217,19 @@ replace.o = "uint32.high"
search.import = "import\n"
append.import = """
libnx_wrapper/types,
libnx/wrapper/types,
"""
[audin.nim]
search.o = "import "
prepend.o = """
import libnx_wrapper/types
import libnx/wrapper/types
"""
[audout.nim]
search.o = "import "
prepend.o = """
import libnx_wrapper/types
import libnx/wrapper/types
"""
[hid.nim]
@ -267,32 +268,32 @@ prepend.key_sl = """
[nifm.nim]
search.o = "import libnx"
prepend.o = """
import libnx_wrapper/types
import libnx/wrapper/types
"""
[set.nim]
search.o = "import libnx"
prepend.o = """
import libnx_wrapper/types
import libnx/wrapper/types
"""
[parcel.nim]
search.o = "import libnx"
prepend.o = """
import libnx_wrapper/types
import libnx/wrapper/types
"""
[fs_dev.nim]
search.o = "import libnx"
prepend.o = """
import libnx_wrapper/types
import libnx/wrapper/types
"""
[buffer_producer.nim]
search.o = "import libnx"
prepend.o = """
import libnx_wrapper/types
import libnx_wrapper/binder
import libnx/wrapper/types
import libnx/wrapper/binder
"""
[nxlink.nim]