Changeset 960 in vbox for trunk/src/VBox/Main

Timestamp:

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

Author:

vboxsync

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

18727

Message:

Darwin hacking.

File:

• trunk/src/VBox/Main/Makefile (modified) (11 diffs)

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