Adds nxdk as a submodule. (#40)

This commit is contained in:
Erik Abair 2022-01-10 19:12:28 -08:00 committed by GitHub
parent 5b4b2a6db8
commit 4f26ddbf36
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 12 additions and 12 deletions

View File

@ -24,13 +24,6 @@ jobs:
with:
submodules: recursive
path: nxdk_pgraph_tests
- name: Clone nxdk
uses: actions/checkout@v2
with:
repository: abaire/nxdk
ref: pbkit_extensions
submodules: recursive
path: nxdk
- name: Install dependencies
run: |
sudo apt-get update

4
.gitmodules vendored
View File

@ -1,3 +1,7 @@
[submodule "third_party/printf"]
path = third_party/printf
url = https://github.com/mpaland/printf.git
[submodule "third_party/nxdk"]
path = third_party/nxdk
url = https://github.com/abaire/nxdk.git

View File

@ -1,6 +1,6 @@
XBE_TITLE = nxdk_pgraph_tests
GEN_XISO = $(XBE_TITLE).iso
NXDK_DIR ?= $(CURDIR)/../nxdk
NXDK_DIR ?= $(CURDIR)/third_party/nxdk
NXDK_SDL = y
NXDK_CXX = y

View File

@ -32,11 +32,13 @@ DPAD:
This test suite requires some modifications to the pbkit used by the nxdk in order to operate.
Use the `pbkit_extensions` branch in https://github.com/abaire/nxdk
To facilitate this, the nxdk is included as a submodule of this project, referencing the
`pbkit_extensions` branch from https://github.com/abaire/nxdk.
*NOTE*: By default this project expects to be run on a devkit (`e:\DEVKIT` must
exist). If you wish to run on a retail system, pass `DEVKIT=n` as a parameter when
invoking `make`.
This project should be cloned with the `--recursive` flag to pull the submodules and their submodules,
after the fact this can be achieved via `git submodule update --init --recursive`.
For macOS, the patched nxdk currently assumes that the Homebrew llvm@11 package has been installed.
## Running with CLion

1
third_party/nxdk vendored Submodule

@ -0,0 +1 @@
Subproject commit 285a1e4c2bb9b83014f2cc92087d6f224be07544