Skip to content

Make sdl2 platform compatible with apple silicon #5

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
logicplace merged 4 commits into from
Mar 11, 2026
+14 −9
Merged

Make sdl2 platform compatible with apple silicon #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b8e3849
Use fWHATEVER instead of fWHATEVER64 on macos
pkingstonxyz Mar 11, 2026
73d2beb
Switch to rm -rf for portability
pkingstonxyz Mar 11, 2026
7eb5dbc
Change strcpy usages to memmove for overlap safety
pkingstonxyz Mar 11, 2026
71cc0c0
Remove accidental flag
pkingstonxyz Mar 11, 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
6 changes: 6 additions & 0 deletions dependencies/minizip/ioapi.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,12 @@
#define _CRT_SECURE_NO_WARNINGS
#endif

#if defined(__APPLE__)
#define fopen64 fopen
#define ftello64 ftello
#define fseeko64 fseeko
#endif

#include "ioapi.h"

voidpf call_zopen64 (const zlib_filefunc64_32_def* pfilefunc,const void*filename,int mode)
Expand Down
3 changes: 1 addition & 2 deletions platform/sdl2/makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,5 +120,4 @@ win:
make -f makefile.win

clean:
-rm -f $(BUILDOBJS) $(TARGET) $(WINTARGET) $(WINRES_TRG)
-rmdir --ignore-fail-on-non-empty $(BUILD)
-rm -rf $(BUILDOBJS) $(TARGET) $(WINTARGET) $(WINRES_TRG) $(BUILD)
14 changes: 7 additions & 7 deletions source/PokeMini.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -572,7 +572,7 @@ int PokeMini_CheckSSFile(const char *statefile, char *romfile)
return 0;
}
PMiniStr[127] = 0;
if (romfile) strcpy(romfile, PMiniStr);
if (romfile) memmove(romfile, PMiniStr, strlen(PMiniStr) + 1);
fclose(fi);

return 1;
Expand Down Expand Up @@ -722,7 +722,7 @@ int PokeMini_SaveSSFile(const char *statefile, const char *romfile)
PMiniID = PokeMini_ID;
fwrite(&PMiniID, 1, 4, fo); // Write State ID
memset(PMiniStr, 0, 128);
strcpy(PMiniStr, romfile);
memmove(PMiniStr, romfile, strlen(romfile) + 1);
fwrite(PMiniStr, 1, 128, fo); // Write ROM related to state
StatTime = Endian32((uint32_t)time(NULL));
fwrite(&StatTime, 1, 4, fo); // Write Time
Expand Down Expand Up @@ -912,7 +912,7 @@ static int PokeMini_iLoadROMZip(const char *zipfile, int *colorloaded)
}
}
// Filename based of the zip
strcpy(filein, zipfile);
memmove(filein, zipfile, strlen(zipfile) + 1);
RemoveExtension(filein);
strcat(filein, ".minc");
if (FileExist(filein)) {
Expand Down Expand Up @@ -946,21 +946,21 @@ int PokeMini_LoadROM(const char *filename)
if (ExtensionCheck(filename, ".zip")) {
// Load new MIN ROM and Color Information inside zip
if (!PokeMini_iLoadROMZip(filename, &colorloaded)) return 0;
strcpy(CommandLine.min_file, filename);
memmove(CommandLine.min_file, filename, strlen(filename) + 1);
} else
#endif
{
// Setup LCD mode based of color support
if (ExtensionCheck(filename, ".minc")) {
// Remove c and load new MIN ROM
strcpy(tmp, filename);
memmove(tmp, filename, strlen(filename) + 1);
tmp[strlen(filename)-1] = 0;
if (!PokeMini_LoadMINFile(tmp)) return 0;
strcpy(CommandLine.min_file, tmp);
memmove(CommandLine.min_file, tmp, strlen(tmp) + 1);
} else {
// Load new MIN ROM
if (!PokeMini_LoadMINFile(filename)) return 0;
strcpy(CommandLine.min_file, filename);
memmove(CommandLine.min_file, filename, strlen(filename) + 1);
}

// Load Color Information
Expand Down