Changeset 38082 in vbox for trunk/src/VBox/Runtime
- Timestamp:
- Jul 20, 2011 2:26:24 PM (14 years ago)
- svn:sync-xref-src-repo-rev:
- 73029
- Location:
- trunk/src/VBox/Runtime
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/Runtime/Makefile.kmk
r38037 r38082 1262 1262 VBoxRT_INCS.$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH) = $(RuntimeR3_INCS.$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)) 1263 1263 VBoxRT_LIBS = \ 1264 $(PATH_ LIB)/VBox-liblzf$(VBOX_SUFF_LIB) \1264 $(PATH_STAGE_LIB)/VBox-liblzf$(VBOX_SUFF_LIB) \ 1265 1265 $(SDK_VBOX_ZLIB_LIBS) 1266 1266 if1of ($(KBUILD_TARGET_ARCH), amd64 x86) 1267 1267 VBoxRT_LIBS += \ 1268 $(PATH_ LIB)/SUPR3$(VBOX_SUFF_LIB)1268 $(PATH_STAGE_LIB)/SUPR3$(VBOX_SUFF_LIB) 1269 1269 endif 1270 1270 ifdef IPRT_WITH_KSTUFF 1271 1271 VBoxRT_LIBS += \ 1272 $(PATH_ LIB)/VBox-kStuff$(VBOX_SUFF_LIB)1272 $(PATH_STAGE_LIB)/VBox-kStuff$(VBOX_SUFF_LIB) 1273 1273 endif 1274 1274 ifndef SDK_VBOX_LIBXML2_LIBS 1275 1275 VBoxRT_LIBS += \ 1276 $(PATH_ LIB)/VBox-libxml2$(VBOX_SUFF_LIB)1276 $(PATH_STAGE_LIB)/VBox-libxml2$(VBOX_SUFF_LIB) 1277 1277 endif 1278 1278 ifndef SDK_VBOX_OPENSSL_LIBS 1279 1279 VBoxRT_LIBS += \ 1280 $(PATH_ LIB)/VBox-libcrypto$(VBOX_SUFF_LIB) \1281 $(PATH_ LIB)/VBox-libssl$(VBOX_SUFF_LIB)1280 $(PATH_STAGE_LIB)/VBox-libcrypto$(VBOX_SUFF_LIB) \ 1281 $(PATH_STAGE_LIB)/VBox-libssl$(VBOX_SUFF_LIB) 1282 1282 endif 1283 1283 ifdef IPRT_WITH_LZO … … 1307 1307 VBoxRT_LDFLAGS.l4 = \ 1308 1308 -Wl,-whole-archive \ 1309 $(PATH_ LIB)/RuntimeR3L4$(VBOX_SUFF_LIB) \1309 $(PATH_STAGE_LIB)/RuntimeR3L4$(VBOX_SUFF_LIB) \ 1310 1310 -Wl,-no-whole-archive 1311 1311 ifeq ($(KBUILD_TARGET),l4) … … 1315 1315 endif 1316 1316 VBoxRT_LIBS.l4 = \ 1317 $(PATH_ LIB)/RuntimeR3L4$(VBOX_SUFF_LIB)1317 $(PATH_STAGE_LIB)/RuntimeR3L4$(VBOX_SUFF_LIB) 1318 1318 1319 1319 if1of ($(DLLS), VBoxRT) … … 1339 1339 VBoxRTDummy_TEMPLATE = VBOXR3 1340 1340 VBoxRTDummy_NOINST = true 1341 VBoxRTDummy_LIBS = $(PATH_ BIN)/VBoxRT.so1342 VBoxRTDummy_CLEAN= $(PATH_ BIN)/VBoxRT.so1343 BLDDIRS += $(PATH_ BIN)1344 1345 $(PATH_ BIN)/VBoxRT.so: $$(VBoxRT_1_TARGET) | $$(dir $$@)1341 VBoxRTDummy_LIBS = $(PATH_STAGE_BIN)/VBoxRT.so 1342 VBoxRTDummy_CLEAN= $(PATH_STAGE_BIN)/VBoxRT.so 1343 BLDDIRS += $(PATH_STAGE_BIN) 1344 1345 $(PATH_STAGE_BIN)/VBoxRT.so: $$(VBoxRT_1_TARGET) | $$(dir $$@) 1346 1346 $(INSTALL) $< $@ 1347 1347 chcon -t texrel_shlib_t $@ || true -
trunk/src/VBox/Runtime/testcase/Makefile.kmk
r37720 r38082 279 279 tstLdr-2_DEFS = IN_DIS 280 280 tstLdr-2_LIBS = \ 281 $(PATH_ LIB)/DisasmR3$(VBOX_SUFF_LIB)281 $(PATH_STAGE_LIB)/DisasmR3$(VBOX_SUFF_LIB) 282 282 283 283 ifdef VBOX_WITH_RAW_MODE … … 291 291 endif 292 292 tstLdrObj_LIBS = \ 293 $(PATH_ LIB)/DisasmRC$(VBOX_SUFF_LIB) \294 $(PATH_ LIB)/RuntimeRC$(VBOX_SUFF_LIB)293 $(PATH_STAGE_LIB)/DisasmRC$(VBOX_SUFF_LIB) \ 294 $(PATH_STAGE_LIB)/RuntimeRC$(VBOX_SUFF_LIB) 295 295 ifeq ($(VBOX_LDR_FMT32),pe) 296 296 tstLdrObj_LIBS += \ 297 $(PATH_ LIB)/VMMRCBuiltin$(VBOX_SUFF_LIB)297 $(PATH_STAGE_LIB)/VMMRCBuiltin$(VBOX_SUFF_LIB) 298 298 endif # PE 299 299 ifeq ($(VBOX_LDR_FMT32),elf) … … 302 302 ifeq ($(VBOX_LDR_FMT32),lx) 303 303 tstLdrObj_LIBS += \ 304 $(PATH_ LIB)/VMMRCBuiltin$(VBOX_SUFF_LIB)304 $(PATH_STAGE_LIB)/VMMRCBuiltin$(VBOX_SUFF_LIB) 305 305 endif 306 306 endif # VBOX_WITH_RAW_MODE … … 309 309 tstLdr-3_DEFS = IN_DIS 310 310 tstLdr-3_LIBS = \ 311 $(PATH_ LIB)/DisasmR3$(VBOX_SUFF_LIB)311 $(PATH_STAGE_LIB)/DisasmR3$(VBOX_SUFF_LIB) 312 312 313 313 tstLdr-4Imp_TEMPLATE = VBoxR0 … … 330 330 endif 331 331 tstLdrObjR0_LIBS = \ 332 $(PATH_ LIB)/DisasmR0$(VBOX_SUFF_LIB) \333 $(PATH_ LIB)/RuntimeR0$(VBOX_SUFF_LIB)332 $(PATH_STAGE_LIB)/DisasmR0$(VBOX_SUFF_LIB) \ 333 $(PATH_STAGE_LIB)/RuntimeR0$(VBOX_SUFF_LIB) 334 334 ifeq ($(VBOX_LDR_FMT),pe) 335 335 tstLdrObjR0_LIBS += \ 336 $(PATH_ LIB)/SUPR0$(VBOX_SUFF_LIB) \336 $(PATH_STAGE_LIB)/SUPR0$(VBOX_SUFF_LIB) \ 337 337 $(TARGET_tstLdr-4Imp) 338 338 endif … … 342 342 ifeq ($(VBOX_LDR_FMT),lx) 343 343 tstLdrObjR0_LIBS += \ 344 $(PATH_ LIB)/SUPR0$(VBOX_SUFF_LIB) \344 $(PATH_STAGE_LIB)/SUPR0$(VBOX_SUFF_LIB) \ 345 345 $(TARGET_tstLdr-4Imp) 346 346 endif … … 349 349 tstLdr-4_DEFS = IN_DIS 350 350 tstLdr-4_LIBS = \ 351 $(PATH_ LIB)/DisasmR3$(VBOX_SUFF_LIB)351 $(PATH_STAGE_LIB)/DisasmR3$(VBOX_SUFF_LIB) 352 352 353 353 tstLdrLoad_SOURCES = tstLdrLoad.cpp … … 528 528 tstRTR0MemUserKernel_SYSSUFF = .r0 529 529 tstRTR0MemUserKernel_SOURCES = tstRTR0MemUserKernel.cpp 530 tstRTR0MemUserKernel_LIBS = $(PATH_ LIB)/RuntimeR0$(VBOX_SUFF_LIB)530 tstRTR0MemUserKernel_LIBS = $(PATH_STAGE_LIB)/RuntimeR0$(VBOX_SUFF_LIB) 531 531 if1of ($(VBOX_LDR_FMT), pe lx) 532 tstRTR0MemUserKernel_LIBS += $(PATH_ LIB)/SUPR0$(VBOX_SUFF_LIB)532 tstRTR0MemUserKernel_LIBS += $(PATH_STAGE_LIB)/SUPR0$(VBOX_SUFF_LIB) 533 533 endif 534 534 tstRTR0MemUserKernelDriver_TEMPLATE = VBOXR3TSTEXE … … 541 541 tstRTR0SemMutex_SYSSUFF = .r0 542 542 tstRTR0SemMutex_SOURCES = tstRTR0SemMutex.cpp 543 tstRTR0SemMutex_LIBS = $(PATH_ LIB)/RuntimeR0$(VBOX_SUFF_LIB)543 tstRTR0SemMutex_LIBS = $(PATH_STAGE_LIB)/RuntimeR0$(VBOX_SUFF_LIB) 544 544 if1of ($(VBOX_LDR_FMT), pe lx) 545 tstRTR0SemMutex_LIBS += $(PATH_ LIB)/SUPR0$(VBOX_SUFF_LIB)545 tstRTR0SemMutex_LIBS += $(PATH_STAGE_LIB)/SUPR0$(VBOX_SUFF_LIB) 546 546 endif 547 547 tstRTR0SemMutexDriver_TEMPLATE = VBOXR3TSTEXE … … 554 554 tstRTR0Timer_SYSSUFF = .r0 555 555 tstRTR0Timer_SOURCES = tstRTR0Timer.cpp 556 tstRTR0Timer_LIBS = $(PATH_ LIB)/RuntimeR0$(VBOX_SUFF_LIB)556 tstRTR0Timer_LIBS = $(PATH_STAGE_LIB)/RuntimeR0$(VBOX_SUFF_LIB) 557 557 if1of ($(VBOX_LDR_FMT), pe lx) 558 tstRTR0Timer_LIBS += $(PATH_ LIB)/SUPR0$(VBOX_SUFF_LIB)558 tstRTR0Timer_LIBS += $(PATH_STAGE_LIB)/SUPR0$(VBOX_SUFF_LIB) 559 559 endif 560 560 tstRTR0TimerDriver_TEMPLATE = VBOXR3TSTEXE … … 567 567 tstR0ThreadPreemption_SYSSUFF = .r0 568 568 tstR0ThreadPreemption_SOURCES = tstR0ThreadPreemption.cpp 569 tstR0ThreadPreemption_LIBS = $(PATH_ LIB)/RuntimeR0$(VBOX_SUFF_LIB)569 tstR0ThreadPreemption_LIBS = $(PATH_STAGE_LIB)/RuntimeR0$(VBOX_SUFF_LIB) 570 570 if1of ($(VBOX_LDR_FMT), pe lx) 571 tstR0ThreadPreemption_LIBS += $(PATH_ LIB)/SUPR0$(VBOX_SUFF_LIB)571 tstR0ThreadPreemption_LIBS += $(PATH_STAGE_LIB)/SUPR0$(VBOX_SUFF_LIB) 572 572 endif 573 573 tstR0ThreadPreemptionDriver_TEMPLATE = VBOXR3TSTEXE
Note:
See TracChangeset
for help on using the changeset viewer.