Changeset 960 in vbox

Timestamp:

Feb 17, 2007 9:12:10 AM (18 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

18727

Message:

Darwin hacking.

Location:

trunk

Files:

• Config.kmk (modified) (6 diffs)
• Makefile (modified) (1 diff)
• src/VBox/Devices/Makefile (modified) (3 diffs)
• src/VBox/Devices/Storage/testcase/Makefile (modified) (1 diff)
• src/VBox/Frontends/VBoxManage/Makefile (modified) (1 diff)
• src/VBox/Frontends/VirtualBox/src/main.cpp (modified) (2 diffs)
• src/VBox/HostDrivers/Support/Makefile (modified) (3 diffs)
• src/VBox/Main/Makefile (modified) (11 diffs)
• src/VBox/Runtime/Makefile (modified) (3 diffs)
• src/VBox/VMM/Makefile (modified) (2 diffs)
• src/libs/xpcom18a4/Makefile.kmk (modified) (9 diffs)
• src/libs/xpcom18a4/xpcom/glue/standalone/nsXPCOMGlue.cpp (modified) (5 diffs)
• src/recompiler/new/Makefile.kmk (modified) (12 diffs)

trunk/Config.kmk

@@ -49 +49 @@
 # Install paths.
 PATH_INS            := $(PATH_OUT)
-PATH_BIN             = $(PATH_INS)/bin
-PATH_DLL             = $(PATH_INS)/bin
-PATH_SYS             = $(PATH_INS)/bin
-PATH_LIB             = $(PATH_INS)/lib
-PATH_DOC             = $(PATH_INS)/doc
-INST_TESTCASE        = bin/testcase/
-INST_ADDITIONS       = bin/additions/
-INST_ADDITIONS_LIB   = lib/additions/
-INST_SDK             = bin/sdk
-INST_SDK_SAMPLES     = $(INST_SDK)/samples
+ifeq ($(BUILD_TARGET),darwin)
+ INST_DIST            = dist/
+ INST_SDK             = $(INST_DIST)sdk/
+ INST_SDK_SAMPLES     = $(INST_SDK)samples
+
+ # the bundles
+ INST_VIRTUALBOX      = $(INST_DIST)VirtualBox.app/
+ INST_VBOXDRV         = $(INST_DIST)VBoxDrv.kext/
+ INST_VBOXTAP         = $(INST_DIST)VBoxTAP.kext/
+ INST_VBOXUSB         = $(INST_DIST)VBoxUSB.kext/
+
+ # put everything in the VirtualBox app bundle.
+ INST_BIN             = $(INST_VIRTUALBOX)Contents/MacOS/
+ INST_DLL             = $(INST_BIN)
+ INST_SYS             = $(INST_BIN)
+ INST_TESTCASE        = $(INST_BIN)testcase/
+ INST_ADDITIONS       = $(INST_BIN)MacOS/additions/
+
+ # other paths
+ INST_LIB             = lib/
+ INST_ADDITIONS_LIB   = $(PATH_LIB)/additions/
+
+else
+
+ INST_BIN             = bin/
+ INST_DIST            = $(INST_BIN)
+ INST_DLL             = $(INST_BIN)
+ INST_SDK             = $(INST_BIN)sdk/
+ INST_SDK_SAMPLES     = $(INST_SDK)samples
+ INST_DLL             = $(INST_BIN)
+ INST_SYS             = $(INST_BIN)
+ INST_TESTCASE        = $(INST_BIN)testcase/
+ INST_ADDITIONS       = $(INST_BIN)additions/
+
+ INST_LIB             = lib/
+ INST_ADDITIONS_LIB   = $(INST_LIB)additions/
+endif
+
+PATH_BIN              = $(patsubst %/,%,$(PATH_INS)/$(INST_BIN))
+PATH_DLL              = $(patsubst %/,%,$(PATH_INS)/$(INST_DLL))
+PATH_SYS              = $(patsubst %/,%,$(PATH_INS)/$(INST_SYS))
+PATH_LIB              = $(patsubst %/,%,$(PATH_INS)/$(INST_LIB))
+PATH_DOC              = $(PATH_OUT)/doc
+VBOX_PATH_SDK         = $(patsubst %/,%,$(PATH_INS)/$(INST_SDK))
+
+
 
 # Delete targets on failure.
@@ -602 +638 @@
  LIB_VMM         = $(PATH_BIN)/VBoxVMM.dylib
  LIB_VMMGC       = $(PATH_BIN)/VMMGC.gc
- LIB_REM         = $(PATH_BIN)/VBoxREMImp.dylib
+ LIB_REM         = $(PATH_LIB)/VBoxREMImp.dylib
 endif
 ifeq ($(BUILD_TARGET),l4)
@@ -701 +737 @@
  VBOX_WITH_XPCOM      = 1
  VBOX_XPIDL          ?= $(PATH_OBJ)/src/libs/xpcom18a4/xpidl/xpidl$(HOSTSUFF_EXE)
- VBOX_PATH_XPCOM_IDL ?= $(PATH_BIN)/sdk/idl
+ VBOX_PATH_XPCOM_IDL ?= $(VBOX_PATH_SDK)/idl
  VBOX_XPCOM_INCS     ?= \
-        $(PATH_BIN)/sdk/include \
-        $(PATH_BIN)/sdk/include/xpcom \
-        $(PATH_BIN)/sdk/include/xpcom/nsprpub \
-        $(PATH_BIN)/sdk/include/xpcom/string \
-        $(PATH_BIN)/sdk/include/xpcom/xpcom \
-        $(PATH_BIN)/sdk/include/xpcom/ipcd
+        $(VBOX_PATH_SDK)/include \
+        $(VBOX_PATH_SDK)/include/xpcom \
+        $(VBOX_PATH_SDK)/include/xpcom/nsprpub \
+        $(VBOX_PATH_SDK)/include/xpcom/string \
+        $(VBOX_PATH_SDK)/include/xpcom/xpcom \
+        $(VBOX_PATH_SDK)/include/xpcom/ipcd
  # libIDL-config (for xpcom18a4)
  ifeq ($(origin VBOX_LIBIDL_CONFIG),undefined)
@@ -1523 +1559 @@
 TEMPLATE_VBOXMAINCLIENT_EXTENDS     = VBOXMAINEXE
 TEMPLATE_VBOXMAINCLIENT_INCS        = $(TEMPLATE_VBOXMAINEXE_INCS) \
-        $(PATH_BIN)/sdk/include
+        $(VBOX_PATH_SDK)/include
 ifdef VBOX_WITH_XPCOM
 TEMPLATE_VBOXMAINCLIENT_INCS       += \
@@ -1564 +1600 @@
 TEMPLATE_VBOXQTGUIEXE_DEFS = IN_RING3 QT_NO_DEBUG QT_THREAD_SUPPORT $(ARCH_BITS_DEFS)
 TEMPLATE_VBOXQTGUIEXE_INCS = \
-        $(PATH_BIN)/sdk/include \
+        $(VBOX_PATH_SDK)/include \
         $(VBOX_PATH_QT)/include
 
@@ -1785 +1821 @@
 TEMPLATE_VBOXW32GUESTR3_CFLAGS.kprofile     = $(TEMPLATE_VBOXW32GUESTR3_CXXFLAGS.kprofile)
 TEMPLATE_VBOXW32GUESTR3_INCS                = \
-        $(PATH_BIN)/sdk/include
+        $(VBOX_PATH_SDK)/include
 TEMPLATE_VBOXW32GUESTR3_LDFLAGS             = \
         /NOD /INCREMENTAL:NO /MAPINFO:EXPORTS /LARGEADDRESSAWARE \

trunk/Makefile

@@ -35 +35 @@
 INSTALLS = bin
 
-bin_INST = bin/
+bin_INST = $(INST_BIN)
 
 # The SDL DLLs

trunk/src/VBox/Devices/Makefile

@@ -95 +95 @@
 VBoxDD_LIBS.os2         = \
         $(PATH_BIN)/VBoxDD2.dll
+VBoxDD_LDFLAGS.darwin   = -install_name @executable_path/VBoxDD.dylib
 VBoxDD_LDFLAGS.linux    = -Wl,--no-undefined
 VBoxDD_LDFLAGS.l4       = -Wl,--no-undefined
@@ -117 +118 @@
         $(LIB_VMM) \
         $(LIB_RUNTIME)
-VBoxDD2_LDFLAGS.linux   = -Wl,--no-undefined
 ifeq ($(BUILD_TARGET),l4)
 VBoxDD2_LIBS           += \
@@ -123 +123 @@
 endif
 VBoxDD2_LIBS.darwin    += $(LIB_REM)
+VBoxDD2_LDFLAGS.darwin  = -install_name @executable_path/VBoxDD2.dylib
+VBoxDD2_LDFLAGS.linux   = -Wl,--no-undefined
 VBoxDD2_LDFLAGS.l4      = -Wl,--no-undefined
 

trunk/src/VBox/Devices/Storage/testcase/Makefile

@@ -29 +29 @@
 TEMPLATE        = VBOXR3EXE
 ifeq ($(filter-out win,$(BUILD_TARGET)),)
-LIBS            = $(PATH_LIB)/VBoxDD.lib
+ LIBS           = $(PATH_LIB)/VBoxDD.lib
 else
-LIBS            = $(PATH_BIN)/VBoxDD$(VBOX_SUFF_DLL)
+ LIBS           = \
+        $(PATH_BIN)/VBoxDD$(VBOX_SUFF_DLL) \
+        $(PATH_BIN)/VBoxDD2$(VBOX_SUFF_DLL) \
+        $(LIB_VMM) \
+        $(LIB_REM)
 endif
 LIBS           += $(LIB_RUNTIME)

trunk/src/VBox/Frontends/VBoxManage/Makefile

@@ -44 +44 @@
         $(PATH_BIN)/VBoxDD$(VBOX_SUFF_DLL) \
         $(PATH_BIN)/VBoxXML$(VBOX_SUFF_DLL) \
+        $(LIB_VMM) \
         $(LIB_REM)
 

trunk/src/VBox/Frontends/VirtualBox/src/main.cpp

@@ -106 +106 @@
 }
 
+#ifdef __DARWIN__
+#include <iprt/path.h>
+#include <iprt/process.h>
+#include <iprt/env.h>
+
+/**
+ * App bundle tweaks.
+ */
+static void DarwinInit (void)
+{
+    static struct
+    {
+        char var[sizeof ("VBOX_XPCOM_HOME=") - 1];
+        char path[RTPATH_MAX];
+    } s;
+
+    strcpy (s.var, "VBOX_XPCOM_HOME=");
+    int rc = RTPathProgram (&s.path[0], sizeof (s.path));
+    if (RT_FAILURE (rc))
+    {
+        RTPrintf ("RTPathProgram failed!\n");
+        exit (1);
+    }
+
+    if (!RTEnvGet ("VBOX_XPCOM_HOME"))
+        RTEnvPut (s.var);
+}
+#endif
+
 int main( int argc, char ** argv )
 {
@@ -122 +151 @@
     sigaction (SIGBUS, &sa, NULL);
     sigaction (SIGUSR1, &sa, NULL);
+#endif
+
+#ifdef __DARWIN__
+    DarwinInit();
 #endif
 

trunk/src/VBox/HostDrivers/Support/Makefile

@@ -184 +184 @@
 VBoxDrv_LIBS          = $(PATH_LIB)/RuntimeR0Drv$(VBOX_SUFF_LIB)
 VBoxDrv_LDFLAGS       = -v -Wl,-whyload -Wl,-v -Wl,-whatsloaded
-VBoxDrv_INST          = bin/VBoxDrv.kext/Contents/MacOS/
+VBoxDrv_INST          = $(INST_VBOXDRV)Contents/MacOS/
 VBoxDrv_SOURCES       = \
         $(VBOX_PATH_SUPPORT)/SUPDRVShared.c \
@@ -190 +190 @@
 
 INSTALLS += VBoxDrv.kext
-VBoxDrv.kext_INST     = bin/VBoxDrv.kext/Contents/
+VBoxDrv.kext_INST     = $(INST_VBOXDRV)Contents/
 VBoxDrv.kext_SOURCES  = \
         $(PATH_TARGET)/Info.plist
@@ -204 +204 @@
 
 INSTALLS += Scripts
-Scripts_INST     = bin/
+Scripts_INST     = $(INST_DIST)
 Scripts_SOURCES  = \
         $(VBOX_PATH_SUPPORT)/darwin/load.sh

trunk/src/VBox/Main/Makefile

@@ -46 +46 @@
 ifeq ($(BUILD_TARGET),win)
  OTHERS          = $(PATH_BIN)/comregister.cmd
- IDLFILE         = $(PATH_BIN)/sdk/idl/VirtualBox.idl
+ IDLFILE         = $(VBOX_PATH_SDK)/idl/VirtualBox.idl
  OTHER_CLEAN     = \
         $(PATH_BIN)/comregister.cmd \
-        $(PATH_BIN)/sdk/include/VirtualBox.h \
+        $(VBOX_PATH_SDK)/include/VirtualBox.h \
         $(IDLFILE) \
-        $(PATH_BIN)/sdk/lib/VirtualBox.tlb \
-        $(PATH_BIN)/sdk/lib/VirtualBox_i.c \
+        $(VBOX_PATH_SDK)/lib/VirtualBox.tlb \
+        $(VBOX_PATH_SDK)/lib/VirtualBox_i.c \
         $(PATH_VBoxCOM)/VirtualBox.h \
         $(PATH_VBoxCOM)/VirtualBox_i.c \
@@ -58 +58 @@
 else
  INSTALLS        = xpcom-components
- IDLFILE         = $(PATH_BIN)/sdk/idl/VirtualBox_XPCOM.idl
+ IDLFILE         = $(VBOX_PATH_SDK)/idl/VirtualBox_XPCOM.idl
  IDLTYPELIB      = $(PATH_BIN)/VirtualBox_XPCOM.xpt
- IDLHEADER       = $(PATH_BIN)/sdk/include/VirtualBox_XPCOM.h
+ IDLHEADER       = $(VBOX_PATH_SDK)/include/VirtualBox_XPCOM.h
  OTHERS          = $(IDLTYPELIB)
  OTHER_CLEAN     = \
@@ -122 +122 @@
         $(PATH_VBoxSVC) \
         $(PATH_VBoxCOM) \
-        $(PATH_BIN)/sdk/include
+        $(VBOX_PATH_SDK)/include
 ifneq ($(BUILD_TARGET),win)
 VBoxSVC_INCS += \
@@ -136 +136 @@
         $(PATH_BIN)/VBoxXPCOM$(VBOX_SUFF_DLL)
 VBoxSVC_LIBS.darwin = \
+        $(LIB_VMM) \
         $(LIB_REM)
 else
@@ -224 +225 @@
         $(PATH_VBoxC) \
         $(PATH_VBoxCOM) \
-        $(PATH_BIN)/sdk/include
+        $(VBOX_PATH_SDK)/include
 ifneq ($(BUILD_TARGET),win)
 VBoxC_INCS          += \
         $(VBOX_XPCOM_INCS)
 endif
+VBoxC_LDFLAGS.darwin = -install_name @executable_path/VBoxC.dylib
 ifdef VBOX_USE_VCC80
 VBoxC_LDFLAGS.win = /MANIFEST
@@ -307 +309 @@
         $(PATH_BIN)/VBoxXPCOM$(VBOX_SUFF_DLL)
 endif
+VBoxXML_LDFLAGS.darwin = -install_name @executable_path/VBoxXML.dylib -Wl,-x # no debug info please.
 
 ## @todo (dmik): temporarily embed SettingsConverter.xsl into VBoxXML,
@@ -355 +358 @@
         $(PATH_VBoxCOM)/VirtualBox_i.c
 VBoxCOM_INCS = \
-        $(PATH_BIN)/sdk/include
+        $(VBOX_PATH_SDK)/include
 
 
@@ -366 +369 @@
         linux/helpers.cpp
 VBoxXPCOM_INCS = \
-        $(PATH_BIN)/sdk/include \
+        $(VBOX_PATH_SDK)/include \
         include \
         $(VBOX_XPCOM_INCS)
@@ -438 +441 @@
 # Creates the symlinks necessary for making XPCOM work.
 #
-xpcom-components_INST = bin/components/
+xpcom-components_INST = $(INST_BIN)components/
 xpcom-components_SYMLINKS = \
         VBoxC$(SUFF_DLL)=>../VBoxC$(SUFF_DLL) \
@@ -491 +494 @@
 $(IDLFILE): idl/midl.xsl $(XIDLFILE)
         $(call MSG_L1,xsltproc $<,=> $@)
-        $(QUIET)$(MKDIR) -p $(PATH_BIN)/sdk/idl
+        $(QUIET)$(MKDIR) -p $(VBOX_PATH_SDK)/idl
         $(QUIET)$(VBOX_XSLTPROC) -o $@ $^
 
@@ -506 +509 @@
                 /I idl \
                 $(subst /,\\,$<)
-        $(MKDIR) -p $(PATH_BIN)/sdk/include
-        $(CP) $(PATH_VBoxCOM)/VirtualBox.h $(PATH_BIN)/sdk/include
-        $(MKDIR) -p $(PATH_BIN)/sdk/lib
-        $(CP) $(PATH_VBoxCOM)/VirtualBox.tlb $(PATH_BIN)/sdk/lib
-        $(CP) $(PATH_VBoxCOM)/VirtualBox_i.c $(PATH_BIN)/sdk/lib
+        $(MKDIR) -p $(VBOX_PATH_SDK)/include
+        $(CP) $(PATH_VBoxCOM)/VirtualBox.h $(VBOX_PATH_SDK)/include
+        $(MKDIR) -p $(VBOX_PATH_SDK)/lib
+        $(CP) $(PATH_VBoxCOM)/VirtualBox.tlb $(VBOX_PATH_SDK)/lib
+        $(CP) $(PATH_VBoxCOM)/VirtualBox_i.c $(VBOX_PATH_SDK)/lib
 
 endif

trunk/src/VBox/Runtime/Makefile

@@ -445 +445 @@
 VBoxRT_TEMPLATE                = VBOXR3
 VBoxRT_SDKS.win                = WINPSDK W2K3DDK VBOX_NTDLL
+ifeq ($(BUILD_TARGET),darwin)
+VBoxRT_INST                    = $(INST_DLL) $(INST_TESTCASE)
+endif
 VBoxRT_DEFS                    = $(RuntimeR3_DEFS) IN_SUP_R3 IN_SUP_R3
 VBoxRT_DEFS.$(BUILD_TYPE)      = $(RuntimeR3_DEFS.$(BUILD_TYPE))
@@ -466 +469 @@
 VBoxRT_LIBPATH.freebsd         = \
         /usr/local/lib
-VBoxRT_LDFLAGS.darwin          = -framework IOKit
+VBoxRT_LDFLAGS.darwin          = -framework IOKit -install_name @executable_path/VBoxRT.dylib
 ifdef VBOX_USE_VCC80
 VBoxRT_LDFLAGS.win             = /MANIFEST
@@ -482 +485 @@
         $(PATH_LIB)/VBox-uuid$(VBOX_SUFF_LIB) \
         $(PATH_LIB)/RuntimeR3L4$(VBOX_SUFF_LIB)
+
 
 #

trunk/src/VBox/VMM/Makefile

@@ -191 +191 @@
 VMMGC_LIBS     += \
         $(PATH_LIB)/VMMGCBuiltin$(VBOX_SUFF_LIB)
-endif   
+endif
 ifeq ($(VBOX_LDR_FMT32),pe)
 VMMGC_LDFLAGS   = -Entry:VMMGCEntry
@@ -347 +347 @@
 VBoxVMM_LDFLAGS.win = /DELAYLOAD:dbghelp.dll
 VBoxVMM_LDFLAGS.linux = -Wl,--no-undefined
+VBoxVMM_LDFLAGS.darwin = -install_name @executable_path/VBoxVMM.dylib
 
 include $(PATH_KBUILD)/footer.kmk

trunk/src/libs/xpcom18a4/Makefile.kmk

@@ -77 +77 @@
                                      ipc/ipcd/extensions/dconnect/src \
                                      ipc/ipcd/extensions/transmngr/common \
-                                     $(PATH_BIN)/sdk/include \
-                                     $(PATH_BIN)/sdk/include/xpcom \
-                                     $(PATH_BIN)/sdk/include/xpcom/nsprpub \
-                                     $(PATH_BIN)/sdk/include/xpcom/string \
-                                     $(PATH_BIN)/sdk/include/xpcom/xpcom \
-                                     $(PATH_BIN)/sdk/include/xpcom/ipcd
+                                     $(VBOX_PATH_SDK)/include \
+                                     $(VBOX_PATH_SDK)/include/xpcom \
+                                     $(VBOX_PATH_SDK)/include/xpcom/nsprpub \
+                                     $(VBOX_PATH_SDK)/include/xpcom/string \
+                                     $(VBOX_PATH_SDK)/include/xpcom/xpcom \
+                                     $(VBOX_PATH_SDK)/include/xpcom/ipcd
 TEMPLATE_XPCOM_INCS.darwin         = /Developer/SDKs/MacOSX10.4u.sdk/Developer/Headers/FlatCarbon
 TEMPLATE_XPCOM_INCS.l4             = $(L4_INCDIR) $(VBOX_L4_GCC3_INCS)
@@ -99 +99 @@
 TEMPLATE_XPCOMEXE_EXTENDS          = XPCOM
 ## @todo undo -fPIC.
-TEMPLATE_XPCOMEXE_INCS             = $(PATH_TARGET) ipc/ipcd/shared/src \
-                                     $(PATH_BIN)/sdk/include \
-                                     $(PATH_BIN)/sdk/include/xpcom \
-                                     $(PATH_BIN)/sdk/include/xpcom/nsprpub \
-                                     $(PATH_BIN)/sdk/include/xpcom/string \
-                                     $(PATH_BIN)/sdk/include/xpcom/xpcom \
-                                     $(PATH_BIN)/sdk/include/xpcom/ipcd
+TEMPLATE_XPCOMEXE_INCS             = $(PATH_TARGET) \
+                                     ipc/ipcd/shared/src \
+                                     $(VBOX_PATH_SDK)/include \
+                                     $(VBOX_PATH_SDK)/include/xpcom \
+                                     $(VBOX_PATH_SDK)/include/xpcom/nsprpub \
+                                     $(VBOX_PATH_SDK)/include/xpcom/string \
+                                     $(VBOX_PATH_SDK)/include/xpcom/xpcom \
+                                     $(VBOX_PATH_SDK)/include/xpcom/ipcd
 TEMPLATE_XPCOMEXE_LIBS             = \
         $(TARGET_VBox-xpcom-ipcshared) \
@@ -138 +139 @@
 TEMPLATE_XPCOMBLDPROG_CFLAGS.release    = -O
 TEMPLATE_XPCOMBLDPROG_CFLAGS.profile    = -O
-TEMPLATE_XPCOMBLDPROG_INCS              = $(PATH_BIN)/sdk/include \
-                                          $(PATH_BIN)/sdk/include/xpcom \
-                                          $(PATH_BIN)/sdk/include/xpcom/nsprpub \
-                                          $(PATH_BIN)/sdk/include/xpcom/string \
-                                          $(PATH_BIN)/sdk/include/xpcom/xpcom \
-                                          $(PATH_BIN)/sdk/include/xpcom/ipcd
+TEMPLATE_XPCOMBLDPROG_INCS              = $(VBOX_PATH_SDK)/include \
+                                          $(VBOX_PATH_SDK)/include/xpcom \
+                                          $(VBOX_PATH_SDK)/include/xpcom/nsprpub \
+                                          $(VBOX_PATH_SDK)/include/xpcom/string \
+                                          $(VBOX_PATH_SDK)/include/xpcom/xpcom \
+                                          $(VBOX_PATH_SDK)/include/xpcom/ipcd
 TEMPLATE_XPCOMBLDPROG_ORDERDEPS         = $(foreach hdrinst, $(filter %-HEADERS, $(INSTALLS)), $(TARGET_$(hdrinst)))
 
@@ -507 +508 @@
 xpidl_DEFS = EXPORT_XPT_API
 ## @todo This assumes HOST == TARGET.
-xpidl_INST = bin/ $(INST_SDK)/bin/
+xpidl_INST = $(INST_SDK)/bin/
 xpidl_SOURCES = \
         xpcom/typelib/xpidl/xpidl.c \
@@ -953 +954 @@
 #VBoxXPCOM_LIBS += $(LIB_RUNTIME_EF)
 #VBoxXPCOM_LDFLAGS = -Wl,--whole-archive $(VBoxXPCOM_LIBS) -Wl,--no-whole-archive $(LIB_RUNTIME)
+VBoxXPCOM_LDFLAGS.darwin = -install_name @executable_path/VBoxXPCOM.dylib
 
 ifdef VBOX_IPC_RELEASE_LOG
@@ -1021 +1023 @@
         ipc/ipcd/client/src/ipcConnectionUnix.cpp \
         ipc/ipcd/extensions/dconnect/src/ipcDConnectService.cpp
+VBoxXPCOMIPCC_LDFLAGS.darwin = -install_name @executable_path/VBoxXPCOMIPCC.dylib
 VBoxXPCOMIPCC_LIBS = \
         $(TARGET_VBox-xpcom-ipcutils) \
@@ -1195 +1198 @@
 OTHER_CLEAN += \
         $(PATH_VBox-xpcom-string)/idl_ts \
-        $(addprefix $(PATH_BIN)/sdk/include/,$(notdir $(subst .idl,.h,$(IDLFILES)))) \
-        $(addprefix $(PATH_BIN)/sdk/include/,$(notdir $(subst .idl,.xpt,$(IDLFILES)))) \
-        $(addprefix $(PATH_BIN)/sdk/idl/,$(notdir $(IDLFILES)))
+        $(addprefix $(VBOX_PATH_SDK)/include/,$(notdir $(subst .idl,.h,$(IDLFILES)))) \
+        $(addprefix $(VBOX_PATH_SDK)/include/,$(notdir $(subst .idl,.xpt,$(IDLFILES)))) \
+        $(addprefix $(VBOX_PATH_SDK)/idl/,$(notdir $(IDLFILES)))
 
 
@@ -1313 +1316 @@
 XPIDL_INCS = -I xpcom/base/ -I xpcom/ds/ -I xpcom/components/ -I xpcom/io/ -I xpcom/threads/ -I xpcom/reflect/xptinfo/public/
 define def_IDL
-$(addprefix $(PATH_BIN)/sdk/include/,$(notdir $(subst .idl,.h,$(idl)))) \
+$(addprefix $(VBOX_PATH_SDK)/include/,$(notdir $(subst .idl,.h,$(idl)))) \
             $(PATH_TARGET)/$(notdir $(subst .idl,.xpt,$(idl))): $(idl) | $(TARGET_xpidl)
         $$(call MSG_L1,xpidl $$<)
-        $$(QUIET)$(MKDIR) -p $(PATH_BIN)/sdk/include $(PATH_BIN)/sdk/idl
+        $$(QUIET)$(MKDIR) -p $(VBOX_PATH_SDK)/include $(VBOX_PATH_SDK)/idl
         $$(QUIET)$$(TARGET_xpidl) -m header $(XPIDL_INCS) -e $$@ $$<
         $$(QUIET)$$(TARGET_xpidl) -m typelib $(XPIDL_INCS) -e $(addprefix $(PATH_TARGET)/,$(notdir $(subst .idl,.xpt,$(idl)))) $$<
-        $$(QUIET)$(CP) $$< $$(PATH_BIN)/sdk/idl
+        $$(QUIET)$(CP) $$< $$(VBOX_PATH_SDK)/idl
 endef
 
@@ -1325 +1328 @@
 
 # dummy target.
-$(PATH_VBox-xpcom-string)/idl_ts: $(addprefix $(PATH_BIN)/sdk/include/,$(notdir $(subst .idl,.h,$(IDLFILES))))
+$(PATH_VBox-xpcom-string)/idl_ts: $(addprefix $(VBOX_PATH_SDK)/include/,$(notdir $(subst .idl,.h,$(IDLFILES))))
         $(call MSG_L1,IDL processing completed.)
         $(QUIET)$(MKDIR) -p $(dir $@)

trunk/src/libs/xpcom18a4/xpcom/glue/standalone/nsXPCOMGlue.cpp

@@ -111 +111 @@
 
         xpcomLib = PR_LoadLibraryWithFlags(libSpec, PR_LD_LAZY|PR_LD_GLOBAL);
+#ifdef __DARWIN__
+        /* works around bundle problem. */
+        if (!xpcomLib) {
+            const char *home = PR_GetEnv("VBOX_XPCOM_HOME");
+            if (home) {
+                char path[PATH_MAX];
+                snprintf(path, sizeof(path), "%s/%s", home, libSpec.value.pathname);
+                libSpec.value.pathname = path;
+                xpcomLib = PR_LoadLibraryWithFlags(libSpec, PR_LD_LAZY|PR_LD_GLOBAL);
+            }
+        }
+#endif
         if (!xpcomLib)
             return NS_ERROR_FAILURE;
@@ -162 +174 @@
         xpcomLib = nsnull;
     }
-    
+
     memset(&xpcomFunctions, 0, sizeof(xpcomFunctions));
     return NS_OK;
@@ -170 +182 @@
 #ifndef XPCOM_GLUE_NO_DYNAMIC_LOADING
 extern "C" NS_COM nsresult
-NS_InitXPCOM2(nsIServiceManager* *result, 
+NS_InitXPCOM2(nsIServiceManager* *result,
               nsIFile* binDirectory,
               nsIDirectoryServiceProvider* appFileLocationProvider)
@@ -442 +454 @@
       }
   }
-                 
+
 #if XP_WIN32
-  // On windows, the current directory is searched before the 
-  // PATH environment variable.  This is a very bad thing 
+  // On windows, the current directory is searched before the
+  // PATH environment variable.  This is a very bad thing
   // since libraries in the cwd will be picked up before
   // any that are in either the application or GRE directory.
@@ -465 +477 @@
     // Startup the XPCOM Glue that links us up with XPCOM.
     nsresult rv = XPCOMGlueStartup(xpcomLocation);
-    
+
     if (NS_FAILED(rv)) {
         NS_WARNING("gre: XPCOMGlueStartup failed");

trunk/src/recompiler/new/Makefile.kmk

@@ -6 +6 @@
 #
 #   * op.c doesn't compile work correctly with gcc 4. For this we've
-#     checked in op.S, which is the reason why we don't compile op.c 
+#     checked in op.S, which is the reason why we don't compile op.c
 #     directly but always compile via the assembly file.s
 #   * On 64-bit Windows we lack a compiler and have to resort to a
 #     linux cross compiler building an ELF relocatable module which
 #     we then load using a wrapper module. Thus the REM_MOD mess.
-#   * On platforms using the 64-bit GCC ABI, we're not allowed to 
+#   * On platforms using the 64-bit GCC ABI, we're not allowed to
 #     generate non-PIC shared objects, and op.c requires the code
 #     to be non-PIC. We apply the same trick as we developed for
@@ -67 +67 @@
 # L4 must use the no-crt path because it's lacking math stuff it seems...
 # Darwin must use the non-crt path because it can't compile op.c nativly.
-# All the AMD64 target must use the no-crt path because ELF doesn't like op.c 
+# All the AMD64 target must use the no-crt path because ELF doesn't like op.c
 # when stuffed into a shared library and windows doesn't have 64-bit gcc (yet).
 #
@@ -99 +99 @@
         fpu
 dyngen_SOURCES        = dyngen.c
-                                
+
 
 #
@@ -158 +158 @@
         $(LIB_RUNTIME)
   $(REM_MOD)_LIBS.darwin    = \
-        $(PATH_BIN)/VBoxREMImp.dylib
-  $(REM_MOD)_LDFLAGS.darwin = -read_only_relocs suppress
+        $(TARGET_VBoxREMImp)
+#       $(PATH_BIN)/VBoxREMImp.dylib
+  $(REM_MOD)_LDFLAGS.darwin  = -read_only_relocs suppress -multiply_defined warning  #-install_name @executable_path/$(REM_MOD).dylib#
  else
   $(REM_MOD)_LIBS           = \
@@ -182 +183 @@
   $(REM_MOD)_INCS          += $(VBOX_L4_GCC3_INCS) $(L4_INCDIR)
  endif
- 
+
  $(REM_MOD)_DEFS           += IN_RING3 LOG_USE_C99
  #$(REM_MOD)_DEFS          += DEBUG_DISAS DEBUG_PCALL DEBUG_EXEC DEBUG_FLUSH DEBUG_IOPORT DEBUG_SIGNAL DEBUG_TLB_CHECK DEBUG_TB_INVALIDATE DEBUG_TLB  # Enables huge amounts of debug logging.
@@ -189 +190 @@
 
  $(REM_MOD)_LDFLAGS.l4      = -T$(L4_LIBDIR)/../main_rel.ld -nostdlib -Wl,--no-undefined
+ $(REM_MOD)_LDFLAGS.darwin  = -read_only_relocs suppress -install_name @executable_path/$(REM_MOD).dylib -multiple_defined warning
  ifeq ($(BUILD_TARGET_ARCH),amd64)
   $(REM_MOD)_LIBS           = $(FILE_TOOL_GCC3_LIBGCC)
@@ -223 +225 @@
 #
 # The math testcase as a standalone program for testing and debugging purposes.
-# 
+#
 ## @todo This is a bit messy because of MINGW32.
 #BLDPROGS += testmath
@@ -259 +261 @@
         VBoxREMWrapper.cpp \
         VBoxREMWrapperA.asm
+VBoxREM_LDFLAGS.darwin = -install_name @executable_path/VBoxREM.dylib
 VBoxREM_LIBS           = \
         $(LIB_VMM) \
@@ -269 +272 @@
 #
 VBoxREMImp_TEMPLATE         = VBOXR3
+ifeq ($(BUILD_TARGET),darwin)
+VBoxREMImp_INST             = $(INST_LIB)
+endif
 VBoxREMImp_SOURCES.win      = VBoxREM.def
 VBoxREMImp_SOURCES.os2      = $(PATH_TARGET)/VBoxREMOS2.def
@@ -277 +283 @@
 VBoxREMImp_SONAME.linux     = VBoxREM.so
 VBoxREMImp_SONAME.l4        = VBoxREM.s.so
-VBoxREMImp_LDFLAGS.darwin   = -install_name VBoxREM.dylib
+VBoxREMImp_LDFLAGS.darwin   = -install_name @executable_path/VBoxREM.dylib
+#VBoxREMImp_LDFLAGS.darwin   = -install_name VBoxREM.dylib
 VBoxREMImp_LDFLAGS.l4       = -T$(L4_LIBDIR)/../main_rel.ld -nostdlib
 
@@ -301 +308 @@
 # Generate the op.S file somehow...
 #
-# Gathering the flags, defines and include dirs for the command is a lot 
-# of work. Unfortunately, there is only a highly specialized kBuild function 
+# Gathering the flags, defines and include dirs for the command is a lot
+# of work. Unfortunately, there is only a highly specialized kBuild function
 # for doing this, so we're currently left to our own devices here.
 #
-# Add something like VBOX_RECOMPILER_OP_GCC = gcc-3.4.6 to LocalConfig.kmk 
-# to be 100% sure that you get a working op.S. My gcc 4.1.1 seems to work 
+# Add something like VBOX_RECOMPILER_OP_GCC = gcc-3.4.6 to LocalConfig.kmk
+# to be 100% sure that you get a working op.S. My gcc 4.1.1 seems to work
 # fine, so feel free to try VBOX_RECOMPILER_OP_GCC = gcc.
 #
@@ -325 +332 @@
   VBOX_RECOMPILER_OP_GCC_OK := dunno
  endif
-else 
+else
  # If set, assume it's an OK compiler.
  VBOX_RECOMPILER_OP_GCC_OK := yes