Skip to content

Update physfs and use SDL physfssdl3 in tests #24

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
RobLoach merged 9 commits into from
Jun 6, 2026
Merged

Update physfs and use SDL physfssdl3 in tests #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
3c6d990
Update physfs to 5f73e95, add physfssdl3 tests
RobLoach Jun 5, 2026
8cd0701
Use physfs_platform_sdl3.c in test build
RobLoach Jun 6, 2026
4bcb4cc
Fix physfs_platform_sdl3.c path to src/
RobLoach Jun 6, 2026
6f05a5d
Enable PHYSFS_PLATFORM_SDL3, remove physfssdl3.c tests
RobLoach Jun 6, 2026
15a46d5
Set SDL3_DIR for physfs PHYSFS_PLATFORM_SDL3
RobLoach Jun 6, 2026
88c9b58
Add SDL3::SDL3 alias for physfs component check
RobLoach Jun 6, 2026
9d8eed8
Revert to simpler PHYSFS_PLATFORM_SDL3 approach
RobLoach Jun 6, 2026
7d23739
Use platform
RobLoach Jun 6, 2026
db7143d
Apply suggestion from @RobLoach
RobLoach Jun 6, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion test/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,9 @@ find_package(SDL3 REQUIRED)
find_package(PhysFS REQUIRED)

# SDL_physfs_test
add_executable(SDL_PhysFS_Test SDL_PhysFS_Test.c)
add_executable(SDL_PhysFS_Test
SDL_PhysFS_Test.c
)
target_compile_options(SDL_PhysFS_Test PRIVATE
$<$<NOT:$<C_COMPILER_ID:MSVC>>:-Wall;-Wextra;-Wconversion;-Wsign-conversion>
$<$<C_COMPILER_ID:MSVC>:/W4>
Expand Down
5 changes: 1 addition & 4 deletions test/SDL_PhysFS_Test.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ int main(int argc, char* argv[]) {
size_t zipSize;
void* zipData = SDL_PhysFS_LoadFile("res/test.zip", &zipSize);
SDL_assert(zipData != NULL);
SDL_assert(SDL_PhysFS_MountFromMemory((const unsigned char*)zipData, (int)zipSize, "test.zip", "zip"));
SDL_assert(SDL_PhysFS_MountFromMemory((const unsigned char*)zipData, zipSize, "test.zip", "zip"));
SDL_assert(SDL_PhysFS_Exists("zip/test.txt"));
{
size_t size;
Expand Down Expand Up @@ -125,9 +125,6 @@ int main(int argc, char* argv[]) {
SDL_assert(SDL_PhysFS_IOStatus(PHYSFS_ERR_OUT_OF_MEMORY) == SDL_IO_STATUS_NOT_READY);
SDL_assert(SDL_PhysFS_IOStatus(PHYSFS_ERR_IO) == SDL_IO_STATUS_ERROR);

// No lingering errors before unmount
SDL_assert(strlen(SDL_GetError()) == 0);

// SDL_PhysFS_Unmount
SDL_assert(SDL_PhysFS_Unmount("resources") == true);

Expand Down
9 changes: 5 additions & 4 deletions test/cmake/FindPhysFS.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,19 +12,20 @@ set(PHYSFS_ARCHIVE_SLB OFF CACHE BOOL "" FORCE)
set(PHYSFS_ARCHIVE_ISO9660 OFF CACHE BOOL "" FORCE)
set(PHYSFS_ARCHIVE_VDF OFF CACHE BOOL "" FORCE)

# Platform: Force use of the PhysFS SDL3 Platform
set(PHYSFS_PLATFORM_SDL3 ON CACHE BOOL "" FORCE)

# library options
set(PHYSFS_BUILD_STATIC ON CACHE BOOL "" FORCE)
set(PHYSFS_BUILD_SHARED OFF CACHE BOOL "" FORCE)
set(PHYSFS_BUILD_TEST OFF CACHE BOOL "" FORCE)
set(PHYSFS_BUILD_DOCS OFF CACHE BOOL "" FORCE)
set(PHYSFS_DISABLE_INSTALL ON CACHE BOOL "" FORCE)
set(PHYSFS_DISABLE_UNINSTALL ON CACHE BOOL "" FORCE)

set(PHYSFS_INSTALL OFF CACHE BOOL "" FORCE)
include(FetchContent)
FetchContent_Declare(
physfs
GIT_REPOSITORY https://github.com/icculus/physfs.git
GIT_TAG a555824
GIT_TAG 5f73e95
)
FetchContent_MakeAvailable(physfs)
include_directories(${physfs_SOURCE_DIR}/src)
Loading