Changeset 60970 in vbox

Timestamp:

May 13, 2016 1:04:01 AM (9 years ago)

Author:

vboxsync

Message:

More new Xcode fixes.

Location:

trunk

Files:

• Config.kmk (modified) (4 diffs)
• src/VBox/Devices/Makefile.kmk (modified) (1 diff)
• src/libs/xpcom18a4/python/Makefile.kmk (modified) (1 diff)

trunk/Config.kmk

@@ -2210 +2210 @@
         -Wl,-headerpad_max_install_names $(VBOX_DARWIN_CLASSIC_LINKER)
  else
+  VBOX_PATH_MACOSX_SDK_10_4          = $(error VBox: $(if $(target),$(target): ,)Using 10.4 SDK)
   VBOX_DARWIN_DEF_SDK_10_4_CXXFLAGS  = $(error VBox: $(if $(target),$(target): ,)Using 10.4 SDK)
   VBOX_DARWIN_DEF_SDK_10_4_LDFLAGS   = $(error VBox: $(if $(target),$(target): ,)Using 10.4 SDK)
@@ -2224 +2225 @@
         -Wl,-headerpad_max_install_names $(VBOX_DARWIN_NO_COMPACT_LINKEDIT)
  else
+  VBOX_PATH_MACOSX_SDK_10_5          = $(error VBox: $(if $(target),$(target): ,)Using 10.5 SDK)
   VBOX_DARWIN_DEF_SDK_10_5_CXXFLAGS  = $(error VBox: $(if $(target),$(target): ,)Using 10.5 SDK)
   VBOX_DARWIN_DEF_SDK_10_5_LDFLAGS   = $(error VBox: $(if $(target),$(target): ,)Using 10.5 SDK)
@@ -2238 +2240 @@
          -Wl,-headerpad_max_install_names
  else
+  VBOX_PATH_MACOSX_SDK_10_6          = $(error VBox: $(if $(target),$(target): ,)Using 10.6 SDK)
   VBOX_DARWIN_DEF_SDK_10_6_CXXFLAGS  = $(error VBox: $(if $(target),$(target): ,)Using 10.6 SDK)
   VBOX_DARWIN_DEF_SDK_10_6_LDFLAGS   = $(error VBox: $(if $(target),$(target): ,)Using 10.6 SDK)
@@ -2258 +2261 @@
          -Wl,-headerpad_max_install_names
  else
+  VBOX_PATH_MACOSX_SDK_10_7          = $(error VBox: $(if $(target),$(target): ,)Using 10.7 SDK)
   VBOX_DARWIN_DEF_SDK_10_7_CXXFLAGS  = $(error VBox: $(if $(target),$(target): ,)Using 10.7 SDK)
   VBOX_DARWIN_DEF_SDK_10_7_LDFLAGS   = $(error VBox: $(if $(target),$(target): ,)Using 10.7 SDK)

trunk/src/VBox/Devices/Makefile.kmk

@@ -288 +288 @@
    endif
   endif
-  Graphics/DevVGA-SVGA3d.cpp_CXXFLAGS.darwin            = -F$(VBOX_PATH_MACOSX_SDK_10_7)/System/Library/Frameworks/
-  Graphics/DevVGA-SVGA3d-info.cpp_CXXFLAGS.darwin       = -F$(VBOX_PATH_MACOSX_SDK_10_7)/System/Library/Frameworks/
-  Graphics/DevVGA-SVGA3d-shared.cpp_CXXFLAGS.darwin     = -F$(VBOX_PATH_MACOSX_SDK_10_7)/System/Library/Frameworks/
-  Graphics/DevVGA-SVGA3d-savedstate.cpp_CXXFLAGS.darwin = -F$(VBOX_PATH_MACOSX_SDK_10_7)/System/Library/Frameworks/
-  Graphics/DevVGA-SVGA3d-ogl.cpp_CXXFLAGS.darwin        = -F$(VBOX_PATH_MACOSX_SDK_10_7)/System/Library/Frameworks/
+  if1of ($(VBOX_DEF_MACOSX_VERSION_MIN), 10.6 10.5 10.4)
+   Graphics/DevVGA-SVGA3d.cpp_CXXFLAGS.darwin            = -F$(VBOX_PATH_MACOSX_SDK_10_7)/System/Library/Frameworks/
+   Graphics/DevVGA-SVGA3d-info.cpp_CXXFLAGS.darwin       = -F$(VBOX_PATH_MACOSX_SDK_10_7)/System/Library/Frameworks/
+   Graphics/DevVGA-SVGA3d-shared.cpp_CXXFLAGS.darwin     = -F$(VBOX_PATH_MACOSX_SDK_10_7)/System/Library/Frameworks/
+   Graphics/DevVGA-SVGA3d-savedstate.cpp_CXXFLAGS.darwin = -F$(VBOX_PATH_MACOSX_SDK_10_7)/System/Library/Frameworks/
+   Graphics/DevVGA-SVGA3d-ogl.cpp_CXXFLAGS.darwin        = -F$(VBOX_PATH_MACOSX_SDK_10_7)/System/Library/Frameworks/
+  endif
  endif
 

trunk/src/libs/xpcom18a4/python/Makefile.kmk

@@ -31 +31 @@
 #
 ifeq ($(KBUILD_TARGET),darwin) # Relatively predictable, don't script.
- if  !defined(VBOX_WITHOUT_VBOXPYTHON_FOR_OSX_10_6) \
-  && (   !defined(VBOX_OSE) \
-      || "$(wildcard $(VBOX_PATH_MACOSX_SDK_10_6)/usr/lib/libpython2.6.dylib)" != "")
-  VBOX_PYTHON26_INC = $(VBOX_PATH_MACOSX_SDK_10_6)/usr/include/python2.6
-  VBOX_PYTHON26_LIB = $(VBOX_PATH_MACOSX_SDK_10_6)/usr/lib/libpython2.6.dylib
-  VBOX_PYTHON26_LIB_X86 = $(VBOX_PYTHON26_LIB)
- endif
- if  !defined(VBOX_WITHOUT_VBOXPYTHON_FOR_OSX_10_7) \
-  && (   defined(VBOX_NOT_OSE_LATER_SOMETIME) \
-      || "$(wildcard $(VBOX_PATH_MACOSX_SDK_10_7)/usr/lib/libpython2.7.dylib)" != "")
-  VBOX_PYTHON27_INC = $(VBOX_PATH_MACOSX_SDK_10_7)/usr/include/python2.7
-  VBOX_PYTHON27_LIB = $(VBOX_PATH_MACOSX_SDK_10_7)/usr/lib/libpython2.7.dylib
-  VBOX_PYTHON27_LIB_X86 = $(VBOX_PYTHON27_LIB)
+ ifndef VBOX_WITHOUT_VBOXPYTHON_FOR_OSX_10_6
+  if1of ($(VBOX_DEF_MACOSX_VERSION_MIN), 10.5 10.4)
+   VBOX_PYTHON26_INC = $(VBOX_PATH_MACOSX_SDK_10_6)/usr/include/python2.6
+   VBOX_PYTHON26_LIB = $(VBOX_PATH_MACOSX_SDK_10_6)/usr/lib/libpython2.6.dylib
+  else
+   VBOX_PYTHON26_INC = $(VBOX_PATH_MACOSX_SDK)/usr/include/python2.6
+   VBOX_PYTHON26_LIB = $(VBOX_PATH_MACOSX_SDK)/usr/lib/libpython2.6.dylib
+  endif
+  if !defined(VBOX_OSE) || "$(wildcard $(VBOX_PYTHON26_LIB))" != ""
+   VBOX_PYTHON26_LIB_X86 = $(VBOX_PYTHON26_LIB)
+  else
+   VBOX_PYTHON26_INC =
+   VBOX_PYTHON26_LIB =
+  endif
+ endif
+ ifndef VBOX_WITHOUT_VBOXPYTHON_FOR_OSX_10_7
+  if1of ($(VBOX_DEF_MACOSX_VERSION_MIN), 10.6 10.5 10.4)
+   VBOX_PYTHON27_INC = $(VBOX_PATH_MACOSX_SDK_10_7)/usr/include/python2.7
+   VBOX_PYTHON27_LIB = $(VBOX_PATH_MACOSX_SDK_10_7)/usr/lib/libpython2.7.dylib
+  else
+   VBOX_PYTHON27_INC = $(VBOX_PATH_MACOSX_SDK)/usr/include/python2.7
+   VBOX_PYTHON27_LIB = $(VBOX_PATH_MACOSX_SDK)/usr/lib/libpython2.7.dylib
+  endif
+  if !defined(VBOX_OSE) || "$(wildcard $(VBOX_PYTHON27_LIB))" != ""
+   VBOX_PYTHON27_LIB_X86 = $(VBOX_PYTHON27_LIB)
+  else
+   VBOX_PYTHON27_INC =
+   VBOX_PYTHON27_LIB =
+  endif
  endif
  # No Python 3.x yet as part of OSX versions including El Capitan, 10.11.