mail[Wesnoth-commits] r28779 - /trunk/scons/pango.py


Others Months | Index by Date | Thread Index
>>   [Date Prev] [Date Next] [Thread Prev] [Thread Next]

Header


Content

Posted by loonycyborg on August 20, 2008 - 00:01:
Author: loonycyborg
Date: Wed Aug 20 00:01:21 2008
New Revision: 28779

URL: http://svn.gna.org/viewcvs/wesnoth?rev=28779&view=rev
Log:
Added support for using windows GTK SDKs during cross-compile targeting win32 
to pango check.

Modified:
    trunk/scons/pango.py

Modified: trunk/scons/pango.py
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/scons/pango.py?rev=28779&r1=28778&r2=28779&view=diff
==============================================================================
--- trunk/scons/pango.py (original)
+++ trunk/scons/pango.py Wed Aug 20 00:01:21 2008
@@ -1,5 +1,5 @@
 # vi: syntax=python:et:ts=4
-import os
+import os, sys
 from os.path import join
 from os import environ
 from SCons.Util import AppendPath
@@ -11,9 +11,11 @@
     if gtkdir:
         environ["PATH"] = AppendPath(environ["PATH"], join(gtkdir, "bin"))
         environ["PKG_CONFIG_PATH"] = 
AppendPath(environ.get("PKG_CONFIG_PATH", ""), join(gtkdir, "lib/pkgconfig"))
+        if sys.platform != "win32":
+            env["PKGCONFIG_FLAGS"] = "--define-variable=prefix=" + gtkdir
 
     try:
-        env.ParseConfig("pkg-config --libs --cflags pango" + backend)
+        env.ParseConfig("pkg-config --libs --cflags $PKGCONFIG_FLAGS pango" 
+ backend)
         context.Result("yes")
         return True
     except OSError:




Related Messages


Powered by MHonArc, Updated Wed Aug 20 03:41:14 2008