The-Homebrew-Cloud/fceugx
2
0
Fork 0
mirror of https://github.com/dborth/fceugx.git synced 2025-04-05 11:56:37 +02:00
Code Issues Packages Projects Releases Wiki Activity

switch to libogc2

Browse Source
This commit is contained in:
Daryl Borth 2025-03-20 16:07:50 -06:00
parent b5f6bc42a7
commit 4ad7948c8a
6 changed files with 29 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
.github/workflows/build.yml vendored
View File

@ -12,6 +12,15 @@ jobs:
container: devkitpro/devkitppc:latest
steps:
- name: Install packages
run: |
sudo dkp-pacman-key --recv-keys C8A2759C315CFBC3429CC2E422B803BA8AA3D7CE --keyserver keyserver.ubuntu.com
sudo dkp-pacman-key --lsign-key C8A2759C315CFBC3429CC2E422B803BA8AA3D7CE
sudo sed -i '/^\[dkp-libs\]$/,$d' /opt/devkitpro/pacman/etc/pacman.conf
sudo echo -e '[extremscorner-devkitpro]\nServer = https://packages.extremscorner.org/devkitpro/linux/$arch' >> /opt/devkitpro/pacman/etc/pacman.conf
sudo dkp-pacman -Sy
sudo dkp-pacman -S --noconfirm --ask 4 gamecube-tools-git libogc2 libogc2-libdvm
- name: Checkout fceugx repo
uses: actions/checkout@v4
with:

2
Makefile.gc
View File

@ -8,6 +8,8 @@ $(error "Please set DEVKITPPC in your environment. export DEVKITPPC=<path to>dev
endif
include $(DEVKITPPC)/gamecube_rules
export LIBOGC_INC := $(DEVKITPRO)/libogc2/include
export LIBOGC_LIB := $(DEVKITPRO)/libogc2/lib/cube
#---------------------------------------------------------------------------------
# TARGET is the name of the output

2
Makefile.wii
View File

@ -8,6 +8,8 @@ $(error "Please set DEVKITPPC in your environment. export DEVKITPPC=<path to>dev
endif
include $(DEVKITPPC)/wii_rules
export LIBOGC_INC := $(DEVKITPRO)/libogc2/include
export LIBOGC_LIB := $(DEVKITPRO)/libogc2/lib/wii
#---------------------------------------------------------------------------------
# TARGET is the name of the output

2
source/fceugx.cpp
View File

@ -181,7 +181,7 @@ void ShutdownCB()
{
ShutdownRequested = 1;
}
void ResetCB(u32 irq, void *ctx)
void ResetCB()
{
ResetRequested = 1;
}

28
source/fileop.cpp
View File

@ -49,14 +49,14 @@ bool unmountRequired[8] = { false, false, false, false, false, false, false, fal
bool isMounted[8] = { false, false, false, false, false, false, false, false };
#ifdef HW_RVL
const DISC_INTERFACE* sd = &__io_wiisd;
const DISC_INTERFACE* usb = &__io_usbstorage;
const DISC_INTERFACE* dvd = &__io_wiidvd;
static DISC_INTERFACE* sd = &__io_wiisd;
static DISC_INTERFACE* usb = &__io_usbstorage;
static DISC_INTERFACE* dvd = &__io_wiidvd;
#else
const DISC_INTERFACE* carda = &__io_gcsda;
const DISC_INTERFACE* cardb = &__io_gcsdb;
const DISC_INTERFACE* port2 = &__io_gcsd2;
const DISC_INTERFACE* dvd = &__io_gcdvd;
static DISC_INTERFACE* carda = &__io_gcsda;
static DISC_INTERFACE* cardb = &__io_gcsdb;
static DISC_INTERFACE* port2 = &__io_gcsd2;
static DISC_INTERFACE* dvd = &__io_gcdvd;
#endif
// folder parsing thread
@ -130,7 +130,7 @@ devicecallback (void *arg)
{
if(isMounted[DEVICE_SD])
{
if(!sd->isInserted()) // check if the device was removed
if(!sd->isInserted(sd)) // check if the device was removed
{
unmountRequired[DEVICE_SD] = true;
isMounted[DEVICE_SD] = false;
@ -139,7 +139,7 @@ devicecallback (void *arg)
if(isMounted[DEVICE_USB])
{
if(!usb->isInserted()) // check if the device was removed
if(!usb->isInserted(usb)) // check if the device was removed
{
unmountRequired[DEVICE_USB] = true;
isMounted[DEVICE_USB] = false;
@ -148,7 +148,7 @@ devicecallback (void *arg)
if(isMounted[DEVICE_DVD])
{
if(!dvd->isInserted()) // check if the device was removed
if(!dvd->isInserted(dvd)) // check if the device was removed
{
unmountRequired[DEVICE_DVD] = true;
isMounted[DEVICE_DVD] = false;
@ -225,7 +225,7 @@ static bool MountFAT(int device, int silent)
bool mounted = false;
int retry = 1;
char name[10], name2[10];
const DISC_INTERFACE* disc = NULL;
DISC_INTERFACE* disc = NULL;
switch(device)
{
@ -267,13 +267,13 @@ static bool MountFAT(int device, int silent)
{
unmountRequired[device] = false;
fatUnmount(name2);
disc->shutdown();
disc->shutdown(disc);
isMounted[device] = false;
}
while(retry)
{
if(disc->startup() && fatMountSimple(name, disc))
if(disc->startup(disc) && fatMountSimple(name, disc))
mounted = true;
if(mounted || silent)
@ -321,7 +321,7 @@ bool MountDVD(bool silent)
{
ShowAction("Loading DVD...");
if(!dvd->isInserted())
if(!dvd->isInserted(dvd))
{
if(silent)
break;

2
source/networkop.cpp
View File

@ -174,7 +174,7 @@ bool InitializeNetwork(bool silent)
break;
}
#else
networkInit = !(if_config(wiiIP, NULL, NULL, true, 10) < 0);
networkInit = !(if_config(wiiIP, NULL, NULL, true) < 0);
#endif
CancelAction();