diff options
| author | Michael Stahl <mstahl@redhat.com> | 2012-11-17 00:35:35 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-11-27 12:45:23 +0100 |
| commit | 38a22a9026a3d8a67f3e16ec650960a10b527d25 (patch) | |
| tree | f60bdd178a59fa4e59813e19083702f447613e8d /RepositoryExternal.mk | |
| parent | 6f8f95fed7a4bd741bf035f53a758ac0c6da66b2 (diff) | |
Switch from python to python3
Mac specific parts of patch by:
Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
Change-Id: I90ef17c6f5a678230539a80ab999fa5344e4fc8f
Diffstat (limited to 'RepositoryExternal.mk')
| -rw-r--r-- | RepositoryExternal.mk | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index b54173337554..2890d9aa2174 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -1966,27 +1966,31 @@ define gb_LinkTarget__use_python ifeq ($(OS),WNT) $(call gb_LinkTarget_add_libs,$(1),\ - python26.lib \ + python33.lib \ ) else ifeq ($(OS),MACOSX) $(call gb_LinkTarget_add_libs,$(1),\ - -F$(OUTDIR)/lib -framework OOoPython \ + -dylib_file @loader_path/LibreOfficePython.framework/Versions/3.3/LibreOfficePython:$(call gb_UnpackedTarball_get_dir,python3)/python-inst/@__________________________________________________OOO/LibreOfficePython.framework/Versions/3.3/LibreOfficePython \ + -F$(call gb_UnpackedTarball_get_dir,python3)/python-inst/@__________________________________________________OOO -framework LibreOfficePython \ ) else $(call gb_LinkTarget_use_libraries,$(1),\ - python2.6 \ + python3.3m \ ) endif $(call gb_LinkTarget_set_include,$(1),\ - -I$(OUTDIR)/inc/python \ + -I$(call gb_UnpackedTarball_get_dir,python3) \ + -I$(call gb_UnpackedTarball_get_dir,python3)/PC \ + -I$(call gb_UnpackedTarball_get_dir,python3)/Include \ $$(INCLUDE) \ ) endef $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO,\ - python2.6 \ + python3 \ + python3.3m \ )) endif # SYSTEM_PYTHON |