Changeset 98416 in vbox for trunk/src/VBox/Additions/common
- Timestamp:
- Feb 1, 2023 4:25:17 PM (2 years ago)
- svn:sync-xref-src-repo-rev:
- 155660
- Location:
- trunk/src/VBox/Additions/common
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/Additions/common/VBoxControl/testcase/Makefile.kmk
r98169 r98416 31 31 if defined(VBOX_WITH_TESTCASES) && !defined(VBOX_ONLY_ADDITIONS) 32 32 33 #34 # Dummy CLI testcase.35 #36 PROGRAMS += tstVBoxControl37 tstVBoxControl_TEMPLATE = VBoxR3TstExe38 tstVBoxControl_DEFS= VBOX_CONTROL_TEST39 tstVBoxControl_SOURCES= tstVBoxControl.cpp ../VBoxControl.cpp40 tstVBoxControl_LIBS= $(LIB_RUNTIME)41 tstVBoxControl_DEFS+= \42 $(if $(VBOX_WITH_GUEST_PROPS),VBOX_WITH_GUEST_PROPS VBOX_WITH_HGCM,)33 # 34 # Dummy CLI testcase. 35 # 36 PROGRAMS += tstVBoxControl 37 tstVBoxControl_TEMPLATE = VBoxR3TstExe 38 tstVBoxControl_DEFS = VBOX_CONTROL_TEST 39 tstVBoxControl_SOURCES = tstVBoxControl.cpp ../VBoxControl.cpp 40 tstVBoxControl_LIBS = $(LIB_RUNTIME) 41 tstVBoxControl_DEFS += \ 42 $(if $(VBOX_WITH_GUEST_PROPS),VBOX_WITH_GUEST_PROPS VBOX_WITH_HGCM,) 43 43 44 44 endif # VBOX_WITH_TESTCASES -
trunk/src/VBox/Additions/common/VBoxGuest/Makefile.kmk
r98126 r98416 72 72 #VBoxGuest_DEFS.win += LOG_ENABLED LOG_TO_BACKDOOR 73 73 VBoxGuest_DEFS.win += \ 74 $(if $(VBOX_WITH_DPC_LATENCY_CHECKER),VBOX_WITH_DPC_LATENCY_CHECKER,)74 $(if $(VBOX_WITH_DPC_LATENCY_CHECKER),VBOX_WITH_DPC_LATENCY_CHECKER,) 75 75 VBoxGuest_DEPS.solaris += $(VBOX_SVN_REV_KMK) 76 76 VBoxGuest_DEPS.haiku += $(VBOX_SVN_REV_HEADER) … … 128 128 win/VBoxGuest.rc 129 129 VBoxGuest_SOURCES.win.x86 += \ 130 131 132 133 130 ../../../Runtime/common/string/strcmp.asm \ 131 ../../../Runtime/common/string/strchr.asm \ 132 ../../../Runtime/r0drv/nt/nt3fakes-r0drv-nt.cpp \ 133 ../../../Runtime/r0drv/nt/nt3fakesA-r0drv-nt.asm 134 134 VBoxGuest_LIBS += \ 135 135 $(VBOX_LIB_VBGL_R0BASE) \ … … 152 152 # The library order is crucial, so a bit of trickery is necessary. 153 153 # A library is used to make sure that VBoxGuestA-os2.asm is first in the link. (temporary hack?) 154 VBoxGuest_SOURCES= \154 VBoxGuest_SOURCES = \ 155 155 VBoxGuestA-os2.asm 156 156 ifdef VBOX_USE_WATCOM_FOR_OS2 157 VBoxGuest_LIBS= \158 $(VBoxGuestLibOs2Hack_1_TARGET) \159 $(VBOX_LIB_VBGL_R0BASE) \160 $(VBOX_LIB_IPRT_GUEST_R0) \161 $(PATH_IGCC)/lib/libend.lib157 VBoxGuest_LIBS = \ 158 $(VBoxGuestLibOs2Hack_1_TARGET) \ 159 $(VBOX_LIB_VBGL_R0BASE) \ 160 $(VBOX_LIB_IPRT_GUEST_R0) \ 161 $(PATH_IGCC)/lib/libend.lib 162 162 else 163 VBoxGuest_SOURCES+= \164 VBoxGuest-os2.def165 #VBoxGuest_LDFLAGS = -s -t -v166 VBoxGuest_LIBS= \167 $(VBoxGuestLibOs2Hack_1_TARGET) \168 $(VBOX_LIB_VBGL_R0BASE) \169 $(VBOX_LIB_IPRT_GUEST_R0) \170 $(VBOX_GCC_LIBGCC) \171 end163 VBoxGuest_SOURCES += \ 164 VBoxGuest-os2.def 165 #VBoxGuest_LDFLAGS = -s -t -v 166 VBoxGuest_LIBS = \ 167 $(VBoxGuestLibOs2Hack_1_TARGET) \ 168 $(VBOX_LIB_VBGL_R0BASE) \ 169 $(VBOX_LIB_IPRT_GUEST_R0) \ 170 $(VBOX_GCC_LIBGCC) \ 171 end 172 172 endif 173 ## When debugging init with kDrvTest:174 #VBoxGuest_NAME = VBoxGst175 176 # See above.177 LIBRARIES += VBoxGuestLibOs2Hack178 VBoxGuestLibOs2Hack_TEMPLATE = VBoxGuestR0DrvLib179 VBoxGuestLibOs2Hack_INSTTYPE = none180 VBoxGuestLibOs2Hack_DEFS = $(VBoxGuest_DEFS)181 VBoxGuestLibOs2Hack_INCS = \182 . \183 $(PATH_ROOT)/src/VBox/Runtime/include # for the os2ddk184 VBoxGuestLibOs2Hack_SOURCES = \185 VBoxGuest-os2.cpp \186 VBoxGuest.cpp173 ## When debugging init with kDrvTest: 174 #VBoxGuest_NAME = VBoxGst 175 176 # See above. 177 LIBRARIES += VBoxGuestLibOs2Hack 178 VBoxGuestLibOs2Hack_TEMPLATE = VBoxGuestR0DrvLib 179 VBoxGuestLibOs2Hack_INSTTYPE = none 180 VBoxGuestLibOs2Hack_DEFS = $(VBoxGuest_DEFS) 181 VBoxGuestLibOs2Hack_INCS = \ 182 . \ 183 $(PATH_ROOT)/src/VBox/Runtime/include # for the os2ddk 184 VBoxGuestLibOs2Hack_SOURCES = \ 185 VBoxGuest-os2.cpp \ 186 VBoxGuest.cpp 187 187 endif # OS/2 188 188 … … 199 199 VBoxGuest.kext_BLDDIRS = $(VBoxGuest.kext_0_OUTDIR)/Contents/ 200 200 201 $$(VBoxGuest.kext_0_OUTDIR)/Contents/Info.plist: \202 $(PATH_SUB_CURRENT)/darwin/Info.plist \203 $(VBOX_VERSION_MK) | $$(dir $$@)201 $$(VBoxGuest.kext_0_OUTDIR)/Contents/Info.plist: \ 202 $(PATH_SUB_CURRENT)/darwin/Info.plist \ 203 $(VBOX_VERSION_MK) | $$(dir $$@) 204 204 $(call MSG_GENERATE,VBoxGuest,$@,$<) 205 205 $(QUIET)$(RM) -f $@ … … 215 215 $< 216 216 217 $(evalcall2 VBOX_TEST_SIGN_KEXT,VBoxGuest)217 $(evalcall2 VBOX_TEST_SIGN_KEXT,VBoxGuest) 218 218 endif # darwin 219 219 … … 244 244 # Build test for the Guest Additions kernel module (kmk check). 245 245 # 246 $(evalcall2 VBOX_LINUX_KMOD_TEST_BUILD_RULE_FN,vboxguest-src,,save_symvers)246 $(evalcall2 VBOX_LINUX_KMOD_TEST_BUILD_RULE_FN,vboxguest-src,,save_symvers) 247 247 endif # Linux 248 248 -
trunk/src/VBox/Additions/common/VBoxGuest/lib/Makefile.kmk
r98214 r98416 53 53 ifndef VBOX_ONLY_VALIDATIONKIT 54 54 if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd) 55 ifndef VBOX_USE_SYSTEM_XORG_HEADERS56 LIBRARIES += \57 VBoxGuestR3LibXFree8658 endif55 ifndef VBOX_USE_SYSTEM_XORG_HEADERS 56 LIBRARIES += \ 57 VBoxGuestR3LibXFree86 58 endif 59 59 endif 60 60 if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd solaris) … … 82 82 VBoxGuestR0LibHGCM.cpp \ 83 83 VbglR0CanUsePhysPageList.cpp \ 84 84 \ 85 85 VBoxGuestR0LibIdc.cpp \ 86 86 VBoxGuestR0LibSharedFolders.c \ … … 140 140 VBoxGuestR3LibStat.cpp \ 141 141 VBoxGuestR3LibTime.cpp \ 142 143 144 145 146 147 142 VBoxGuestR3LibModule.cpp \ 143 VBoxGuestR3LibPidFile.cpp \ 144 VBoxGuestR3LibVrdp.cpp \ 145 VBoxGuestR3LibMouse.cpp \ 146 VBoxGuestR3LibSeamless.cpp \ 147 VBoxGuestR3LibVideo.cpp 148 148 ifneq ($(KBUILD_TARGET),win) 149 149 VBoxGuestR3Lib_SOURCES += \ … … 158 158 VBoxGuestR3Lib_DEFS += VBOX_WITH_SHARED_CLIPBOARD_GUEST 159 159 VBoxGuestR3Lib_SOURCES += \ 160 VBoxGuestR3LibClipboard.cpp160 VBoxGuestR3LibClipboard.cpp 161 161 ifdef VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS 162 VBoxGuestR3Lib_SOURCES+= \163 $(PATH_ROOT)/src/VBox/GuestHost/SharedClipboard/ClipboardMIME.cpp162 VBoxGuestR3Lib_SOURCES += \ 163 $(PATH_ROOT)/src/VBox/GuestHost/SharedClipboard/ClipboardMIME.cpp 164 164 endif 165 165 endif … … 174 174 ifdef VBOX_WITH_DRAG_AND_DROP 175 175 VBoxGuestR3Lib_DEFS += \ 176 177 176 VBOX_WITH_DRAG_AND_DROP \ 177 $(if $(VBOX_WITH_DRAG_AND_DROP_GH),VBOX_WITH_DRAG_AND_DROP_GH,) 178 178 VBoxGuestR3Lib_SOURCES += \ 179 179 VBoxGuestR3LibDragAndDrop.cpp … … 229 229 VBoxGuestR3LibRuntimeXF86.cpp 230 230 VBoxGuestR3LibXFree86_INCS = \ 231 232 233 231 $(VBOX_PATH_X11_ROOT)/XFree86-4.3/Xserver \ 232 $(VBOX_PATH_X11_ROOT)/XFree86-4.3 \ 233 $(VBOX_PATH_X11_ROOT)/XFree86-4.3/X11 234 234 235 235 # -
trunk/src/VBox/Additions/common/VBoxGuest/lib/testcase/Makefile.kmk
r98169 r98416 39 39 if defined(VBOX_WITH_TESTCASES) && !defined(VBOX_ONLY_BUILD) 40 40 41 #42 # Testcase for the physical heap.43 #44 PROGRAMS += tstVbglR0PhysHeap-145 tstVbglR0PhysHeap-1_TEMPLATE = VBoxR3TstExe46 tstVbglR0PhysHeap-1_SOURCES= \47 tstVbglR0PhysHeap-1.cpp41 # 42 # Testcase for the physical heap. 43 # 44 PROGRAMS += tstVbglR0PhysHeap-1 45 tstVbglR0PhysHeap-1_TEMPLATE = VBoxR3TstExe 46 tstVbglR0PhysHeap-1_SOURCES = \ 47 tstVbglR0PhysHeap-1.cpp 48 48 49 49 -
trunk/src/VBox/Additions/common/VBoxService/Makefile.kmk
r98195 r98416 55 55 if1of ($(KBUILD_TARGET), linux) 56 56 # CPU hotplugging. 57 VBOX_WITH_VBOXSERVICE_CPUHOTPLUG:= 157 VBOX_WITH_VBOXSERVICE_CPUHOTPLUG := 1 58 58 endif 59 59 60 60 # Page Sharing (Page Fusion). 61 61 if1of ($(KBUILD_TARGET), win) 62 VBOX_WITH_VBOXSERVICE_PAGE_SHARING:= 162 VBOX_WITH_VBOXSERVICE_PAGE_SHARING := 1 63 63 endif 64 64 65 65 ifdef VBOX_WITH_GUEST_PROPS 66 VBOX_WITH_VBOXSERVICE_VMINFO:= 166 VBOX_WITH_VBOXSERVICE_VMINFO := 1 67 67 endif 68 68 69 69 # Guest Control. 70 70 ifdef VBOX_WITH_GUEST_CONTROL 71 VBOX_WITH_VBOXSERVICE_CONTROL:= 171 VBOX_WITH_VBOXSERVICE_CONTROL := 1 72 72 endif 73 73 74 74 # Shared Clipboard. 75 75 ifdef VBOX_WITH_SHARED_CLIPBOARD 76 VBOX_WITH_VBOXSERVICE_CLIPBOARD:= 176 VBOX_WITH_VBOXSERVICE_CLIPBOARD := 1 77 77 endif 78 78 … … 103 103 $(if $(VBOX_WITH_HGCM),VBOX_WITH_HGCM,) 104 104 ifdef VBOX_WITH_AUTOMATIC_DEFS_QUOTING 105 VBoxService_DEFS+= VBOX_BUILD_TARGET="$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)"105 VBoxService_DEFS += VBOX_BUILD_TARGET="$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)" 106 106 else 107 VBoxService_DEFS+= VBOX_BUILD_TARGET=\"$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)\"107 VBoxService_DEFS += VBOX_BUILD_TARGET=\"$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)\" 108 108 endif 109 109 VBoxService_DEFS.win += _WIN32_WINNT=0x0501 … … 116 116 117 117 ifdef VBOX_WITH_VBOXSERVICE_TIMESYNC 118 VBoxService_SOURCES+= \119 VBoxServiceTimeSync.cpp118 VBoxService_SOURCES += \ 119 VBoxServiceTimeSync.cpp 120 120 endif 121 121 … … 123 123 VBoxService_DEFS.os2 += VBOX_WITH_VBOXSERVICE_CLIPBOARD VBOX_WITH_SHARED_CLIPBOARD 124 124 VBoxService_SOURCES.os2 += \ 125 VBoxServiceClipboard-os2.cpp \126 $(PATH_ROOT)/src/VBox/GuestHost/SharedClipboard/clipboard-common.cpp125 VBoxServiceClipboard-os2.cpp \ 126 $(PATH_ROOT)/src/VBox/GuestHost/SharedClipboard/clipboard-common.cpp 127 127 endif 128 128 129 129 ifdef VBOX_WITH_VBOXSERVICE_TOOLBOX 130 VBoxService_SOURCES+= \131 VBoxServiceToolBox.cpp130 VBoxService_SOURCES += \ 131 VBoxServiceToolBox.cpp 132 132 endif 133 133 134 134 ifdef VBOX_WITH_VBOXSERVICE_CONTROL 135 VBoxService_SOURCES+= \136 VBoxServiceControl.cpp\137 VBoxServiceControlProcess.cpp \138 VBoxServiceControlSession.cpp135 VBoxService_SOURCES += \ 136 VBoxServiceControl.cpp \ 137 VBoxServiceControlProcess.cpp \ 138 VBoxServiceControlSession.cpp 139 139 endif 140 140 … … 142 142 ifdef VBOX_WITH_MEMBALLOON 143 143 VBoxService_SOURCES += \ 144 VBoxServiceBalloon.cpp144 VBoxServiceBalloon.cpp 145 145 VBoxService_DEFS += VBOX_WITH_MEMBALLOON 146 146 endif … … 148 148 149 149 if1of ($(KBUILD_TARGET), win) 150 VBoxService_SOURCES+= \150 VBoxService_SOURCES += \ 151 151 VBoxServicePageSharing.cpp 152 152 endif 153 153 154 154 ifdef VBOX_WITH_VBOXSERVICE_VMINFO 155 VBoxService_SOURCES.win+= \155 VBoxService_SOURCES.win += \ 156 156 VBoxServiceVMInfo-win.cpp 157 VBoxService_SOURCES+= \158 VBoxServiceVMInfo.cpp \159 VBoxServicePropCache.cpp157 VBoxService_SOURCES += \ 158 VBoxServiceVMInfo.cpp \ 159 VBoxServicePropCache.cpp 160 160 endif 161 161 162 162 ifdef VBOX_WITH_VBOXSERVICE_CPUHOTPLUG 163 VBoxService_SOURCES+= \164 VBoxServiceCpuHotPlug.cpp163 VBoxService_SOURCES += \ 164 VBoxServiceCpuHotPlug.cpp 165 165 endif 166 166 167 167 ifdef VBOX_WITH_SHARED_FOLDERS 168 168 if1of ($(KBUILD_TARGET), linux os2 solaris win) 169 VBoxService_DEFS+= VBOX_WITH_SHARED_FOLDERS170 VBoxService_SOURCES+= \171 VBoxServiceAutoMount.cpp172 VBoxService_SOURCES.linux += \173 ../../linux/sharedfolders/vbsfmount.c174 VBoxService_LIBS.win+= \175 Mpr.Lib169 VBoxService_DEFS += VBOX_WITH_SHARED_FOLDERS 170 VBoxService_SOURCES += \ 171 VBoxServiceAutoMount.cpp 172 VBoxService_SOURCES.linux += \ 173 ../../linux/sharedfolders/vbsfmount.c 174 VBoxService_LIBS.win += \ 175 Mpr.Lib 176 176 endif 177 177 endif … … 191 191 ifdef VBOX_WITH_DBUS 192 192 if1of ($(KBUILD_TARGET), linux solaris) # FreeBSD? 193 VBoxService_LIBS+= \194 dl193 VBoxService_LIBS += \ 194 dl 195 195 endif 196 196 endif 197 197 VBoxService_LIBS.netbsd += crypt 198 198 ifdef VBOX_WITH_GUEST_PROPS 199 VBoxService_LIBS.win+= \200 Secur32.lib \201 WtsApi32.lib \202 Psapi.lib203 VBoxService_LIBS.solaris += \204 nsl \205 kstat \206 contract199 VBoxService_LIBS.win += \ 200 Secur32.lib \ 201 WtsApi32.lib \ 202 Psapi.lib 203 VBoxService_LIBS.solaris += \ 204 nsl \ 205 kstat \ 206 contract 207 207 endif 208 208
Note:
See TracChangeset
for help on using the changeset viewer.