[QGIS Commit] r10290 - trunk/qgis/mac/xcode

[svn_qgis at osgeo.org]

Author: kyngchaos
Date: 2009-03-18 09:37:43 -0400 (Wed, 18 Mar 2009)
New Revision: 10290

Modified:
   trunk/qgis/mac/xcode/qgis_settings.xcconfig
   trunk/qgis/mac/xcode/qgis_user-template.xcconfig
Log:
fix python settings for native build

Modified: trunk/qgis/mac/xcode/qgis_settings.xcconfig
===================================================================
--- trunk/qgis/mac/xcode/qgis_settings.xcconfig	2009-03-18 05:38:23 UTC (rev 10289)
+++ trunk/qgis/mac/xcode/qgis_settings.xcconfig	2009-03-18 13:37:43 UTC (rev 10290)
@@ -1,6 +1,6 @@
 // QGIS Xcode project common build settings
 
-CURRENT_PROJECT_VERSION = 2.1.0
+CURRENT_PROJECT_VERSION = 2.1.1
 
 // SDK not required for native universal build, but recommended,
 // and allows building multiple SDK builds side-by-side
@@ -276,8 +276,10 @@
 PYTHON_LIB = -framework Python
 PYTHON_HAVE_fw_tig = HAVE_PYTHON=1
 PYTHON_HAVE_fw_leo = HAVE_PYTHON=1
+PYTHON_HAVE_fw_ = HAVE_PYTHON=1
 PYTHON_HAVE_system_tig = 
 PYTHON_HAVE_system_leo = HAVE_PYTHON=1
+PYTHON_HAVE_system_ = 
 PYTHON_HAVE = $(PYTHON_HAVE_$(PYTHON_FORM)_$(SDKSYS))
 PYTHON = $(PYTHON_PREFIX)/bin/python
 

Modified: trunk/qgis/mac/xcode/qgis_user-template.xcconfig
===================================================================
--- trunk/qgis/mac/xcode/qgis_user-template.xcconfig	2009-03-18 05:38:23 UTC (rev 10289)
+++ trunk/qgis/mac/xcode/qgis_user-template.xcconfig	2009-03-18 13:37:43 UTC (rev 10290)
@@ -53,6 +53,8 @@
 // system Python only on Leopard+
 //PYTHON_FORM = fw // fw, system or disabled
 //PYTHON_VERSION = 2.5 // can't auto-detect here
+// only uncomment this for a native build on Leopard
+//PYTHON_HAVE_system_ = HAVE_PYTHON=1
 
 //////////////////////////////////////////////////////////////////////
 // whether to bundle some external libs in the app package