Merge pull request #6538 from Dwedit/master

Runahead: Fix build errors on machines without HAVE_DYNAMIC
This commit is contained in:
Twinaphex 2018-04-07 04:17:17 +02:00 committed by GitHub
commit c1c328d265
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 2 deletions

View File

@ -203,6 +203,11 @@ void run_ahead(int runAheadCount, bool useSecondary)
bool okay; bool okay;
bool lastFrame; bool lastFrame;
bool suspendedFrame; bool suspendedFrame;
#if defined(HAVE_DYNAMIC) || defined(HAVE_DYLIB)
const bool haveDynamic = true;
#else
const bool haveDynamic = false;
#endif
if (runAheadCount <= 0 || !runahead_available) if (runAheadCount <= 0 || !runahead_available)
{ {
@ -224,7 +229,7 @@ void run_ahead(int runAheadCount, bool useSecondary)
runahead_check_for_gui(); runahead_check_for_gui();
if (!useSecondary || !HAVE_DYNAMIC || !runahead_secondary_core_available) if (!useSecondary || !haveDynamic || !runahead_secondary_core_available)
{ {
/* TODO: multiple savestates for higher performance when not using secondary core */ /* TODO: multiple savestates for higher performance when not using secondary core */
for (frameNumber = 0; frameNumber <= runAheadCount; frameNumber++) for (frameNumber = 0; frameNumber <= runAheadCount; frameNumber++)

View File

@ -379,6 +379,9 @@ void secondary_core_set_variable_update(void)
{ {
/* do nothing */ /* do nothing */
} }
void clear_controller_port_map(void)
{
/* do nothing */
}
#endif #endif