Changeset 12369 in vbox

Timestamp:

Sep 10, 2008 5:55:26 PM (16 years ago)

Author:

vboxsync

Message:

VBoxPython/mac: first bit - building against the 10.4 framework.

File:

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

trunk/src/libs/xpcom18a4/Makefile.kmk

@@ -1292 +1292 @@
 # Find the Python headers for the Python<->XPCOM bridge if enabled.
 ifdef VBOX_WITH_PYTHON
- ifndef VBOX_PATH_PYTHON_INC
-  VBOX_PATH_PYTHON_INC := $(patsubst %/Python.h,%, $(lastword $(sort $(wildcard \
-        /usr/include/python2.*/Python.h \
-        /usr/local/include/python2.*/Python.h \
-        ))))
-  ifeq ($(VBOX_PATH_PYTHON_INC),)
-   $(warning Unable to determine the python include directory (VBOX_PATH_PYTHON_INC).)
+ 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
   endif
- endif
- VBOX_PYTHON_VER := 2$(lastword $(subst ., .,$(VBOX_PATH_PYTHON_INC)))
- ifndef VBOX_LIB_PYTHON
-  VBOX_TMP := $(if $(eq $(KBUILD_TARGET).$(KBUILD_TARGET_ARCH),solaris.amd64),64/,)
-  VBOX_LIB_PYTHON := $(firstword $(wildcard \
-        /usr/lib/$(VBOX_TMP)libpython$(VBOX_PYTHON_VER)$(SUFF_DLL) \
-        /usr/local/lib/$(VBOX_TMP)libpython$(VBOX_PYTHON_VER)$(SUFF_DLL) \
-        /usr/lib/$(VBOX_TMP)libpython2$(SUFF_DLL) \
-        /usr/local/lib/$(VBOX_TMP)libpython2$(SUFF_DLL) \
-        /usr/lib/$(VBOX_TMP)libpython$(SUFF_DLL) \
-        /usr/local/lib/$(VBOX_TMP)libpython$(SUFF_DLL) \
-        ))
-  ifeq ($(VBOX_LIB_PYTHON),)
-   $(warning Unable to determine the python library (VBOX_LIB_PYTHON).)
+ else  # !darwin || configured darwin
+  ifndef VBOX_PATH_PYTHON_INC
+    VBOX_PATH_PYTHON_INC := $(patsubst %/Python.h,%, $(lastword $(sort $(wildcard \
+        /usr/include/python2.*/Python.h \
+        /usr/local/include/python2.*/Python.h \
+        ))))
+   ifeq ($(VBOX_PATH_PYTHON_INC),)
+    $(warning Unable to determine the python include directory (VBOX_PATH_PYTHON_INC).)
+   endif
   endif
+  VBOX_PYTHON_VER := 2$(lastword $(subst ., .,$(VBOX_PATH_PYTHON_INC)))
+  ifndef VBOX_LIB_PYTHON
+   VBOX_TMP := $(if $(eq $(KBUILD_TARGET).$(KBUILD_TARGET_ARCH),solaris.amd64),64/,)
+   VBOX_LIB_PYTHON := $(firstword $(wildcard \
+        /usr/lib/$(VBOX_TMP)libpython$(VBOX_PYTHON_VER)$(SUFF_DLL) \
+        /usr/local/lib/$(VBOX_TMP)libpython$(VBOX_PYTHON_VER)$(SUFF_DLL) \
+        /usr/lib/$(VBOX_TMP)libpython2$(SUFF_DLL) \
+        /usr/local/lib/$(VBOX_TMP)libpython2$(SUFF_DLL) \
+        /usr/lib/$(VBOX_TMP)libpython$(SUFF_DLL) \
+        /usr/local/lib/$(VBOX_TMP)libpython$(SUFF_DLL) \
+        ))
+   ifeq ($(VBOX_LIB_PYTHON),)
+    $(warning Unable to determine the python library (VBOX_LIB_PYTHON).)
+   endif
+  endif # !darwin || configured darwin
  endif
  ifndef VBOX_ONLY_SDK
@@ -1328 +1339 @@
                   VBOX_PYXPCOM VBOX_WITH_XPCOM
 VBoxPython_NAME.darwin = VBoxPython2_3
+VBoxPython_CFLAGS.darwin   = $(VBOX_PYTHON_FRAMEWORK)
+VBoxPython_CXXFLAGS.darwin = $(VBOX_PYTHON_FRAMEWORK)
+VBoxPython_LDFLAGS.darwin  = $(VBOX_PYTHON_FRAMEWORK)
 VBoxPython_INCS = \
         python/src \