From 738b01d37a24b45ea7d46c9aa9ff74ef818c997f Mon Sep 17 00:00:00 2001 From: Adrian-Ken Rueegsegger Date: Tue, 23 Jun 2015 14:06:09 +0200 Subject: [PATCH] vbox: Move pgm to virtualbox-hwaccl library Issue #2016 --- repos/ports/lib/mk/spec/nova/virtualbox-hwaccl.mk | 3 ++- repos/ports/lib/mk/virtualbox-hwaccl-off.inc | 4 +++- repos/ports/src/virtualbox/target.mk | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/repos/ports/lib/mk/spec/nova/virtualbox-hwaccl.mk b/repos/ports/lib/mk/spec/nova/virtualbox-hwaccl.mk index 36edf44c7b..137ae7db11 100644 --- a/repos/ports/lib/mk/spec/nova/virtualbox-hwaccl.mk +++ b/repos/ports/lib/mk/spec/nova/virtualbox-hwaccl.mk @@ -1,6 +1,6 @@ include $(REP_DIR)/lib/mk/virtualbox-common.inc -SRC_CC = sup.cc +SRC_CC = sup.cc pgm.cc INC_DIR += $(call select_from_repositories,src/lib/libc) INC_DIR += $(call select_from_repositories,src/lib/pthread) @@ -8,4 +8,5 @@ INC_DIR += $(call select_from_repositories,src/lib/pthread) INC_DIR += $(VBOX_DIR)/VMM/include INC_DIR += $(REP_DIR)/src/virtualbox +vpath pgm.cc $(REP_DIR)/src/virtualbox/ vpath sup.cc $(REP_DIR)/src/virtualbox/spec/nova/ diff --git a/repos/ports/lib/mk/virtualbox-hwaccl-off.inc b/repos/ports/lib/mk/virtualbox-hwaccl-off.inc index 087fd10da4..c475a924e3 100644 --- a/repos/ports/lib/mk/virtualbox-hwaccl-off.inc +++ b/repos/ports/lib/mk/virtualbox-hwaccl-off.inc @@ -1,8 +1,10 @@ include $(REP_DIR)/lib/mk/virtualbox-common.inc -SRC_CC = sup.cc +SRC_CC = pgm.cc sup.cc INC_DIR += $(call select_from_repositories,src/lib/libc) +INC_DIR += $(VBOX_DIR)/VMM/include INC_DIR += $(REP_DIR)/src/virtualbox +vpath pgm.cc $(REP_DIR)/src/virtualbox/ vpath sup.cc $(REP_DIR)/src/virtualbox/accloff/ diff --git a/repos/ports/src/virtualbox/target.mk b/repos/ports/src/virtualbox/target.mk index 28d5dc6f0a..fd9d2ffe8b 100644 --- a/repos/ports/src/virtualbox/target.mk +++ b/repos/ports/src/virtualbox/target.mk @@ -11,7 +11,7 @@ SRC_CC = frontend/main.cc frontend/console.cc \ frontend/VBoxAPIWrap/TokenWrap.cpp \ frontend/VirtualBoxErrorInfoImpl.cpp \ devices.cc drivers.cc dummies.cc libc.cc \ - logger.cc mm.cc pdm.cc pgm.cc rt.cc sup.cc iommio.cc ioport.cc \ + logger.cc mm.cc pdm.cc rt.cc sup.cc iommio.cc ioport.cc \ hm.cc thread.cc dynlib.cc unimpl.cc LIBS += base