Changeset 98416 in vbox for trunk/src/VBox/Additions/x11/vboxvideo
- Timestamp:
- Feb 1, 2023 4:25:17 PM (2 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
r98214 r98416 121 121 vbva.c \ 122 122 $(vboxvideo_drv_lib_SOURCES) 123 124 125 126 vboxvideo_drv_POST_CMDS= \123 # Any global symbols in the driver object files will be added to XFree86's 124 # symbol table, which can cause problems if we e.g. define a symbol in two 125 # modules. 126 vboxvideo_drv_POST_CMDS = \ 127 127 objcopy --keep-global-symbol vboxvideoModuleData $(out) $(out)-objcopy$$(NLTAB) \ 128 128 $(MV) -f $(out)-objcopy $(out) … … 221 221 $(vboxvideo_xorg_INCS) \ 222 222 $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.5 \ 223 vboxvideo_drv_16_INCS += $(PATH_ROOT)/src/VBox/Runtime/include223 vboxvideo_drv_16_INCS += $(PATH_ROOT)/src/VBox/Runtime/include 224 224 vboxvideo_drv_16_SOURCES := $(vboxvideo_drv_15_SOURCES) 225 225 vboxvideo_drv_16_LIBS += $(vboxvideo_drv_70_LIBS) … … 411 411 vboxvideo_drv_system_TEMPLATE = VBoxGuestR3XOrgMod 412 412 vboxvideo_drv_system_CFLAGS := \ 413 413 $(vboxvideo_drv_70_CFLAGS) -include xorg-server.h 414 414 vboxvideo_drv_system_DEFS := $(filter-out _XORG_SERVER_H_ _DIX_CONFIG_H_, $(vboxvideo_15_DEFS)) 415 415 vboxvideo_drv_system_INCS += \ 416 417 418 419 416 $(PATH_ROOT)/src/VBox/Runtime/include \ 417 $(VBOX_GRAPHICS_INCS) \ 418 /usr/include/xorg \ 419 /usr/include/pixman-1 420 420 vboxvideo_drv_system_SOURCES := $(vboxvideo_drv_17_SOURCES) 421 421 endif … … 426 426 427 427 ifdef VBOX_WITH_TESTCASES 428 # ifndef VBOX_ONLY_ADDITIONS428 # ifndef VBOX_ONLY_ADDITIONS 429 429 ifndef VBOX_USE_SYSTEM_XORG_HEADERS 430 if1of ($(KBUILD_TARGET), linux solaris)430 if1of ($(KBUILD_TARGET), linux solaris) 431 431 ifeq ($(KBUILD_HOST_ARCH),$(KBUILD_TARGET_ARCH)) 432 432 ifndef VBOX_ONLY_SDK … … 436 436 TESTING += $(vboxvideo_drv_0_OUTDIR)/tstvboxvideo68.run 437 437 OTHERS += $(vboxvideo_drv_0_OUTDIR)/tstvboxvideo68.run 438 $$(vboxvideo_drv_0_OUTDIR)/tstvboxvideo68.run: $$(vboxvideo_drv_1_STAGE_TARGET)438 $$(vboxvideo_drv_0_OUTDIR)/tstvboxvideo68.run: $$(vboxvideo_drv_1_STAGE_TARGET) 439 439 $(QUIET)$(call MSG_L1,Checking for unresolved symbols in $<) 440 440 $(QUIET)$(ASH) $(PATH_ROOT)/src/bldprogs/checkUndefined.sh $(KBUILD_HOST) \ … … 443 443 endif 444 444 445 ##446 # Using the extra expansion to replace $(ver) before eval, thus everything447 # else needs escaped dollars.445 ## 446 # Using the extra expansion to replace $(ver) before eval, thus everything 447 # else needs escaped dollars. 448 448 define def_vboxvideo_test 449 449 TESTING += $$(vboxvideo_drv$(ver)_0_OUTDIR)/tstvboxvideo$(ver).run … … 454 454 $$(vboxvideo_drv$(ver)_1_STAGE_TARGET) $$(VBOXVIDEO_SRC_PATH)/../undefined_xfree86 $(VBOXVIDEO_SRC_PATH)/../undefined_xfree86_modules $$(VBOXVIDEO_SRC_PATH)/../undefined_xorg 455 455 $$(QUIET)$$(APPEND) -t "$$@" "done" 456 endef457 458 $(foreach ver, _70 _71 _13 _14 _15 _16 _17 _18 _19 _110 _111 _112 _113 _114 _115 _116 _117 _118, $(eval $(def_vboxvideo_test)))456 endef 457 458 $(foreach ver, _70 _71 _13 _14 _15 _16 _17 _18 _19 _110 _111 _112 _113 _114 _115 _116 _117 _118, $(eval $(def_vboxvideo_test))) 459 459 460 460 endif # ! VBOX_ONLY_SDK … … 462 462 endif # 1of ($(KBUILD_TARGET),linux solaris) 463 463 endif # ! VBOX_USE_SYSTEM_XORG_HEADERS 464 # endif # ! VBOX_ONLY_ADDITIONS464 # endif # ! VBOX_ONLY_ADDITIONS 465 465 endif # VBOX_WITH_TESTCASES 466 466
Note:
See TracChangeset
for help on using the changeset viewer.