From 2659ef683f53e122737375b0693b37119e11e7e4 Mon Sep 17 00:00:00 2001 From: Joey Yakimowich-Payne Date: Wed, 27 Jun 2018 21:29:51 +0900 Subject: [PATCH] Add nims config files to build easily --- config.nims | 4 ++++ examples/accounts/config.nims | 4 ++++ examples/helloworld/config.nims | 4 ++++ libnxGen.cfg | 7 +++++++ nim.cfg | 4 ---- src/libnx/config.nims | 4 ++++ 6 files changed, 23 insertions(+), 4 deletions(-) create mode 100644 config.nims create mode 100644 examples/accounts/config.nims create mode 100644 examples/helloworld/config.nims delete mode 100644 nim.cfg create mode 100644 src/libnx/config.nims diff --git a/config.nims b/config.nims new file mode 100644 index 0000000..dc3dbe4 --- /dev/null +++ b/config.nims @@ -0,0 +1,4 @@ +switch("passC", "-I" & thisDir() & "/src/libnx/wrapper/nx/include") +switch("passL", "-specs="&thisDir()&"/src/libnx/wrapper/nx/switch.specs -L"&thisDir()&"/src/libnx/wrapper/nx/lib -lnx") +#switch("passC", "-I$DEVKITPRO/libnx/include") +#switch("passL", "-specs=$DEVKITPRO/libnx/switch.specs -L$DEVKITPRO/libnx/lib -lnx") diff --git a/examples/accounts/config.nims b/examples/accounts/config.nims new file mode 100644 index 0000000..6f90be1 --- /dev/null +++ b/examples/accounts/config.nims @@ -0,0 +1,4 @@ +switch("passC", "-I" & thisDir() & "/../../src/libnx/wrapper/nx/include") +switch("passL", "-specs=" & thisDir() & "/../../src/libnx/wrapper/nx/switch.specs -L" & thisDir() & "/../../src/libnx/wrapper/nx/lib -lnx") +#switch("passC", "-I$DEVKITPRO/libnx/include") +#switch("passL", "-specs=$DEVKITPRO/libnx/switch.specs -L$DEVKITPRO/libnx/lib -lnx") diff --git a/examples/helloworld/config.nims b/examples/helloworld/config.nims new file mode 100644 index 0000000..6f90be1 --- /dev/null +++ b/examples/helloworld/config.nims @@ -0,0 +1,4 @@ +switch("passC", "-I" & thisDir() & "/../../src/libnx/wrapper/nx/include") +switch("passL", "-specs=" & thisDir() & "/../../src/libnx/wrapper/nx/switch.specs -L" & thisDir() & "/../../src/libnx/wrapper/nx/lib -lnx") +#switch("passC", "-I$DEVKITPRO/libnx/include") +#switch("passL", "-specs=$DEVKITPRO/libnx/switch.specs -L$DEVKITPRO/libnx/lib -lnx") diff --git a/libnxGen.cfg b/libnxGen.cfg index ab71d91..51de31d 100644 --- a/libnxGen.cfg +++ b/libnxGen.cfg @@ -20,6 +20,7 @@ filter=lock [n.exclude] "${output}/nim.cfg" +"${output}/config.nims" [n.prepare] git = "https://github.com/switchbrew/libnx" @@ -77,6 +78,12 @@ create = """ --path:"../../" """ +[src/libnx/wrapper/config.nims] +create = """ +switch("passC", "-I" & thisDir() & "/nx/include") +switch("passL", "-specs=" & thisDir() & "/nx/switch.specs -L" & thisDir() & "/nx/lib -lnx") +""" + [result.h] defines = true diff --git a/nim.cfg b/nim.cfg deleted file mode 100644 index 9c8074b..0000000 --- a/nim.cfg +++ /dev/null @@ -1,4 +0,0 @@ ---passC "-I$DEVKITPRO/libnx/include" ---passL "-specs=$DEVKITPRO/libnx/switch.specs -L$DEVKITPRO/libnx/lib -lnx" -#--passC="-I$HOME/Projects/nim-libnx/src/libnx/wrapper/nx/include" -#--passL="-specs=$HOME/Projects/nim-libnx/src/libnx/wrapper/nx/switch.specs -L$HOME/Projects/nim-libnx/src/libnx/wrapper/nx/lib -lnx" diff --git a/src/libnx/config.nims b/src/libnx/config.nims new file mode 100644 index 0000000..b83d14a --- /dev/null +++ b/src/libnx/config.nims @@ -0,0 +1,4 @@ +switch("passC", "-I" & thisDir() & "/wrapper/nx/include") +switch("passL", "-specs=" & thisDir() & "/wrapper/nx/switch.specs -L" & thisDir() & "/wrapper/nx/lib -lnx") +#switch("passC", "-I$DEVKITPRO/libnx/include") +#switch("passL", "-specs=$DEVKITPRO/libnx/switch.specs -L$DEVKITPRO/libnx/lib -lnx")