summaryrefslogtreecommitdiff
path: root/platform/osx/detect.py
diff options
context:
space:
mode:
authorJuan Linietsky <reduzio@gmail.com>2015-01-10 17:37:56 -0300
committerJuan Linietsky <reduzio@gmail.com>2015-01-10 17:37:56 -0300
commitd30f4e52f654a26e14223a6ef9a946cc6282c0db (patch)
tree66996de1cf9c1a1e008691da61c1989eae7abf33 /platform/osx/detect.py
parent89970848311ee2d49040a148a56d80590091877c (diff)
parentf97582b5e9f069176a4c9226c39a880f786dae67 (diff)
Merge branch 'master' of https://github.com/okamstudio/godot
Diffstat (limited to 'platform/osx/detect.py')
-rw-r--r--platform/osx/detect.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/platform/osx/detect.py b/platform/osx/detect.py
index 1b32838525..141a876657 100644
--- a/platform/osx/detect.py
+++ b/platform/osx/detect.py
@@ -78,7 +78,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', 'OpenGL', '-framework', 'AGL', '-framework', 'AudioUnit','-lz'])
+ env.Append(LINKFLAGS=['-framework', 'Cocoa', '-framework', 'Carbon', '-framework', 'OpenGL', '-framework', 'AGL', '-framework', 'AudioUnit','-lz'])
if (env["CXX"]=="clang++"):
env.Append(CPPFLAGS=['-DTYPED_METHOD_BIND'])