- Timestamp:
- Oct 10, 2018 12:50:44 PM (6 years ago)
- Location:
- trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Config.kmk
r74739 r74741 5164 5164 TEMPLATE_VBoxR3Static_LIBS += \ 5165 5165 $(VBOX_LIB_RUNTIME_STATIC) 5166 ifndef SDK_VBOX_OPENSSL_LIBS 5167 TEMPLATE_VBoxR3Static_LIBS += \ 5168 $(PATH_STAGE_LIB)/VBox-libcrypto$(VBOX_SUFF_LIB) \ 5169 $(PATH_STAGE_LIB)/VBox-libssl$(VBOX_SUFF_LIB) 5170 endif 5166 5171 ifndef SDK_VBOX_LIBXML2_LIBS 5167 5172 TEMPLATE_VBoxR3Static_LIBS += \ -
trunk/src/VBox/Runtime/Makefile.kmk
r74739 r74741 259 259 # 260 260 RuntimeR3_TEMPLATE = VBoxR3Static 261 RuntimeR3_SDKS = VBOX_ LIBXML2261 RuntimeR3_SDKS = VBOX_OPENSSL VBOX_LIBXML2 262 262 RuntimeR3_SDKS.win = $(VBOX_WINPSDK) $(VBOX_WINDDK) 263 263 RuntimeR3_DEFS = \ … … 271 271 RT_NO_GIP \ 272 272 RT_WITHOUT_NOCRT_WRAPPERS \ 273 IPRT_WITH_OPENSSL \ 273 274 NOFILEID 274 275 if1of ($(KBUILD_TARGET_ARCH), amd64 x86) … … 1519 1520 RuntimeBldProg_BLD_TRG_ARCH := $(KBUILD_HOST_ARCH) 1520 1521 RuntimeBldProg_BLD_TRG_CPU := $(KBUILD_HOST_CPU) 1521 RuntimeBldProg_DEFS := $(filter-out IN_SUP_R3 IN_SUP , $(RuntimeR3_DEFS)) IPRT_WITHOUT_LDR_VERIFY RT_NO_GIP1522 RuntimeBldProg_DEFS := $(filter-out IN_SUP_R3 IN_SUP IPRT_WITH_OPENSSL, $(RuntimeR3_DEFS)) IPRT_WITHOUT_LDR_VERIFY RT_NO_GIP 1522 1523 RuntimeBldProg_SOURCES = \ 1523 1524 common/alloc/alloc.cpp \ … … 1966 1967 ## @todo change this to EXTEND the RuntimeR3 target. 1967 1968 RuntimeGuestR3_SDKS.win := $(RuntimeR3_SDKS.win) 1968 RuntimeGuestR3_DEFS := $(filter-out RTCRITSECT_STRICT RT_NO_GIP , $(RuntimeR3_DEFS))1969 RuntimeGuestR3_DEFS := $(filter-out RTCRITSECT_STRICT RT_NO_GIP IPRT_WITH_OPENSSL, $(RuntimeR3_DEFS)) 1969 1970 RuntimeGuestR3_DEFS := $(filter-out IN_SUP_R3, $(RuntimeGuestR3_DEFS)) 1970 1971 RuntimeGuestR3_DEFS.$(KBUILD_TARGET) := $(RuntimeR3_DEFS.$(KBUILD_TARGET)) … … 2042 2043 endif 2043 2044 VBoxRT_DEFS := $(filter-out RT_NO_GIP, $(RuntimeR3_DEFS)) \ 2044 IPRT_WITH_OPENSSL \2045 2045 IPRT_WITH_XAR \ 2046 2046 $(if-expr !defined(VBOX_WITH_ALT_HASH_CODE),IPRT_WITHOUT_SHA512T224 IPRT_WITHOUT_SHA512T256,)
Note:
See TracChangeset
for help on using the changeset viewer.