-
Notifications
You must be signed in to change notification settings - Fork 69
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into unmountsamples
- Loading branch information
Showing
141 changed files
with
2,059 additions
and
20,716 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -3,3 +3,4 @@ tools/cg/mac | |
tools/cg/win | ||
lib/sdl/SDL2/test | ||
lib/libcxx/test | ||
samples/ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,21 @@ | ||
FROM ghcr.io/xboxdev/nxdk-buildbase:git-39eb90d1 | ||
FROM ghcr.io/xboxdev/nxdk-buildbase:git-2c3115b1 AS builder | ||
|
||
COPY ./ /usr/src/nxdk/ | ||
ENV NXDK_DIR=/usr/src/nxdk | ||
RUN cd /usr/src/nxdk && make tools -j`nproc` | ||
ARG buildparams | ||
RUN cd /usr/src/nxdk && make NXDK_ONLY=y $buildparams -j`nproc` | ||
|
||
|
||
FROM ghcr.io/xboxdev/nxdk-runbase:git-2c3115b1 | ||
|
||
COPY --from=builder /usr/src/nxdk/ /usr/src/nxdk/ | ||
ENV NXDK_DIR=/usr/src/nxdk | ||
|
||
WORKDIR /usr/src/app | ||
|
||
LABEL org.opencontainers.image.documentation='https://github.com/XboxDev/nxdk/wiki' | ||
LABEL org.opencontainers.image.licenses='(Apache-2.0 AND BSD-3-Clause AND CC0-1.0 AND GPL-2.0-or-later AND LGPL-2.1-or-later AND MIT)' | ||
LABEL org.opencontainers.image.source='https://github.com/XboxDev/nxdk.git' | ||
LABEL org.opencontainers.image.url='https://github.com/XboxDev/nxdk.git' | ||
LABEL org.opencontainers.image.vendor='XboxDev' |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.