Skip to content

Commit

Permalink
Merge branch '0.1.1-dev' into dependabot/github_actions/softprops/act…
Browse files Browse the repository at this point in the history
…ion-gh-release-2
  • Loading branch information
Maschell authored Apr 24, 2024
2 parents 8dfc80d + 5fd6cda commit 7c3bf81
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 5 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@ jobs:
clang-format:
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: clang-format
run: |
docker run --rm -v ${PWD}:/src ghcr.io/wiiu-env/clang-format:13.0.0-2 -r ./src
build-binary:
runs-on: ubuntu-22.04
needs: clang-format
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: build binary
run: |
docker build . -t builder
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@ jobs:
clang-format:
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: clang-format
run: |
docker run --rm -v ${PWD}:/src ghcr.io/wiiu-env/clang-format:13.0.0-2 -r ./src
build-binary:
runs-on: ubuntu-22.04
needs: clang-format
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: build binary
run: |
docker build . -t builder
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
FROM ghcr.io/wiiu-env/devkitppc:20230417
FROM ghcr.io/wiiu-env/devkitppc:20230621

WORKDIR project
1 change: 1 addition & 0 deletions src/imports.h
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ IMPORT(OSGetThreadSpecific);
IMPORT(OSSetThreadSpecific);
IMPORT(OSReport);
IMPORT(OSSwapAtomic);
IMPORT(OSIsDebuggerPresent);

IMPORT(exit);
IMPORT(_Exit);
Expand Down
4 changes: 4 additions & 0 deletions src/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,10 @@ extern "C" uint32_t start_wrapper(int argc, char **argv) {
return entryPoint;
}

extern "C" struct _reent *__syscall_getreent(void) {
return _impure_ptr;
}

extern "C" int _start(int argc, char **argv) {
uint32_t entryPoint = start_wrapper(argc, argv);

Expand Down

0 comments on commit 7c3bf81

Please sign in to comment.