- Timestamp:
- Dec 16, 2021 10:37:40 AM (3 years ago)
- File:
-
- 1 edited
-
trunk/Config.kmk (modified) (7 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/Config.kmk
r92966 r92974 4605 4605 4606 4606 # 4607 # SDK for including int64.lib for x86 targets. 4608 # It conceptually moved from the WDK to the PSDK with W10, as it's now in the um subdir. 4609 # 4610 SDK_VBOX_WIN_INT64 = Abstracts where to find int64.lib for x86 builds. 4611 ifn1of ($(VBOX_WINPSDK), WINPSDK71 WINPSDK80) 4612 SDK_VBOX_WIN_INT64_LIBS.x86 = $(PATH_SDK_$(VBOX_WINPSDK)_LIB.x86)/int64.lib 4613 else 4614 SDK_VBOX_WIN_INT64_LIBS.x86 = $(PATH_SDK_$(VBOX_WINDDK)_LIB.x86)/int64.lib 4615 include $(KBUILD_PATH)/sdks/$(VBOX_WINDDK).kmk ## TODO: Add a kBuild feature for loading SDKs. 4616 endif 4617 4618 # 4607 4619 # Determine Solaris version. 4608 4620 # … … 4725 4737 TEMPLATE_VBoxRc_LDFLAGS += -IntegrityCheck 4726 4738 endif 4727 TEMPLATE_VBoxRc_LIBS = \ 4728 $(PATH_SDK_$(VBOX_WINDDK)_LIB.x86)/int64.lib 4739 TEMPLATE_VBoxRc_SDKS.x86 += VBOX_WIN_INT64 4729 4740 TEMPLATE_VBoxRc_LIBS += \ 4730 4741 $(PATH_STAGE_LIB)/RuntimeRCStub$(VBOX_SUFF_LIB) … … 4879 4890 TEMPLATE_VBoxR0_LIBS = \ 4880 4891 $(PATH_STAGE_LIB)/RuntimeR0Stub$(VBOX_SUFF_LIB) 4881 include $(KBUILD_PATH)/sdks/$(VBOX_WINDDK).kmk ## TODO: Add a kBuild feature for loading SDKs. 4882 TEMPLATE_VBoxR0_LIBS.x86 = \ 4883 $(PATH_SDK_$(VBOX_WINDDK)_LIB.x86)/int64.lib 4892 TEMPLATE_VBoxR0_SDKS.x86 += VBOX_WIN_INT64 4884 4893 TEMPLATE_VBoxR0_ORDERDEPS = $(VBOX_SIGN_DRIVER_ORDERDEPS) 4885 4894 TEMPLATE_VBoxR0_POST_CMDS = $(VBOX_SIGN_DRIVER_CMDS) … … 6052 6061 TEMPLATE_VBoxR3StaticNoCrt_LIBS.win = $(NO_SUCH_VARIABLE) 6053 6062 TEMPLATE_VBoxR3StaticNoCrt_LIBS.win.x86 = \ 6054 $(PATH_SDK_$(VBOX_WINDDK)_LIB.x86)/int64.lib \6055 6063 $(PATH_TOOL_$(TEMPLATE_VBoxR3StaticNoCrt_TOOL.win.x86)_LIB)/chkstk.obj 6064 TEMPLATE_VBoxR3StaticNoCrt_SDKS.win.x86 += VBOX_WIN_INT64 6056 6065 TEMPLATE_VBoxR3StaticNoCrt_LDFLAGS.win.x86 = $(filter-out -Include%, $(TEMPLATE_VBoxR3Static_LDFLAGS.win.x86)) 6057 6066 TEMPLATE_VBoxR3StaticNoCrt_CFLAGS = $(filter-out -EH%,$(TEMPLATE_VBoxR3Static_CFLAGS)) /GS- -EHs- … … 6127 6136 ifeq ($(KBUILD_TARGET),win) # No CRT! 6128 6137 TEMPLATE_VBOXR3HARDENEDEXE_SDKS = VBOX_NTDLL $(TEMPLATE_VBOXR3EXE_SDKS) 6138 TEMPLATE_VBOXR3HARDENEDEXE_SDKS.x86 = VBOX_WIN_INT64 6129 6139 TEMPLATE_VBOXR3HARDENEDEXE_LIBS.x86 = \ 6130 $(PATH_SDK_$(VBOX_WINDDK)_LIB.x86)/int64.lib \6131 6140 $(PATH_TOOL_$(TEMPLATE_VBOXR3HARDENEDEXE_TOOL.win.x86)_LIB)/chkstk.obj 6132 6141 TEMPLATE_VBOXR3HARDENEDEXE_CXXFLAGS = $(filter-out -RTC% -GZ -GS,$(TEMPLATE_VBOXR3EXE_CXXFLAGS)) -GS- … … 8088 8097 TEMPLATE_VBoxGuestR3NoCrtExe_LIBS.win = $(NO_SUCH_VARIABLE) 8089 8098 TEMPLATE_VBoxGuestR3NoCrtExe_LIBS.win.x86 = \ 8090 $(PATH_SDK_$(VBOX_WINDDK)_LIB.x86)/int64.lib \8091 8099 $(PATH_TOOL_$(TEMPLATE_VBoxGuestR3NoCrtExe_TOOL.win.x86)_LIB)/chkstk.obj 8100 TEMPLATE_VBoxGuestR3NoCrtExe_SDKS.win.x86 = VBOX_WIN_INT64 8092 8101 TEMPLATE_VBoxGuestR3NoCrtExe_LDFLAGS.win.x86 = $(filter-out -Include%, $(TEMPLATE_VBoxGuestR3Exe_LDFLAGS.win.x86)) 8093 8102 TEMPLATE_VBoxGuestR3NoCrtExe_LDFLAGS.win = $(TEMPLATE_VBoxGuestR3Exe_LDFLAGS.win) /entry:CustomMainEntrypoint /subsystem:console … … 8211 8220 TEMPLATE_VBOXGUESTR0_EXTENDS = VBOXR0DRV 8212 8221 TEMPLATE_VBOXGUESTR0_INST = $(INST_ADDITIONS) 8213 TEMPLATE_VBOXGUESTR0_SDKS.win.x86 = ReorderCompilerIncs $(VBOX_WINDDK_GST) $(VBOX_WINPSDK_GST_INCS) 8222 TEMPLATE_VBOXGUESTR0_SDKS.win.x86 = ReorderCompilerIncs $(VBOX_WINDDK_GST) $(VBOX_WINPSDK_GST_INCS) VBOX_WIN_INT64 8214 8223 TEMPLATE_VBOXGUESTR0_SDKS.win.amd64 = ReorderCompilerIncs $(VBOX_WINDDK_GST) $(VBOX_WINPSDK_GST_INCS) 8215 TEMPLATE_VBOXGUESTR0_LIBS.win.x86 = \8216 $(PATH_SDK_$(VBOX_WINDDK)_LIB)/int64.lib8217 8224 TEMPLATE_VBOXGUESTR0_DEFS = $(TEMPLATE_VBOXR0DRV_DEFS) IN_GUEST IN_GUEST_R0 8218 8225 TEMPLATE_VBOXGUESTR0_DEFS.linux = RT_NO_EXPORT_SYMBOL
Note:
See TracChangeset
for help on using the changeset viewer.

