Changeset 1493 in vbox
- Timestamp:
- Mar 15, 2007 12:38:32 AM (18 years ago)
- Location:
- trunk/src
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
TabularUnified trunk/src/VBox/Main/Makefile ¶
r1474 r1493 61 61 INSTALLS = xpcom-components 62 62 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 64 68 IDLHEADER = $(VBOX_PATH_SDK)/include/VirtualBox_XPCOM.h 65 69 OTHERS = $(IDLTYPELIB) … … 204 208 205 209 VBoxSVCM_TEMPLATE = VBOXMAIN 210 ifneq ($(BUILD_TARGET),linux) 211 VBoxSVCM_INST = $(INST_BIN)components/ 212 endif 206 213 VBoxSVCM_DEFS = IN_RING3 IN_CFGLDR_R3 207 214 VBoxSVCM_INCS = \ … … 211 218 VBoxSVCM_SOURCES = \ 212 219 linux/server_module.cpp 220 VBoxSVCM_LIBS = \ 221 $(PATH_BIN)/VBoxXPCOM$(VBOX_SUFF_DLL) 222 VBoxSVCM_LDFLAGS.darwin = -install_name @executable_path/components/VBoxSVCM.dylib 213 223 214 224 endif # VBOX_WITH_XPCOM … … 218 228 # 219 229 VBoxC_TEMPLATE = VBOXMAIN 230 ifneq ($(BUILD_TARGET),linux) 231 VBoxC_INST = $(INST_BIN)components/ 232 endif 220 233 VBoxC_DEFS = IN_RING3 IN_CFGLDR_R3 221 234 VBoxC_DEFS += VBOX_COM_INPROC … … 244 257 $(PATH_VBoxC) \ 245 258 $(PATH_VBoxCOM) 246 VBoxC_LDFLAGS.darwin = -install_name @executable_path/ VBoxC.dylib259 VBoxC_LDFLAGS.darwin = -install_name @executable_path/components/VBoxC.dylib 247 260 ifdef VBOX_USE_VCC80 248 261 VBoxC_LDFLAGS.win = /MANIFEST … … 451 464 # Creates the symlinks necessary for making XPCOM work. 452 465 # 466 ## @todo Figure out why Linux really needs this, darwin doesn't... 453 467 xpcom-components_INST = $(INST_BIN)components/ 468 ifeq ($(BUILD_TARGET),linux) 454 469 xpcom-components_SYMLINKS = \ 470 VirtualBox_XPCOM.xpt=>../VirtualBox_XPCOM.xpt \ 471 VBoxXPCOMBase.xpt=>../VBoxXPCOMBase.xpt \ 455 472 VBoxC$(SUFF_DLL)=>../VBoxC$(SUFF_DLL) \ 456 473 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) 475 endif 460 476 461 477 -
TabularUnified trunk/src/libs/xpcom18a4/Makefile.kmk ¶
r966 r1493 225 225 PROGRAMS += VBoxXPCOMIPCD 226 226 227 OTHERS = \ 228 $(PATH_BIN)/VBoxXPCOMBase.xpt 229 227 ifeq ($(BUILD_TARGET),linux) 228 XPCOM_TYPELIB = $(PATH_BIN)/VBoxXPCOMBase.xpt 229 else 230 XPCOM_TYPELIB = $(PATH_BIN)/components/VBoxXPCOMBase.xpt 231 endif 232 OTHERS = $(XPCOM_TYPELIB) 230 233 OTHER_CLEAN = \ 231 234 $(PATH_TARGET)/VBox-xpcom-nspr/_pr_bld.h \ 232 235 $(PATH_TARGET)/VBox-xpcom-nspr/_pl_bld.h \ 233 $( PATH_BIN)/VBoxXPCOMBase.xpt236 $(XPCOM_TYPELIB) 234 237 235 238 … … 1016 1019 # DCONNECT client shared object 1017 1020 VBoxXPCOMIPCC_TEMPLATE = XPCOMIPC 1021 ifneq ($(BUILD_TARGET),linux) 1022 VBoxXPCOMIPCC_INST = $(INST_BIN)components/ 1023 endif 1018 1024 VBoxXPCOMIPCC_DEFS = HAVE_DEPENDENT_LIBS 1019 1025 VBoxXPCOMIPCC_SOURCES = \ … … 1023 1029 ipc/ipcd/client/src/ipcConnectionUnix.cpp \ 1024 1030 ipc/ipcd/extensions/dconnect/src/ipcDConnectService.cpp 1025 VBoxXPCOMIPCC_LDFLAGS.darwin = -install_name @executable_path/ VBoxXPCOMIPCC.dylib1031 VBoxXPCOMIPCC_LDFLAGS.darwin = -install_name @executable_path/components/VBoxXPCOMIPCC.dylib 1026 1032 VBoxXPCOMIPCC_LIBS = \ 1027 1033 $(TARGET_VBox-xpcom-ipcutils) \ … … 1294 1300 1295 1301 # combined typelib library 1296 $( PATH_BIN)/VBoxXPCOMBase.xpt: $(XPTFILES) | $(TARGET_xp_link)1302 $(XPCOM_TYPELIB): $(XPTFILES) | $(TARGET_xp_link) 1297 1303 $(call MSG_L1,Linking $@) 1298 1304 $(QUIET)$(TARGET_xpt_link) $@ $^
Note:
See TracChangeset
for help on using the changeset viewer.