Merge branch '86Box:master' into ymf701

This commit is contained in:
win2kgamer
2025-09-14 11:23:00 -05:00
committed by GitHub
17 changed files with 34 additions and 301 deletions

View File

@@ -19589,11 +19589,7 @@ machine_get_min_ram(int m)
int
machine_get_max_ram(int m)
{
#if (!(defined __amd64__ || defined _M_X64 || defined __aarch64__ || defined _M_ARM64))
return MIN(((int) machines[m].ram.max), 2097152);
#else
return MIN(((int) machines[m].ram.max), 3145728);
#endif
}
int