From f748e4dcdccb495cce6cb868f5c7c2490ba309a4 Mon Sep 17 00:00:00 2001 From: Joey Yakimowich-Payne Date: Fri, 13 Jul 2018 18:09:57 +0900 Subject: [PATCH] Make work with n.sourcefile --- libnx.nimble | 4 ++- libnxGen.cfg | 97 ++-------------------------------------------------- 2 files changed, 5 insertions(+), 96 deletions(-) diff --git a/libnx.nimble b/libnx.nimble index 0b4108c..2d3f215 100644 --- a/libnx.nimble +++ b/libnx.nimble @@ -23,4 +23,6 @@ before install: setupTask() task test, "Run tests": - exec "nim c -r tests/test.nim" + discard +# no tests because code needs to run on the Switch :( +# exec "nim c -r tests/test.nim" diff --git a/libnxGen.cfg b/libnxGen.cfg index 9c7bb6c..3a35ed1 100644 --- a/libnxGen.cfg +++ b/libnxGen.cfg @@ -66,8 +66,6 @@ replace.lock = "LOCK" search.cdecl = "stdcall" replace.cdecl = "cdecl" -[console.h] - [n.prepare] git = "https://github.com/switchbrew/libnx" execute = """ @@ -311,7 +309,6 @@ import libnx/ext/integer128 """ [acc.nim] -search.o = "import libnx" prepend.o = """ import libnx/ext/integer128 """ @@ -348,105 +345,15 @@ template CONSOLE_CROSSED_OUT*: int = BIT(8).int search.threedmoo = "debugDevice_3DMOO" replace.threedmoo = "debugDevice_3DMOO*" - -[apm.nim] -key = blank -[applet.nim] -key = blank -[audio.nim] -key = blank -[binder.nim] -key = blank -[cache.nim] -key = blank -[condvar.nim] -key = blank -[csrng.nim] -key = blank -[detect.nim] -key = blank - -[env.nim] -key = blank - -[fatal.nim] -key = blank -[fsldr.nim] -key = blank -[fspr.nim] -key = blank - [gfx.nim] search.timport = "../types" replace.timport = "libnx/wrapper/types" - -[ioctl.nim] -key = blank -[irs.nim] -key = blank -[jit.nim] -key = blank -[ldr.nim] -key = blank -[lr.nim] -key = blank -[mutex.nim] -key = blank -[nro.nim] -key = blank -[ns.nim] -key = blank -[nv.nim] -key = blank -[nvgfx.nim] -key = blank -[nvioctl.nim] -key = blank -[pl.nim] -key = blank -[pm.nim] -key = blank -[random.nim] -key = blank -[result.nim] -key = blank - [romfs_dev.nim] search.timport = "../types" replace.timport = "libnx/wrapper/types" search.servimport = "../services/" replace.servimport = "libnx/wrapper/" -[rwlock.nim] -key = blank -[semaphore.nim] -key = blank -[sm.nim] -key = blank -[smm.nim] -key = blank -[socket.nim] -key = blank -[spl.nim] -key = blank -[switch.nim] -key = blank -[thread.nim] -key = blank -[time.nim] -key = blank -[tls.nim] -key = blank -[tmem.nim] -key = blank -[usb.nim] -key = blank -[usb_comms.nim] -key = blank -[utf.nim] -key = blank -[vi.nim] -key = blank -[virtmem.nim] -key = blank +[n.sourcefile] +"${output}/*.nim"