Skip to content

Commit

Permalink
PyQGIS: support for Mac universal builds - fixes #876
Browse files Browse the repository at this point in the history
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@7807 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
wonder committed Dec 19, 2007
1 parent ff47fb1 commit 18f724e
Showing 1 changed file with 12 additions and 2 deletions.
14 changes: 12 additions & 2 deletions python/configure.py.in
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,14 @@ qt_libs = ["QtCore","QtGui","QtNetwork","QtSvg","QtXml"]
if sys.platform == 'darwin':
qt_libs.append("Qt3Support")
qt_libs.append("QtSql")
# possibility of universal build of bindings
osx_archs = '@CMAKE_OSX_ARCHITECTURES@'
if osx_archs == 'ppc;i386' or osx_archs == 'i386;ppc':
osx_universal = '@CMAKE_OSX_SYSROOT@'
else:
osx_universal = ''
else:
osx_universal = ''

if len(sys.argv)>1:
intdir = "/" + sys.argv[1]
Expand Down Expand Up @@ -98,15 +106,17 @@ makefile_core = sipconfig.ModuleMakefile(
build_file=build_file_core,
installs=installs_core,
install_dir=mod_dir,
dir="core")
dir="core",
universal=osx_universal)

makefile_gui = sipconfig.ModuleMakefile(
configuration=config,
qt=qt_libs,
build_file=build_file_gui,
installs=installs_gui,
install_dir=mod_dir,
dir="gui")
dir="gui",
universal=osx_universal)

# common settings for both core and gui libs
for mk in [ makefile_core, makefile_gui ]:
Expand Down

0 comments on commit 18f724e

Please sign in to comment.