From 6607cc6dbf61380628791a2870b11f097b8f1c90 Mon Sep 17 00:00:00 2001 From: Kenta <106167071+Its-Kenta@users.noreply.github.com> Date: Fri, 21 Jul 2023 09:16:34 +0100 Subject: [PATCH] Update sdl2.c3i Finalise RWOps Android not yet supported by C3 SDL2 is now complete --- libraries/sdl2.c3l/sdl2.c3i | 83 +++++++++++++++++-------------------- 1 file changed, 37 insertions(+), 46 deletions(-) diff --git a/libraries/sdl2.c3l/sdl2.c3i b/libraries/sdl2.c3l/sdl2.c3i index 2c306f7..acac435 100644 --- a/libraries/sdl2.c3l/sdl2.c3i +++ b/libraries/sdl2.c3l/sdl2.c3i @@ -1,6 +1,6 @@ // sdl2.c3i // Created 14/07/2023 -// Updated 19/07/2023 +// Updated 21/07/2023 // Originally created Kenta @ https://github.com/Its-Kenta module sdl; @@ -88,53 +88,44 @@ def WriteFn = fn long(RWops context, void* ptr, long size); def CloseFn = fn int(RWops context); struct RWops { - SizeFn* size; - SeekFn* seek; - ReadFn* read; - WriteFn* write; - CloseFn* close; + SizeFn size; + SeekFn seek; + ReadFn read; + WriteFn write; + CloseFn close; uint type; -// union { -// #ifdef __ANDROID__ -// struct -// { -// void *asset; -// } androidio; - -// #elif defined(__WIN32__) || defined(__GDK__) -// struct -// { -// SDL_bool append; -// void *h; -// struct -// { -// void *data; -// size_t size; -// size_t left; -// } buffer; -// } windowsio; -// #endif - -// struct -// { -// SDL_bool autoclose; -// void *fp; -// } stdio; - -// struct -// { -// Uint8 *base; -// Uint8 *here; -// Uint8 *stop; -// } mem; - -// struct -// { -// void *data1; -// void *data2; -// } unknown; -// } hidden; + union hidden { + // struct androidio @if(env::ANDROID) { + // void *asset; + // } Android not yet supported in C3 + + struct windowsio @if(env::WIN32) { + bool append; + void *h; + struct buffer { + void *data; + usz size; + usz left; + } + } + + struct stdio { + bool autoclose; + void *fp; + } + + struct mem { + char *base; + char *here; + char *stop; + } + struct unknown + { + void *data1; + void *data2; + } + } } def AudioFormat = int;