Another win64 Qt6 build fix

This commit is contained in:
harry 2024-02-24 17:01:43 -05:00
parent ce0dd16abd
commit 9d08ff453a
3 changed files with 13 additions and 5 deletions

View File

@ -367,7 +367,11 @@ bool FCEU_IsValidUI(EFCEUI ui);
#ifdef __cplusplus
extern "C"
{
#endif
FILE *FCEUI_UTF8fopen_C(const char *n, const char *m);
#ifdef __cplusplus
} // extern C
#endif
FILE *FCEUI_UTF8fopen_C(const char *n, const char *m);
#endif //__DRIVER_H_

View File

@ -96,7 +96,7 @@ void consoleWin_t::OpenHelpWindow(QString subpage)
helpWin = HtmlHelpA( HWND(winId()), helpFileName.toLocal8Bit().constData(), HH_DISPLAY_TOPIC, (DWORD)NULL);
if ( helpWin == NULL )
{
printf("Error: Failed to open help file '%s'\n", helpFileName.c_str() );
printf("Error: Failed to open help file '%s'\n", helpFileName.toLocal8Bit().constData() );
}
#else
if ( helpWin > 0 )

View File

@ -274,9 +274,13 @@ int AutosaveFrequency = 256; // Number of frames between autosaves
int EnableAutosave = 0;
///a wrapper for unzip.c
extern "C" FILE *FCEUI_UTF8fopen_C(const char *n, const char *m) {
return ::FCEUD_UTF8fopen(n, m);
}
extern "C"
{
FILE *FCEUI_UTF8fopen_C(const char *n, const char *m)
{
return ::FCEUD_UTF8fopen(n, m);
}
} // extern C
static DECLFW(BNull) {
}