summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAriel Manzur <punto@godotengine.org>2016-01-29 07:18:27 -0300
committerAriel Manzur <punto@godotengine.org>2016-01-29 07:18:53 -0300
commit593b01b709517c36e65507c20ccf9c80907c67a2 (patch)
tree97ea3e9c4a0ed8a3e90705ceb7faf26660628bd7
parent4e199a4a07c00f541bd9ae7235bcf02e703fa2b7 (diff)
audio crash
-rw-r--r--platform/osx/audio_driver_osx.cpp3
-rw-r--r--platform/osx/detect.py2
2 files changed, 4 insertions, 1 deletions
diff --git a/platform/osx/audio_driver_osx.cpp b/platform/osx/audio_driver_osx.cpp
index a74303e6c2..d9d91b22fb 100644
--- a/platform/osx/audio_driver_osx.cpp
+++ b/platform/osx/audio_driver_osx.cpp
@@ -172,6 +172,9 @@ void AudioDriverOSX::unlock() {
void AudioDriverOSX::finish() {
+ if (active)
+ AudioOutputUnitStop(audio_unit);
+
memdelete_arr(samples_in);
};
diff --git a/platform/osx/detect.py b/platform/osx/detect.py
index f7cf5111f5..856fc9a402 100644
--- a/platform/osx/detect.py
+++ b/platform/osx/detect.py
@@ -99,7 +99,7 @@ def configure(env):
env.Append(LIBS=['pthread'])
#env.Append(CPPFLAGS=['-F/Developer/SDKs/MacOSX10.4u.sdk/System/Library/Frameworks', '-isysroot', '/Developer/SDKs/MacOSX10.4u.sdk', '-mmacosx-version-min=10.4'])
#env.Append(LINKFLAGS=['-mmacosx-version-min=10.4', '-isysroot', '/Developer/SDKs/MacOSX10.4u.sdk', '-Wl,-syslibroot,/Developer/SDKs/MacOSX10.4u.sdk'])
- env.Append(LINKFLAGS=['-framework', 'Cocoa', '-framework', 'Carbon', '-framework', 'OpenGL', '-framework', 'AGL', '-framework', 'AudioUnit','-lz'])
+ env.Append(LINKFLAGS=['-g3', '-framework', 'Cocoa', '-framework', 'Carbon', '-framework', 'OpenGL', '-framework', 'AGL', '-framework', 'AudioUnit','-lz'])
if (env["CXX"]=="clang++"):
env.Append(CPPFLAGS=['-DTYPED_METHOD_BIND'])