From ff9086e35bbe29623d912f53b85e99aa0ea86eb3 Mon Sep 17 00:00:00 2001
From: Mikkel Krautz <mikkel@krautz.dk>
Date: Tue, 17 Dec 2013 22:20:17 +0100
Subject: [PATCH] opus-build: build as C++ on Unix-like systems.

As stated in the .pro, this forces Opus symbols to be
name-mangled, thus avoiding potential clashes with
libcelt symbols.

Fixes #1096
---
 opus-build/opus-build.pro | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/opus-build/opus-build.pro b/opus-build/opus-build.pro
index 5aaf6615d..036643957 100644
--- a/opus-build/opus-build.pro
+++ b/opus-build/opus-build.pro
@@ -44,7 +44,10 @@ win32 {
 
 unix {
   CONFIG += staticlib
-  QMAKE_CFLAGS += -x c
+  # Build as C++ to ensure symbols are C++-mangled.
+  # This avoids symbol clashes with CELT 0.7 when
+  # building Mumble with CONFIG(sbcelt).
+  QMAKE_CFLAGS += -x c++
   INCLUDEPATH += ../$$BUILDDIR
 }