mirror of https://github.com/mgba-emu/mgba.git
Merge branch 'master' into qt
This commit is contained in:
commit
bfa5fb6173
|
@ -103,6 +103,10 @@ if(BUILD_BBB OR BUILD_RASPI)
|
|||
endif()
|
||||
endif()
|
||||
|
||||
if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
|
||||
list(APPEND OS_LIB bsd)
|
||||
endif()
|
||||
|
||||
# Features
|
||||
set(DEBUGGER_SRC ${CMAKE_SOURCE_DIR}/src/debugger/debugger.c ${CMAKE_SOURCE_DIR}/src/debugger/memory-debugger.c)
|
||||
|
||||
|
|
|
@ -27,14 +27,14 @@ enum ThreadState {
|
|||
|
||||
struct GBASync {
|
||||
int videoFramePending;
|
||||
int videoFrameWait;
|
||||
bool videoFrameWait;
|
||||
int videoFrameSkip;
|
||||
bool videoFrameOn;
|
||||
Mutex videoFrameMutex;
|
||||
Condition videoFrameAvailableCond;
|
||||
Condition videoFrameRequiredCond;
|
||||
|
||||
int audioWait;
|
||||
bool audioWait;
|
||||
Condition audioRequiredCond;
|
||||
Mutex audioBufferMutex;
|
||||
};
|
||||
|
|
|
@ -88,8 +88,8 @@ int main(int argc, char** argv) {
|
|||
.audioBuffers = 512,
|
||||
.startCallback = _GBASDLStart,
|
||||
.cleanCallback = _GBASDLClean,
|
||||
.sync.videoFrameWait = 0,
|
||||
.sync.audioWait = 1,
|
||||
.sync.videoFrameWait = false,
|
||||
.sync.audioWait = true,
|
||||
.userData = &renderer
|
||||
};
|
||||
|
||||
|
|
Loading…
Reference in New Issue