mirror of
https://github.com/hrydgard/ppsspp.git
synced 2026-10-01 14:58:14 +00:00
Henrik Rydgård
2096df52f5
naett has been a submodule pinned at v0.3.3; upstream has had no commits since April 2024, and we want to carry local changes (next up: a libcurl-backed HTTPS path for Linux). It's ~1500 lines of MIT C, smaller than several things we already vendor, so bring it in-tree and drop the submodule. Also drop the generated single-file amalgam (naett.c) that every build system was compiling, and build src/*.c directly instead - otherwise the file you edit isn't the file that gets compiled, which is a trap for anyone patching this. example/ and testrig/ (a whole Android Studio project) are gone with it. Two changes were needed to make the sources build on their own, both noted in ext/naett/README-ppsspp.md along with the upstream commit: - naett_internal.h now includes naett.h, which the amalgam pulled in first. - naett_linux.c now includes stdio.h/stdlib.h. It calls exit/calloc/realloc/ free/fprintf without ever including either, and only got away with it because naett_core.c sat above it in the concatenation. No functional change - Linux still has HTTPS_NOT_AVAILABLE set, so it doesn't build naett at all yet. Rename naett to naett-lib
24 lines
1.2 KiB
Markdown
24 lines
1.2 KiB
Markdown
# naett in PPSSPP
|
|
|
|
Vendored copy of [naett](https://github.com/erkkah/naett) by Erik Agsjö (MIT licensed, see `LICENSE`).
|
|
|
|
Upstream version: **v0.3.3** (`5f695cfa9fcbf30668a4d3ac4b4abf1cd89a1302`, 2024-04-13)
|
|
|
|
This used to be a git submodule. It's now in-tree because upstream has been dormant since
|
|
April 2024 and we need to carry local changes (see below). It's ~1500 lines of C, which is
|
|
smaller than several other things we already vendor.
|
|
|
|
## Local changes
|
|
|
|
Keep this list up to date - it's what makes it possible to move to a newer upstream later.
|
|
|
|
- Dropped the generated single-file amalgam (`naett.c`) and `src/amalgam.h`, along with
|
|
`example/` and `testrig/`. We build `src/*.c` directly, so that the file you edit is the
|
|
file that gets compiled.
|
|
- `src/naett_internal.h`: added `#include "../naett.h"`. The amalgam included `naett.h`
|
|
ahead of everything else; building the sources directly, each one needs it.
|
|
- `src/naett_linux.c`: added `#include <stdio.h>` / `#include <stdlib.h>`. It uses
|
|
`exit`/`calloc`/`realloc`/`free`/`fprintf` but never included either header - in the amalgam it
|
|
got them from `naett_core.c` further up the concatenation. Building it on its own is an error
|
|
with a modern compiler.
|