Changeset 60949 in vbox for trunk

Timestamp:

May 12, 2016 2:10:46 PM (9 years ago)

Author:

vboxsync

Message:

xpcom: Adjustments for OS X SDK v10.9.

Location:

trunk/src/libs/xpcom18a4

Files:

• Config.kmk (modified) (1 diff)
• xpcom/io/SpecialSystemDirectory.cpp (modified) (1 diff)
• xpcom/io/SpecialSystemDirectory.h (modified) (1 diff)
• xpcom/io/nsDirectoryService.cpp (modified) (1 diff)

trunk/src/libs/xpcom18a4/Config.kmk

@@ -123 +123 @@
                                      $(VBOX_PATH_SDK)/bindings/xpcom/include/ipcd \
                                      .
-TEMPLATE_XPCOM_INCS.darwin         = $(VBOX_PATH_MACOSX_SDK)/Developer/Headers/FlatCarbon
+ifn1of ($(VBOX_DEF_MACOSX_VERSION_MIN),10.4 10.5 10.6 10.7) # FlatCarbon is gone starting 10.8 (or Xcode 5.0).
+ TEMPLATE_XPCOM_DEFS.darwin       += VBOX_WITH_NEWER_OSX_SDK
+ TEMPLATE_XPCOM_INCS.darwin        = \
+        $(VBOX_PATH_MACOSX_SDK)/System/Library/Frameworks/CoreFoundation.framework/Versions/A/Headers/ \
+        $(VBOX_PATH_MACOSX_SDK)/System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/CarbonCore.framework/Versions/A/Headers/ \
+        $(VBOX_PATH_MACOSX_SDK)/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/HIServices.framework/Versions/A/Headers/
+else
+ TEMPLATE_XPCOM_INCS.darwin        = $(VBOX_PATH_MACOSX_SDK)/Developer/Headers/FlatCarbon
+endif
 TEMPLATE_XPCOM_LIBS.solaris        = sendfile
 TEMPLATE_XPCOM_ORDERDEPS           = $(foreach hdrinst, $(filter %-HEADERS, $(INSTALLS)), $($(hdrinst)_1_TARGET)) \

trunk/src/libs/xpcom18a4/xpcom/io/SpecialSystemDirectory.cpp

@@ -93 +93 @@
 #include <sys/param.h>
 #include "prenv.h"
+# if defined(XP_MACOSX) && defined(VBOX_WITH_NEWER_OSX_SDK)
+# include <Folders.h>
+# endif
 
 #elif defined(XP_BEOS)

trunk/src/libs/xpcom18a4/xpcom/io/SpecialSystemDirectory.h

@@ -46 +46 @@
 
 #if defined(XP_MAC) || defined(XP_MACOSX)
-#include <Types.h>
+# ifndef VBOX_WITH_NEWER_OSX_SDK
+#  include <Types.h>
+# endif
 #include "nsILocalFileMac.h"
 #include "prenv.h"

trunk/src/libs/xpcom18a4/xpcom/io/nsDirectoryService.cpp

@@ -65 +65 @@
 #include <Folders.h>
 #include <Files.h>
-#include <Memory.h>
+# ifndef VBOX_WITH_NEWER_OSX_SDK
+#  include <Memory.h>
+# endif
 #include <Processes.h>
 #include <Gestalt.h>