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

Timestamp:

Sep 10, 2008 8:59:47 PM (16 years ago)

Author:

vboxsync

Message:

xpcom/makefile: added a VBoxPython2_5 target for the mac.

File:

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

trunk/src/libs/xpcom18a4/Makefile.kmk

@@ -215 +215 @@
 TEMPLATE_XPCOMBLDPROG_LDFLAGS.$(KBUILD_TARGET_ARCH) = $(TEMPLATE_XPCOMEXE_LDFLAGS.$(KBUILD_TARGET_ARCH))
 TEMPLATE_XPCOMBLDPROG_ORDERDEPS         = $(foreach hdrinst, $(filter %-HEADERS, $(INSTALLS)), $(TARGET_$(hdrinst)))
+
+
+#
+# Template for building VBoxPhython against the Mac OS X 10.5 SDK.
+# ASSUMES that the SDK bits are in the .darwin properties we're overriding below.
+#
+TEMPLATE_XPCOMOSX105                    = XPCOM libraries (shared) built against the Mac OS X 10.5 SDK
+TEMPLATE_XPCOMOSX105_EXTENDS            = XPCOM
+TEMPLATE_XPCOMOSX105_CXXFLAGS.darwin    = $(filter-out $(VBOX_DARWIN_DEF_SDK_CXXFLAGS),$(TEMPLATE_XPCOM_CXXFLAGS.darwin)) $(VBOX_DARWIN_DEF_SDK_10_5_CXXFLAGS)
+TEMPLATE_XPCOMOSX105_CFLAGS.darwin      = $(filter-out $(VBOX_DARWIN_DEF_SDK_CFLAGS),$(TEMPLATE_XPCOM_CFLAGS.darwin)) $(VBOX_DARWIN_DEF_SDK_10_5_CFLAGS)
+TEMPLATE_XPCOMOSX105_LDFLAGS.darwin     = $(filter-out $(VBOX_DARWIN_DEF_SDK_LDFLAGS),$(TEMPLATE_XPCOM_LDFLAGS.darwin)) $(VBOX_DARWIN_DEF_SDK_10_5_LDFLAGS)
+TEMPLATE_XPCOMOSX105_DEFS.darwin        = $(filter-out $(VBOX_DARWIN_DEF_SDK_DEFS),$(TEMPLATE_XPCOM_DEFS.darwin)) $(VBOX_DARWIN_DEF_SDK_10_5_DEFS)
+TEMPLATE_XPCOMOSX105_INCS.darwin        = $(VBOX_PATH_MACOSX_SDK_10_5)/Developer/Headers/FlatCarbon
 
 
@@ -1298 +1311 @@
    endif
    # Does -framework really work with CXXFLAGS and CFLAGS?
-   VBOX_PYTHON_FRAMEWORK :=  -framework Python
+   VBOX_PYTHON_FRAMEWORK := -framework Python
    VBOX_PATH_PYTHON_INC := $(VBOX_PATH_MACOSX_SDK_10_4)/System/Library/Frameworks/Python.framework/Headers
   endif
@@ -1373 +1386 @@
         $(VBOX_LIB_PYTHON)
 
-## @todo we'll have to use the 10.5 SDK if we wish to build this. :-/
-#VBoxPython_DEFS.darwin = MAC_OS_X_VERSION_MIN_REQUIRED=1050 MAC_OS_X_VERSION_MAX_ALLOWED=1050
-#VBoxPython_CXXFLAGS.darwin = -mmacosx-version-min=10.5 -isysroot $(subst MacOSX10.4u,MacOSX10.5,$(VBOX_PATH_MACOSX_SDK)) -framework Python
-#VBoxPython_LDFLAGS.darwin  = -mmacosx-version-min=10.5 -isysroot $(subst MacOSX10.4u,MacOSX10.5,$(VBOX_PATH_MACOSX_SDK)) -framework Python
-
+if defined(VBOX_WITH_VBOXPYTHON_FOR_OSX_10_5) && "$(KBUILD_TARGET)" == "darwin"
+# Same VBoxPython except built against the Mac OS X 10.5 SDK.
+DLLS += VBoxPython2_5
+VBoxPython2_5_EXTENDS = VBoxPython
+VBoxPython2_5_TEMPLATE = XPCOMOSX105
+VBoxPython2_5_NAME.darwin = VBoxPython2_5
+VBoxPython2_5_INCS = \
+        python/src \
+        $(VBOX_PATH_MACOSX_SDK_10_5)/System/Library/Frameworks/Python.framework/Headers
+endif
 
 # Python Client Module - the Python bits.