Changeset 16403 in vbox for trunk/src/libs/xpcom18a4

Timestamp:

Jan 30, 2009 1:13:08 AM (16 years ago)

Author:

vboxsync

Message:

XPCOM-darwin/amd64: Made VBoxPython(2_6) compile.

File:

• trunk/src/libs/xpcom18a4/Makefile.kmk (modified) (3 diffs)

trunk/src/libs/xpcom18a4/Makefile.kmk

@@ -1350 +1350 @@
  if "$(KBUILD_TARGET)" == "darwin" && !defined(VBOX_PATH_PYTHON_INC) && !defined(VBOX_LIB_PYTHON)
   ifndef VBOX_PYTHON_FRAMEWORK
-   ifneq ($(VBOX_DEF_MACOSX_VERSION_MIN),10.4)
-    $(error we are assuming 10.4 here; VBOX_DEF_MACOSX_VERSION_MIN=$(VBOX_DEF_MACOSX_VERSION_MIN))
-   endif
    # Does -framework really work with CXXFLAGS and CFLAGS?
    VBOX_PYTHON_FRAMEWORK := -framework Python
-   VBOX_PATH_PYTHON_INC := $(VBOX_PATH_MACOSX_SDK_10_4)/System/Library/Frameworks/Python.framework/Headers
+   VBOX_PATH_PYTHON_INC := $(VBOX_PATH_MACOSX_SDK)/System/Library/Frameworks/Python.framework/Headers
   endif
  else  # !darwin || configured darwin
@@ -1396 +1393 @@
 VBoxPython_DEFS.darwin = VBOX_PYXPCOM_VERSIONED
 VBoxPython_NAME.darwin = VBoxPython2_3
+VBoxPython_NAME.darwin.amd64 = VBoxPython2_6
 ifeq ($(KBUILD_TARGET),darwin)
  ## @todo kBuild - this ain't working: VBoxPython_DLLSUFF.darwin = .so
@@ -1434 +1432 @@
         $(VBOX_LIB_PYTHON)
 
-if defined(VBOX_WITH_VBOXPYTHON_FOR_OSX_10_5) && "$(KBUILD_TARGET)" == "darwin"
+if defined(VBOX_WITH_VBOXPYTHON_FOR_OSX_10_5) && "$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)" == "darwin.x86"
 # Same VBoxPython except built against the Mac OS X 10.5 SDK.
 DLLS += VBoxPython2_5