Ticket #10: Config.diff
File Config.diff, 2.0 KB (added by , 9 years ago) |
---|
-
Config.kmk
old new 164 164 && ( $(KBUILD_VERSION_MINOR) >= 2 \ 165 165 || ( $(KBUILD_VERSION_MINOR) == 1 \ 166 166 && $(KBUILD_VERSION_PATCH) >= 999)) 167 if $(KMK_REVISION) >= 2689 167 if $(KMK_REVISION) >= 2577 168 # 2689 // vs 168 169 # OK. 169 170 else 170 171 $(error You must update kBuild! Requires kBuild revision 2577 or later, found $(KMK_REVISION) ($(KBUILD_VERSION))) … … 519 520 # Enable MSI support in devices 520 521 VBOX_WITH_MSI_DEVICES = 1 521 522 # Enable host network interface API. 522 if1of ($(KBUILD_TARGET), darwin freebsd linux solaris win )523 if1of ($(KBUILD_TARGET), darwin freebsd linux solaris win os2) 523 524 VBOX_WITH_HOSTNETIF_API = 1 524 525 endif 525 526 # Emulated USB smart card reader … … 945 946 VBOX_WITH_WEBSERVICES= 946 947 VBOX_WITH_INSTALLER= 947 948 VBOX_WITH_SECURELABEL= 948 VBOX_WITH_VRDP_AUTHMOD=949 VBOX_WITH_VRDP_RDESKTOP=949 # VBOX_WITH_VRDP_AUTHMOD= 950 # VBOX_WITH_VRDP_RDESKTOP= 950 951 VBOX_WITH_VALIDATIONKIT= 951 952 VBOX_WITH_QTGUI= 952 VBOX_WITH_USB= 953 VBOX_WITH_EHCI= 953 # VBOX_WITH_MAIN=1 954 VBOX_WITH_VIRTIO= 955 VBOX_WITH_PULSE= 956 VBOX_WITH_ALSA= 957 958 # VBOX_WITH_USB=1 959 # VBOX_WITH_VUSB=1 960 # VBOX_WITH_USB_CARDREADER=1 961 # VBOX_WITH_EHCI=1 954 962 VBOX_WITH_DOCS= 955 VBOX_WITH_PDM_ASYNC_COMPLETION=956 963 VBOX_WITH_KCHMVIEWER= 957 964 VBOX_WITH_HARDENING= 965 VBOX_WITH_OGL= 966 # VBOX_WITH_PCI_PASSTHROUGH= 967 # VBOX_WITH_EXTPACK= 958 968 endif 959 969 960 970 ifeq ($(KBUILD_TARGET),solaris) … … 1830 1840 ifeq ($(VBOX_XCURSOR_LIBS),) 1831 1841 VBOX_XCURSOR_LIBS := Xcursor 1832 1842 endif 1843 if1of ($(KBUILD_TARGET),os2) 1844 VBOX_XCURSOR_INCS = 1845 VBOX_XCURSOR_LIBS = 1846 endif 1833 1847 endif 1834 1848 1835 1849 … … 5205 5219 TEMPLATE_VBOXQT4GUIEXE_LDFLAGS.darwin += $(VBOX_DARWIN_DEF_SDK_LDFLAGS) -bind_at_load 5206 5220 TEMPLATE_VBOXQT4GUIEXE_LIBS += 5207 5221 TEMPLATE_VBOXQT4GUIEXE_LIBPATH += 5222 else ifeq ($(KBUILD_TARGET),os2) 5223 # ... 5208 5224 else 5209 5225 TEMPLATE_VBOXQT4GUIEXE_INCS += \ 5210 5226 $(VBOX_XCURSOR_INCS)