- Timestamp:
- Jul 6, 2020 9:31:10 AM (5 years ago)
- svn:sync-xref-src-repo-rev:
- 138964
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
TabularUnified trunk/src/libs/xpcom18a4/python/Makefile.kmk ¶
r82395 r85061 38 38 VBOX_PYTHON26_INC = $(VBOX_PATH_MACOSX_SDK)/../MacOSX10.10.sdk/System/Library/Frameworks/Python.framework/Versions/2.6/Headers 39 39 VBOX_PYTHON26_LIB = $(VBOX_PATH_MACOSX_SDK)/../MacOSX10.10.sdk/System/Library/Frameworks/Python.framework/Versions/2.6/Python 40 else 40 else if1of ($(VBOX_DEF_MACOSX_VERSION_MIN), 10.6 10.7 10.8 10.9 10.10 10.11 10.12) ## @todo @bugref{9790} 2.6 header was dropped in 10.13, so: else if $(VBOX_DEF_MACOSX_VERSION_MIN) vge 10.13 41 41 VBOX_PYTHON26_INC = $(VBOX_PATH_MACOSX_SDK)/System/Library/Frameworks/Python.framework/Versions/2.6/Headers 42 42 VBOX_PYTHON26_LIB = $(VBOX_PATH_MACOSX_SDK)/System/Library/Frameworks/Python.framework/Versions/2.6/Python … … 73 73 $(eval $(subst |,$(NL),$(shell $(VBOX_BLD_PYTHON) \ 74 74 $(PATH_SUB_CURRENT)/gen_python_deps.py \ 75 76 77 75 $(KBUILD_TARGET) \ 76 $(KBUILD_TARGET_ARCH) \ 77 $(VBOX_MULTIPYTHON) ))) 78 78 endif 79 79 … … 149 149 VBoxPython2_6_EXTENDS = VBoxPythonBase 150 150 VBoxPython2_6_EXTENDS_BY = appending 151 ifdef KMK_WITH_VERSION_COMPARE 152 VBoxPython2_6_TEMPLATE = XPCOM$(if-expr "$(KBUILD_TARGET)" == "darwin" && "$(VBOX_DEF_MACOSX_VERSION_MIN)" vle "10.6",OSX106,) 153 else 151 154 VBoxPython2_6_TEMPLATE = XPCOM$(if-expr "$(KBUILD_TARGET)" == "darwin" && "$(VBOX_DEF_MACOSX_VERSION_MIN)" <= "10.6",OSX106,) 155 endif 152 156 VBoxPython2_6_INCS = $(VBOX_PYTHON26_INC) 153 157 VBoxPython2_6_LIBS = $(VBOX_PYTHON26_LIB) … … 158 162 VBoxPython2_6_x86_EXTENDS = VBoxPythonBase_x86 159 163 VBoxPython2_6_x86_EXTENDS_BY = appending 164 ifdef KMK_WITH_VERSION_COMPARE 165 VBoxPython2_6_x86_TEMPLATE = XPCOM$(if-expr "$(KBUILD_TARGET)" == "darwin" && "$(VBOX_DEF_MACOSX_VERSION_MIN)" vle "10.6",OSX106,-x86) 166 else 160 167 VBoxPython2_6_x86_TEMPLATE = XPCOM$(if-expr "$(KBUILD_TARGET)" == "darwin" && "$(VBOX_DEF_MACOSX_VERSION_MIN)" <= "10.6",OSX106,-x86) 168 endif 161 169 VBoxPython2_6_x86_INCS = $(VBOX_PYTHON26_INC) 162 170 VBoxPython2_6_x86_LIBS = $(VBOX_PYTHON26_LIB_X86) … … 172 180 VBoxPython2_7_EXTENDS = VBoxPythonBase 173 181 VBoxPython2_7_EXTENDS_BY = appending 182 ifdef KMK_WITH_VERSION_COMPARE 183 VBoxPython2_7_TEMPLATE = XPCOM$(if-expr "$(KBUILD_TARGET)" == "darwin" && "$(VBOX_DEF_MACOSX_VERSION_MIN)" vle "10.7",OSX107,) 184 else 174 185 VBoxPython2_7_TEMPLATE = XPCOM$(if-expr "$(KBUILD_TARGET)" == "darwin" && "$(VBOX_DEF_MACOSX_VERSION_MIN)" <= "10.7",OSX107,) 186 endif 175 187 VBoxPython2_7_INCS = $(VBOX_PYTHON27_INC) 176 188 VBoxPython2_7_LIBS = $(VBOX_PYTHON27_LIB) … … 181 193 VBoxPython2_7_x86_EXTENDS = VBoxPythonBase_x86 182 194 VBoxPython2_7_x86_EXTENDS_BY = appending 195 ifdef KMK_WITH_VERSION_COMPARE 196 VBoxPython2_7_x86_TEMPLATE = XPCOM$(if-expr "$(KBUILD_TARGET)" == "darwin" && "$(VBOX_DEF_MACOSX_VERSION_MIN)" vle "10.7",OSX107,-x86) 197 else 183 198 VBoxPython2_7_x86_TEMPLATE = XPCOM$(if-expr "$(KBUILD_TARGET)" == "darwin" && "$(VBOX_DEF_MACOSX_VERSION_MIN)" <= "10.7",OSX107,-x86) 199 endif 184 200 VBoxPython2_7_x86_INCS = $(VBOX_PYTHON27_INC) 185 201 VBoxPython2_7_x86_LIBS = $(VBOX_PYTHON27_LIB_X86)
Note:
See TracChangeset
for help on using the changeset viewer.