diff options
| -rw-r--r-- | overlay_gl/overlay_gl.pro | 4 | ||||
| -rw-r--r-- | src/mumble/AudioOutput.cpp | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/overlay_gl/overlay_gl.pro b/overlay_gl/overlay_gl.pro index ba49e738a..ac0b368cd 100644 --- a/overlay_gl/overlay_gl.pro +++ b/overlay_gl/overlay_gl.pro @@ -10,6 +10,10 @@ SOURCES = overlay.c LIBS *= -lrt -ldl QMAKE_CFLAGS *= -fvisibility=hidden $(CFLAGS_ADD) QMAKE_LFLAGS -= -Wl,--no-undefined + +QMAKE_LFLAGS -= -Wl,-z,now +QMAKE_LFLAGS += -Wl,-z,lazy + QMAKE_LFLAGS *= $(LFLAGS_ADD) equals(QMAKE_LINK,g++) { message(Overriding linker) diff --git a/src/mumble/AudioOutput.cpp b/src/mumble/AudioOutput.cpp index 06954884e..2ec8c3c7f 100644 --- a/src/mumble/AudioOutput.cpp +++ b/src/mumble/AudioOutput.cpp @@ -431,7 +431,7 @@ bool AudioOutput::mix(void *outbuff, unsigned int nsamp) { top[2] = 0.0f; } - if (std::abs<float>(front[0] * top[0] + front[1] * top[1] + front[2] * top[2]) > 0.01f) { + if (std::abs(front[0] * top[0] + front[1] * top[1] + front[2] * top[2]) > 0.01f) { // Not perpendicular. Assume Y up and rotate 90 degrees. float azimuth = 0.0f; |