Merge branch 'master' into qt
Jeffrey Pfau jeffrey@endrift.com
Sun, 19 Oct 2014 01:17:09 -0700
3 files changed,
8 insertions(+),
4 deletions(-)
M
CMakeLists.txt
→
CMakeLists.txt
@@ -103,6 +103,10 @@ add_definitions(-DCOLOR_16_BIT -DCOLOR_5_6_5)
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)
M
src/gba/gba-thread.h
→
src/gba/gba-thread.h
@@ -27,14 +27,14 @@ };
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; };
M
src/platform/sdl/gl-main.c
→
src/platform/sdl/gl-main.c
@@ -88,8 +88,8 @@ .renderer = &renderer.d.d,
.audioBuffers = 512, .startCallback = _GBASDLStart, .cleanCallback = _GBASDLClean, - .sync.videoFrameWait = 0, - .sync.audioWait = 1, + .sync.videoFrameWait = false, + .sync.audioWait = true, .userData = &renderer };