summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorAndoni Morales Alastruey <ylatuya@gmail.com>2012-05-21 02:24:39 +0200
committerAndoni Morales Alastruey <ylatuya@gmail.com>2012-05-21 02:24:39 +0200
commit58ac1cba5fe8902f5bc7daf924207e57b61fcb39 (patch)
treedd187329106dbfa5372efff42ff1d7d481939e95 /config
parent9e050be4427c34b233d01356972ca2cdeff690c6 (diff)
darwin.config: don't add sdk include path but instead link GL headers
We only need GL headers from $SDK_ROOT/X11/Include and including the whole path can cause problems in Leopard, where fontconfig headers are in this path and its version is too old
Diffstat (limited to 'config')
-rw-r--r--config/darwin.config13
1 files changed, 11 insertions, 2 deletions
diff --git a/config/darwin.config b/config/darwin.config
index 4fadce1..3e785f6 100644
--- a/config/darwin.config
+++ b/config/darwin.config
@@ -82,6 +82,15 @@ if target_arch == Architecture.PPC:
os.environ['CCASFLAGS'] += ' -arch ppc'
os.environ['OBJCFLAGS'] += ' -arch ppc'
-os.environ['CFLAGS'] += ' -I%s -I%s' % (os.path.join(prefix, 'include'), os.path.join(sdk_root, 'usr', 'X11', 'include'))
+incl_dir = os.path.join(prefix, 'include')
+if not os.path.exists(incl_dir):
+ os.makedirs(incl_dir)
+os.environ['CFLAGS'] += ' -I%s %s ' % (incl_dir, sdk)
os.environ['CXXFLAGS'] += os.environ['CFLAGS']
-os.environ['LDFLAGS'] += ' %s -L%s ' % (sdk, os.path.join(sdk_root, 'usr', 'X11', 'lib'))
+os.environ['LDFLAGS'] += ' %s ' % sdk
+
+# Link GL headers
+gl_headers = os.path.join(sdk_root, 'usr', 'X11', 'include', 'GL')
+gl_headers_prefix = os.path.join(incl_dir, 'GL')
+if not os.path.exists(gl_headers_prefix):
+ os.symlink(gl_headers, gl_headers_prefix)