Skip to content

Commit b7c8ecd

Browse files
author
kyngchaos
committed
fix python settings for native build
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@10290 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent cf97d7b commit b7c8ecd

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

mac/xcode/qgis_settings.xcconfig

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// QGIS Xcode project common build settings
22

3-
CURRENT_PROJECT_VERSION = 2.1.0
3+
CURRENT_PROJECT_VERSION = 2.1.1
44

55
// SDK not required for native universal build, but recommended,
66
// and allows building multiple SDK builds side-by-side
@@ -276,8 +276,10 @@ PYTHON_INC = $(PYTHON_PREFIX)/Headers
276276
PYTHON_LIB = -framework Python
277277
PYTHON_HAVE_fw_tig = HAVE_PYTHON=1
278278
PYTHON_HAVE_fw_leo = HAVE_PYTHON=1
279+
PYTHON_HAVE_fw_ = HAVE_PYTHON=1
279280
PYTHON_HAVE_system_tig =
280281
PYTHON_HAVE_system_leo = HAVE_PYTHON=1
282+
PYTHON_HAVE_system_ =
281283
PYTHON_HAVE = $(PYTHON_HAVE_$(PYTHON_FORM)_$(SDKSYS))
282284
PYTHON = $(PYTHON_PREFIX)/bin/python
283285

mac/xcode/qgis_user-template.xcconfig

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,8 @@
5353
// system Python only on Leopard+
5454
//PYTHON_FORM = fw // fw, system or disabled
5555
//PYTHON_VERSION = 2.5 // can't auto-detect here
56+
// only uncomment this for a native build on Leopard
57+
//PYTHON_HAVE_system_ = HAVE_PYTHON=1
5658

5759
//////////////////////////////////////////////////////////////////////
5860
// whether to bundle some external libs in the app package

0 commit comments

Comments
 (0)