VirtualBox

Changeset 1493 in vbox


Ignore:
Timestamp:
Mar 15, 2007 12:38:32 AM (18 years ago)
Author:
vboxsync
Message:

Made VBoxSVCM link on darwin and put the component/ files directly into the directory instead of the symlinking.

Location:
trunk/src
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • TabularUnified trunk/src/VBox/Main/Makefile

    r1474 r1493  
    6161 INSTALLS        = xpcom-components
    6262 IDLFILE         = $(VBOX_PATH_SDK)/idl/VirtualBox_XPCOM.idl
    63  IDLTYPELIB      = $(PATH_BIN)/VirtualBox_XPCOM.xpt
     63 ifeq ($(BUILD_TARGET),linux)
     64  IDLTYPELIB     = $(PATH_BIN)/VirtualBox_XPCOM.xpt
     65 else
     66  IDLTYPELIB     = $(PATH_BIN)/components/VirtualBox_XPCOM.xpt
     67 endif
    6468 IDLHEADER       = $(VBOX_PATH_SDK)/include/VirtualBox_XPCOM.h
    6569 OTHERS          = $(IDLTYPELIB)
     
    204208
    205209VBoxSVCM_TEMPLATE               = VBOXMAIN
     210ifneq ($(BUILD_TARGET),linux)
     211VBoxSVCM_INST                   = $(INST_BIN)components/
     212endif
    206213VBoxSVCM_DEFS                   = IN_RING3 IN_CFGLDR_R3
    207214VBoxSVCM_INCS                   = \
     
    211218VBoxSVCM_SOURCES                = \
    212219        linux/server_module.cpp
     220VBoxSVCM_LIBS                   = \
     221        $(PATH_BIN)/VBoxXPCOM$(VBOX_SUFF_DLL)
     222VBoxSVCM_LDFLAGS.darwin         = -install_name @executable_path/components/VBoxSVCM.dylib
    213223
    214224endif # VBOX_WITH_XPCOM
     
    218228#
    219229VBoxC_TEMPLATE = VBOXMAIN
     230ifneq ($(BUILD_TARGET),linux)
     231VBoxC_INST = $(INST_BIN)components/
     232endif
    220233VBoxC_DEFS = IN_RING3 IN_CFGLDR_R3
    221234VBoxC_DEFS += VBOX_COM_INPROC
     
    244257        $(PATH_VBoxC) \
    245258        $(PATH_VBoxCOM)
    246 VBoxC_LDFLAGS.darwin = -install_name @executable_path/VBoxC.dylib
     259VBoxC_LDFLAGS.darwin = -install_name @executable_path/components/VBoxC.dylib
    247260ifdef VBOX_USE_VCC80
    248261VBoxC_LDFLAGS.win = /MANIFEST
     
    451464# Creates the symlinks necessary for making XPCOM work.
    452465#
     466## @todo Figure out why Linux really needs this, darwin doesn't...
    453467xpcom-components_INST = $(INST_BIN)components/
     468ifeq ($(BUILD_TARGET),linux)
    454469xpcom-components_SYMLINKS = \
     470        VirtualBox_XPCOM.xpt=>../VirtualBox_XPCOM.xpt \
     471        VBoxXPCOMBase.xpt=>../VBoxXPCOMBase.xpt \
    455472        VBoxC$(SUFF_DLL)=>../VBoxC$(SUFF_DLL) \
    456473        VBoxSVCM$(SUFF_DLL)=>../VBoxSVCM$(SUFF_DLL) \
    457         VBoxXPCOMIPCC$(SUFF_DLL)=>../VBoxXPCOMIPCC$(SUFF_DLL) \
    458         VirtualBox_XPCOM.xpt=>../VirtualBox_XPCOM.xpt \
    459         VBoxXPCOMBase.xpt=>../VBoxXPCOMBase.xpt
     474        VBoxXPCOMIPCC$(SUFF_DLL)=>../VBoxXPCOMIPCC$(SUFF_DLL)
     475endif
    460476
    461477
  • TabularUnified trunk/src/libs/xpcom18a4/Makefile.kmk

    r966 r1493  
    225225PROGRAMS += VBoxXPCOMIPCD
    226226
    227 OTHERS = \
    228         $(PATH_BIN)/VBoxXPCOMBase.xpt
    229 
     227ifeq ($(BUILD_TARGET),linux)
     228 XPCOM_TYPELIB = $(PATH_BIN)/VBoxXPCOMBase.xpt
     229else
     230 XPCOM_TYPELIB = $(PATH_BIN)/components/VBoxXPCOMBase.xpt
     231endif
     232OTHERS = $(XPCOM_TYPELIB)
    230233OTHER_CLEAN = \
    231234        $(PATH_TARGET)/VBox-xpcom-nspr/_pr_bld.h \
    232235        $(PATH_TARGET)/VBox-xpcom-nspr/_pl_bld.h \
    233         $(PATH_BIN)/VBoxXPCOMBase.xpt
     236        $(XPCOM_TYPELIB)
    234237
    235238
     
    10161019# DCONNECT client shared object
    10171020VBoxXPCOMIPCC_TEMPLATE = XPCOMIPC
     1021ifneq ($(BUILD_TARGET),linux)
     1022VBoxXPCOMIPCC_INST = $(INST_BIN)components/
     1023endif
    10181024VBoxXPCOMIPCC_DEFS = HAVE_DEPENDENT_LIBS
    10191025VBoxXPCOMIPCC_SOURCES = \
     
    10231029        ipc/ipcd/client/src/ipcConnectionUnix.cpp \
    10241030        ipc/ipcd/extensions/dconnect/src/ipcDConnectService.cpp
    1025 VBoxXPCOMIPCC_LDFLAGS.darwin = -install_name @executable_path/VBoxXPCOMIPCC.dylib
     1031VBoxXPCOMIPCC_LDFLAGS.darwin = -install_name @executable_path/components/VBoxXPCOMIPCC.dylib
    10261032VBoxXPCOMIPCC_LIBS = \
    10271033        $(TARGET_VBox-xpcom-ipcutils) \
     
    12941300
    12951301# combined typelib library
    1296 $(PATH_BIN)/VBoxXPCOMBase.xpt: $(XPTFILES) | $(TARGET_xp_link)
     1302$(XPCOM_TYPELIB): $(XPTFILES) | $(TARGET_xp_link)
    12971303        $(call MSG_L1,Linking $@)
    12981304        $(QUIET)$(TARGET_xpt_link) $@ $^
Note: See TracChangeset for help on using the changeset viewer.

© 2024 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette