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
524 B
CMake
24 lines
524 B
CMake
cmake_minimum_required (VERSION 3.10.0)
|
|
project (naett)
|
|
|
|
set(SRC_DIR ../naett-lib/src)
|
|
|
|
set(ALL_SOURCE_FILES
|
|
${SRC_DIR}/naett_core.c
|
|
)
|
|
|
|
if(WIN32)
|
|
list(APPEND ALL_SOURCE_FILES ${SRC_DIR}/naett_win.c)
|
|
elseif(ANDROID)
|
|
list(APPEND ALL_SOURCE_FILES ${SRC_DIR}/naett_android.c)
|
|
elseif(APPLE)
|
|
list(APPEND ALL_SOURCE_FILES ${SRC_DIR}/naett_osx.c)
|
|
elseif(UNIX)
|
|
list(APPEND ALL_SOURCE_FILES ${SRC_DIR}/naett_linux.c)
|
|
endif()
|
|
|
|
add_library(naett STATIC ${ALL_SOURCE_FILES})
|
|
if(WIN32)
|
|
target_link_libraries(naett winhttp)
|
|
endif()
|