Changeset 98395 in vbox
- Timestamp:
- Feb 1, 2023 2:37:00 PM (20 months ago)
- Location:
- trunk/src/libs
- Files:
-
- 11 edited
-
Makefile.kmk (modified) (8 diffs)
-
curl-7.87.0/Makefile.kmk (modified) (1 diff)
-
dxvk-native-1.9.2a/Makefile.kmk (modified) (4 diffs)
-
liblzf-3.6/Makefile.kmk (modified) (1 diff)
-
libxml2-2.9.14/Makefile.kmk (modified) (1 diff)
-
openssl-3.0.7/Config.kmk (modified) (3 diffs)
-
openssl-3.0.7/crypto/Makefile.kmk (modified) (4 diffs)
-
openssl-3.0.7/providers/Makefile.kmk (modified) (2 diffs)
-
softfloat-3e/Makefile.kmk (modified) (1 diff)
-
softfloat-3e/testfloat/Makefile.kmk (modified) (4 diffs)
-
zlib-1.2.13/Makefile.kmk (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/libs/Makefile.kmk
r98332 r98395 38 38 39 39 # cURL/libcurl used by the IPRT http API. 40 if defined(VBOX_WITH_LIBCURL) \41 && !defined(VBOX_ONLY_ADDITIONS) \42 && !defined(VBOX_ONLY_EXTPACKS_USE_IMPLIBS) \43 && !defined(VBOX_ONLY_SDK) \44 && (!defined(VBOX_ONLY_VALIDATIONKIT) || defined(VBOX_WITH_VALIDATIONKIT_UNITTESTS_PACKING)) \45 && "$(SDK_VBoxLibCurl_INCS)" == "$(PATH_ROOT)/src/libs/curl-7.87.0/include"40 if defined(VBOX_WITH_LIBCURL) \ 41 && !defined(VBOX_ONLY_ADDITIONS) \ 42 && !defined(VBOX_ONLY_EXTPACKS_USE_IMPLIBS) \ 43 && !defined(VBOX_ONLY_SDK) \ 44 && (!defined(VBOX_ONLY_VALIDATIONKIT) || defined(VBOX_WITH_VALIDATIONKIT_UNITTESTS_PACKING)) \ 45 && "$(SDK_VBoxLibCurl_INCS)" == "$(PATH_ROOT)/src/libs/curl-7.87.0/include" 46 46 include $(PATH_SUB_CURRENT)/curl-7.87.0/Makefile.kmk 47 47 endif … … 49 49 50 50 # dxvk-native for supporting DirectX over Vulkan on platforms other than Windows. 51 if defined(VBOX_WITH_DXVK) \52 && !defined(VBOX_ONLY_BUILD) \53 && "$(SDK_VBoxDxVk_INCS)" == "$(SDK_VBoxDxVk_DEFAULT_INCS)" \54 && "$(intersects $(KBUILD_TARGET_ARCH),$(VBOX_SUPPORTED_HOST_ARCHS))" != ""55 include $(PATH_SUB_CURRENT)/dxvk-native-1.9.2a/Makefile.kmk51 if defined(VBOX_WITH_DXVK) \ 52 && !defined(VBOX_ONLY_BUILD) \ 53 && "$(SDK_VBoxDxVk_INCS)" == "$(SDK_VBoxDxVk_DEFAULT_INCS)" \ 54 && "$(intersects $(KBUILD_TARGET_ARCH),$(VBOX_SUPPORTED_HOST_ARCHS))" != "" 55 include $(PATH_SUB_CURRENT)/dxvk-native-1.9.2a/Makefile.kmk 56 56 endif 57 57 58 58 59 59 # libjpeg for VRDP video redirection and ExtPack's DrvHostWebcam. 60 if (defined(VBOX_WITH_VRDP) || defined(VBOX_WITH_EXTPACK_PUEL)) \61 && !defined(VBOX_ONLY_ADDITIONS)60 if (defined(VBOX_WITH_VRDP) || defined(VBOX_WITH_EXTPACK_PUEL)) \ 61 && !defined(VBOX_ONLY_ADDITIONS) 62 62 include $(PATH_SUB_CURRENT)/libjpeg-turbo-2.1.3/Makefile.kmk 63 63 endif … … 71 71 72 72 # libssh for cloud integration. 73 if defined(VBOX_WITH_LIBSSH) \74 && !defined(VBOX_ONLY_BUILD) \75 && "$(intersects $(KBUILD_TARGET_ARCH),$(VBOX_SUPPORTED_HOST_ARCHS))" != ""73 if defined(VBOX_WITH_LIBSSH) \ 74 && !defined(VBOX_ONLY_BUILD) \ 75 && "$(intersects $(KBUILD_TARGET_ARCH),$(VBOX_SUPPORTED_HOST_ARCHS))" != "" 76 76 include $(PATH_SUB_CURRENT)/libssh-0.9.6/Makefile.kmk 77 77 endif … … 79 79 80 80 # libtpms for supporting the in process TPM emulation. 81 if defined(VBOX_WITH_LIBTPMS) \82 && !defined(VBOX_ONLY_BUILD) \83 && ("$(SDK_VBoxLibTpms_INCS)" == "$(SDK_VBoxLibTpms_DEFAULT_INCS)")84 include $(PATH_SUB_CURRENT)/libtpms-0.9.0/Makefile.kmk81 if defined(VBOX_WITH_LIBTPMS) \ 82 && !defined(VBOX_ONLY_BUILD) \ 83 && ("$(SDK_VBoxLibTpms_INCS)" == "$(SDK_VBoxLibTpms_DEFAULT_INCS)") 84 include $(PATH_SUB_CURRENT)/libtpms-0.9.0/Makefile.kmk 85 85 endif 86 86 87 87 88 88 # libxml2 used by the IPRT xml C++ API. 89 if !defined(VBOX_ONLY_EXTPACKS_USE_IMPLIBS) \90 && !defined(VBOX_ONLY_ADDITIONS)89 if !defined(VBOX_ONLY_EXTPACKS_USE_IMPLIBS) \ 90 && !defined(VBOX_ONLY_ADDITIONS) 91 91 ifeq ($(SDK_VBoxLibXml2_INCS),$(PATH_ROOT)/src/libs/libxml2-2.9.14/include) 92 92 include $(PATH_SUB_CURRENT)/libxml2-2.9.14/Makefile.kmk … … 96 96 97 97 # OpenSSL. 98 if !defined(VBOX_ONLY_SDK) \99 && (!defined(VBOX_ONLY_ADDITIONS) || !defined(VBOX_ONLY_ADDITIONS_WITHOUT_RTISOMAKER)) \100 && (!defined(VBOX_ONLY_EXTPACKS) || defined(VBOX_NEED_EXTPACK_OPENSSL) || defined(VBOX_WITH_BLD_RTSIGNTOOL_SIGNING) || !defined(VBOX_ONLY_EXTPACKS_USE_IMPLIBS)) \101 && ("$(SDK_VBoxOpenSslStatic_INCS)" == "$(SDK_VBoxOpenSslStatic_VBOX_DEFAULT_INCS)" || defined(VBOX_NEED_EXTPACK_OPENSSL))102 include $(PATH_SUB_CURRENT)/openssl-3.0.7/Makefile.kmk98 if !defined(VBOX_ONLY_SDK) \ 99 && (!defined(VBOX_ONLY_ADDITIONS) || !defined(VBOX_ONLY_ADDITIONS_WITHOUT_RTISOMAKER)) \ 100 && (!defined(VBOX_ONLY_EXTPACKS) || defined(VBOX_NEED_EXTPACK_OPENSSL) || defined(VBOX_WITH_BLD_RTSIGNTOOL_SIGNING) || !defined(VBOX_ONLY_EXTPACKS_USE_IMPLIBS)) \ 101 && ("$(SDK_VBoxOpenSslStatic_INCS)" == "$(SDK_VBoxOpenSslStatic_VBOX_DEFAULT_INCS)" || defined(VBOX_NEED_EXTPACK_OPENSSL)) 102 include $(PATH_SUB_CURRENT)/openssl-3.0.7/Makefile.kmk 103 103 endif 104 104 105 105 106 106 # SoftFloat is used by the VMM for FPU emulation. 107 if (!defined(VBOX_ONLY_BUILD) && "$(intersects $(KBUILD_TARGET_ARCH),$(VBOX_SUPPORTED_HOST_ARCHS))" != "") \108 || ( defined(VBOX_WITH_NOCRT_STATIC) \109 && "$(KBUILD_TARGET)" == "win" \110 && ( defined(VBOX_ONLY_ADDITIONS) \111 || (!defined(VBOX_ONLY_BUILD) && defined(VBOX_WITH_ADDITIONS))))107 if (!defined(VBOX_ONLY_BUILD) && "$(intersects $(KBUILD_TARGET_ARCH),$(VBOX_SUPPORTED_HOST_ARCHS))" != "") \ 108 || ( defined(VBOX_WITH_NOCRT_STATIC) \ 109 && "$(KBUILD_TARGET)" == "win" \ 110 && ( defined(VBOX_ONLY_ADDITIONS) \ 111 || (!defined(VBOX_ONLY_BUILD) && defined(VBOX_WITH_ADDITIONS)))) 112 112 include $(PATH_SUB_CURRENT)/softfloat-3e/Makefile.kmk 113 113 endif … … 115 115 116 116 # zlib is used by the IPRT compression code, libpng and others. 117 if !defined(VBOX_ONLY_SDK) \118 && "$(SDK_VBoxZlib_INCS)" == "$(PATH_ROOT)/src/libs/zlib-1.2.13"117 if !defined(VBOX_ONLY_SDK) \ 118 && "$(SDK_VBoxZlib_INCS)" == "$(PATH_ROOT)/src/libs/zlib-1.2.13" 119 119 include $(PATH_SUB_CURRENT)/zlib-1.2.13/Makefile.kmk 120 120 endif … … 124 124 # Main related things - XPCOM and XSLT. 125 125 # 126 if defined(VBOX_WITH_MAIN) \127 && !defined(VBOX_ONLY_ADDITIONS) \128 && !defined(VBOX_ONLY_VALIDATIONKIT) \129 && "$(intersects $(KBUILD_TARGET_ARCH),$(VBOX_SUPPORTED_HOST_ARCHS))" != ""126 if defined(VBOX_WITH_MAIN) \ 127 && !defined(VBOX_ONLY_ADDITIONS) \ 128 && !defined(VBOX_ONLY_VALIDATIONKIT) \ 129 && "$(intersects $(KBUILD_TARGET_ARCH),$(VBOX_SUPPORTED_HOST_ARCHS))" != "" 130 130 131 if !defined(VBOX_ONLY_DOCS) \132 && !defined(VBOX_ONLY_EXTPACKS) \133 && !defined(VBOX_WITH_SDK)131 if !defined(VBOX_ONLY_DOCS) \ 132 && !defined(VBOX_ONLY_EXTPACKS) \ 133 && !defined(VBOX_WITH_SDK) 134 134 135 135 # libogg, needed for building libvorbis. … … 146 146 147 147 # libpng for screenshots in main. 148 if !defined(VBOX_ONLY_DOCS) \149 && "$(SDK_VBoxLibPng_INCS)" == "$(PATH_ROOT)/src/libs/libpng-1.6.37"148 if !defined(VBOX_ONLY_DOCS) \ 149 && "$(SDK_VBoxLibPng_INCS)" == "$(PATH_ROOT)/src/libs/libpng-1.6.37" 150 150 include $(PATH_SUB_CURRENT)/libpng-1.6.37/Makefile.kmk 151 151 endif -
trunk/src/libs/curl-7.87.0/Makefile.kmk
r98334 r98395 36 36 VBox-libcurl_DEFS = \ 37 37 CURL_STATICLIB \ 38 OPENSSL_NO_ENGINE \38 OPENSSL_NO_ENGINE \ 39 39 BUILDING_LIBCURL \ 40 40 HAVE_CONFIG_H \ -
trunk/src/libs/dxvk-native-1.9.2a/Makefile.kmk
r98226 r98395 55 55 ## @param 1 full path to shader source. 56 56 define def_VBoxDxVkCompileShader 57 $(1)/shaders/$(basename $(notdir $(2))).h: $(2) | $$$$(dir $$$$@)57 $(1)/shaders/$(basename $(notdir $(2))).h: $(2) | $$$$(dir $$$$@) 58 58 $(VBOX_GLSLANGVALIDATOR) -V --vn "$(basename $(notdir $(2)))" "$$<" -o "$$@" 59 59 endef … … 63 63 define def_VBoxDxVkCompilerShaders 64 64 $$(call KB_FN_DO_PASS0_ON_TARGET,$(1)) 65 $(1)_INCS+= $$($(1)_0_OUTDIR)/shaders66 $(1)_BLDDIRS+= $$($(1)_0_OUTDIR)/shaders67 $(1)_INTERMEDIATES := $$(foreach shader,$$($(1)_VBOX_SHADERS) \68 ,$$($(1)_0_OUTDIR)/shaders/$$(basename $$(notdir $$(shader))).h)65 $(1)_INCS += $$($(1)_0_OUTDIR)/shaders 66 $(1)_BLDDIRS += $$($(1)_0_OUTDIR)/shaders 67 $(1)_INTERMEDIATES := $$(foreach shader,$$($(1)_VBOX_SHADERS) \ 68 ,$$($(1)_0_OUTDIR)/shaders/$$(basename $$(notdir $$(shader))).h) 69 69 $$(foreach shader,$$($(1)_VBOX_SHADERS),$$(evalcall2 def_VBoxDxVkCompileShader,$$($(1)_0_OUTDIR),$$(shader))) 70 70 endef … … 231 231 src/dxvk/platform/dxvk_headless_exts.cpp 232 232 VBox-DxVkNativeDxVk_VBOX_SHADERS := \ 233 $(PATH_SUB_CURRENT)/src/dxvk/shaders/dxvk_blit_frag_1d.frag \234 $(PATH_SUB_CURRENT)/src/dxvk/shaders/dxvk_blit_frag_2d.frag \235 $(PATH_SUB_CURRENT)/src/dxvk/shaders/dxvk_blit_frag_3d.frag \236 $(PATH_SUB_CURRENT)/src/dxvk/shaders/dxvk_clear_buffer_f.comp \237 $(PATH_SUB_CURRENT)/src/dxvk/shaders/dxvk_clear_buffer_u.comp \238 $(PATH_SUB_CURRENT)/src/dxvk/shaders/dxvk_clear_image1d_f.comp \239 $(PATH_SUB_CURRENT)/src/dxvk/shaders/dxvk_clear_image1d_u.comp \240 $(PATH_SUB_CURRENT)/src/dxvk/shaders/dxvk_clear_image1darr_f.comp \241 $(PATH_SUB_CURRENT)/src/dxvk/shaders/dxvk_clear_image1darr_u.comp \242 $(PATH_SUB_CURRENT)/src/dxvk/shaders/dxvk_clear_image2d_f.comp \243 $(PATH_SUB_CURRENT)/src/dxvk/shaders/dxvk_clear_image2d_u.comp \244 $(PATH_SUB_CURRENT)/src/dxvk/shaders/dxvk_clear_image2darr_f.comp \245 $(PATH_SUB_CURRENT)/src/dxvk/shaders/dxvk_clear_image2darr_u.comp \246 $(PATH_SUB_CURRENT)/src/dxvk/shaders/dxvk_clear_image3d_f.comp \247 $(PATH_SUB_CURRENT)/src/dxvk/shaders/dxvk_clear_image3d_u.comp \248 $(PATH_SUB_CURRENT)/src/dxvk/shaders/dxvk_copy_buffer_image.comp \249 $(PATH_SUB_CURRENT)/src/dxvk/shaders/dxvk_copy_color_1d.frag \250 $(PATH_SUB_CURRENT)/src/dxvk/shaders/dxvk_copy_color_2d.frag \251 $(PATH_SUB_CURRENT)/src/dxvk/shaders/dxvk_copy_color_ms.frag \252 $(PATH_SUB_CURRENT)/src/dxvk/shaders/dxvk_copy_depth_1d.frag \253 $(PATH_SUB_CURRENT)/src/dxvk/shaders/dxvk_copy_depth_2d.frag \254 $(PATH_SUB_CURRENT)/src/dxvk/shaders/dxvk_copy_depth_ms.frag \255 $(PATH_SUB_CURRENT)/src/dxvk/shaders/dxvk_copy_depth_stencil_1d.frag \256 $(PATH_SUB_CURRENT)/src/dxvk/shaders/dxvk_copy_depth_stencil_2d.frag \257 $(PATH_SUB_CURRENT)/src/dxvk/shaders/dxvk_copy_depth_stencil_ms.frag \258 $(PATH_SUB_CURRENT)/src/dxvk/shaders/dxvk_fullscreen_geom.geom \259 $(PATH_SUB_CURRENT)/src/dxvk/shaders/dxvk_fullscreen_layer_vert.vert \260 $(PATH_SUB_CURRENT)/src/dxvk/shaders/dxvk_fullscreen_vert.vert \261 $(PATH_SUB_CURRENT)/src/dxvk/shaders/dxvk_pack_d24s8.comp \262 $(PATH_SUB_CURRENT)/src/dxvk/shaders/dxvk_pack_d32s8.comp \263 $(PATH_SUB_CURRENT)/src/dxvk/shaders/dxvk_present_frag.frag \264 $(PATH_SUB_CURRENT)/src/dxvk/shaders/dxvk_present_frag_blit.frag \265 $(PATH_SUB_CURRENT)/src/dxvk/shaders/dxvk_present_frag_ms.frag \266 $(PATH_SUB_CURRENT)/src/dxvk/shaders/dxvk_present_frag_ms_amd.frag \267 $(PATH_SUB_CURRENT)/src/dxvk/shaders/dxvk_present_vert.vert \268 $(PATH_SUB_CURRENT)/src/dxvk/shaders/dxvk_resolve_frag_d.frag \269 $(PATH_SUB_CURRENT)/src/dxvk/shaders/dxvk_resolve_frag_ds.frag \270 $(PATH_SUB_CURRENT)/src/dxvk/shaders/dxvk_resolve_frag_f.frag \271 $(PATH_SUB_CURRENT)/src/dxvk/shaders/dxvk_resolve_frag_f_amd.frag \272 $(PATH_SUB_CURRENT)/src/dxvk/shaders/dxvk_resolve_frag_i.frag \273 $(PATH_SUB_CURRENT)/src/dxvk/shaders/dxvk_resolve_frag_u.frag \274 $(PATH_SUB_CURRENT)/src/dxvk/shaders/dxvk_unpack_d24s8.comp \275 $(PATH_SUB_CURRENT)/src/dxvk/shaders/dxvk_unpack_d24s8_as_d32s8.comp \276 $(PATH_SUB_CURRENT)/src/dxvk/shaders/dxvk_unpack_d32s8.comp \277 $(PATH_SUB_CURRENT)/src/dxvk/hud/shaders/hud_line_frag.frag \278 $(PATH_SUB_CURRENT)/src/dxvk/hud/shaders/hud_line_vert.vert \279 $(PATH_SUB_CURRENT)/src/dxvk/hud/shaders/hud_text_frag.frag \280 $(PATH_SUB_CURRENT)/src/dxvk/hud/shaders/hud_text_vert.vert233 $(PATH_SUB_CURRENT)/src/dxvk/shaders/dxvk_blit_frag_1d.frag \ 234 $(PATH_SUB_CURRENT)/src/dxvk/shaders/dxvk_blit_frag_2d.frag \ 235 $(PATH_SUB_CURRENT)/src/dxvk/shaders/dxvk_blit_frag_3d.frag \ 236 $(PATH_SUB_CURRENT)/src/dxvk/shaders/dxvk_clear_buffer_f.comp \ 237 $(PATH_SUB_CURRENT)/src/dxvk/shaders/dxvk_clear_buffer_u.comp \ 238 $(PATH_SUB_CURRENT)/src/dxvk/shaders/dxvk_clear_image1d_f.comp \ 239 $(PATH_SUB_CURRENT)/src/dxvk/shaders/dxvk_clear_image1d_u.comp \ 240 $(PATH_SUB_CURRENT)/src/dxvk/shaders/dxvk_clear_image1darr_f.comp \ 241 $(PATH_SUB_CURRENT)/src/dxvk/shaders/dxvk_clear_image1darr_u.comp \ 242 $(PATH_SUB_CURRENT)/src/dxvk/shaders/dxvk_clear_image2d_f.comp \ 243 $(PATH_SUB_CURRENT)/src/dxvk/shaders/dxvk_clear_image2d_u.comp \ 244 $(PATH_SUB_CURRENT)/src/dxvk/shaders/dxvk_clear_image2darr_f.comp \ 245 $(PATH_SUB_CURRENT)/src/dxvk/shaders/dxvk_clear_image2darr_u.comp \ 246 $(PATH_SUB_CURRENT)/src/dxvk/shaders/dxvk_clear_image3d_f.comp \ 247 $(PATH_SUB_CURRENT)/src/dxvk/shaders/dxvk_clear_image3d_u.comp \ 248 $(PATH_SUB_CURRENT)/src/dxvk/shaders/dxvk_copy_buffer_image.comp \ 249 $(PATH_SUB_CURRENT)/src/dxvk/shaders/dxvk_copy_color_1d.frag \ 250 $(PATH_SUB_CURRENT)/src/dxvk/shaders/dxvk_copy_color_2d.frag \ 251 $(PATH_SUB_CURRENT)/src/dxvk/shaders/dxvk_copy_color_ms.frag \ 252 $(PATH_SUB_CURRENT)/src/dxvk/shaders/dxvk_copy_depth_1d.frag \ 253 $(PATH_SUB_CURRENT)/src/dxvk/shaders/dxvk_copy_depth_2d.frag \ 254 $(PATH_SUB_CURRENT)/src/dxvk/shaders/dxvk_copy_depth_ms.frag \ 255 $(PATH_SUB_CURRENT)/src/dxvk/shaders/dxvk_copy_depth_stencil_1d.frag \ 256 $(PATH_SUB_CURRENT)/src/dxvk/shaders/dxvk_copy_depth_stencil_2d.frag \ 257 $(PATH_SUB_CURRENT)/src/dxvk/shaders/dxvk_copy_depth_stencil_ms.frag \ 258 $(PATH_SUB_CURRENT)/src/dxvk/shaders/dxvk_fullscreen_geom.geom \ 259 $(PATH_SUB_CURRENT)/src/dxvk/shaders/dxvk_fullscreen_layer_vert.vert \ 260 $(PATH_SUB_CURRENT)/src/dxvk/shaders/dxvk_fullscreen_vert.vert \ 261 $(PATH_SUB_CURRENT)/src/dxvk/shaders/dxvk_pack_d24s8.comp \ 262 $(PATH_SUB_CURRENT)/src/dxvk/shaders/dxvk_pack_d32s8.comp \ 263 $(PATH_SUB_CURRENT)/src/dxvk/shaders/dxvk_present_frag.frag \ 264 $(PATH_SUB_CURRENT)/src/dxvk/shaders/dxvk_present_frag_blit.frag \ 265 $(PATH_SUB_CURRENT)/src/dxvk/shaders/dxvk_present_frag_ms.frag \ 266 $(PATH_SUB_CURRENT)/src/dxvk/shaders/dxvk_present_frag_ms_amd.frag \ 267 $(PATH_SUB_CURRENT)/src/dxvk/shaders/dxvk_present_vert.vert \ 268 $(PATH_SUB_CURRENT)/src/dxvk/shaders/dxvk_resolve_frag_d.frag \ 269 $(PATH_SUB_CURRENT)/src/dxvk/shaders/dxvk_resolve_frag_ds.frag \ 270 $(PATH_SUB_CURRENT)/src/dxvk/shaders/dxvk_resolve_frag_f.frag \ 271 $(PATH_SUB_CURRENT)/src/dxvk/shaders/dxvk_resolve_frag_f_amd.frag \ 272 $(PATH_SUB_CURRENT)/src/dxvk/shaders/dxvk_resolve_frag_i.frag \ 273 $(PATH_SUB_CURRENT)/src/dxvk/shaders/dxvk_resolve_frag_u.frag \ 274 $(PATH_SUB_CURRENT)/src/dxvk/shaders/dxvk_unpack_d24s8.comp \ 275 $(PATH_SUB_CURRENT)/src/dxvk/shaders/dxvk_unpack_d24s8_as_d32s8.comp \ 276 $(PATH_SUB_CURRENT)/src/dxvk/shaders/dxvk_unpack_d32s8.comp \ 277 $(PATH_SUB_CURRENT)/src/dxvk/hud/shaders/hud_line_frag.frag \ 278 $(PATH_SUB_CURRENT)/src/dxvk/hud/shaders/hud_line_vert.vert \ 279 $(PATH_SUB_CURRENT)/src/dxvk/hud/shaders/hud_text_frag.frag \ 280 $(PATH_SUB_CURRENT)/src/dxvk/hud/shaders/hud_text_vert.vert 281 281 $(evalcall2 def_VBoxDxVkCompilerShaders,VBox-DxVkNativeDxVk) 282 282 … … 356 356 src/d3d10/d3d10_view_srv.cpp 357 357 VBox-DxVkNativeD3D11_VBOX_SHADERS := \ 358 $(PATH_SUB_CURRENT)/src/d3d11/shaders/d3d11_video_blit_frag.frag \359 $(PATH_SUB_CURRENT)/src/d3d11/shaders/d3d11_video_blit_vert.vert358 $(PATH_SUB_CURRENT)/src/d3d11/shaders/d3d11_video_blit_frag.frag \ 359 $(PATH_SUB_CURRENT)/src/d3d11/shaders/d3d11_video_blit_vert.vert 360 360 $(evalcall2 def_VBoxDxVkCompilerShaders,VBox-DxVkNativeD3D11) 361 361 -
trunk/src/libs/liblzf-3.6/Makefile.kmk
r98103 r98395 31 31 32 32 LIBRARIES += VBox-liblzf 33 if1of ($(KBUILD_TARGET), os2 win)33 if1of ($(KBUILD_TARGET), os2 win) 34 34 # only required for vbox-img 35 35 LIBRARIES += VBox-liblzf-static -
trunk/src/libs/libxml2-2.9.14/Makefile.kmk
r98255 r98395 36 36 VBox-libxml2_DEFS = _REENTRANT # the latter triggers thread support, see xmlversion-default.h and win32xmlversion.h. 37 37 VBox-libxml2_DEFS.win = WIN32 _WINDOWS _MBCS _CRT_SECURE_NO_DEPRECATE _CRT_NONSTDC_NO_DEPRECATE \ 38 LIBXML_STATIC LIBXML_STATIC_FOR_DLL HAVE_WIN32_THREADS HAVE_COMPILER_TLS HAVE_ZLIB_H38 LIBXML_STATIC LIBXML_STATIC_FOR_DLL HAVE_WIN32_THREADS HAVE_COMPILER_TLS HAVE_ZLIB_H 39 39 VBox-libxml2_CFLAGS.win.amd64 = -wd4267 40 40 VBox-libxml2_CFLAGS.win += -wd4701 # potentially uninitialized local variable 'l' used -
trunk/src/libs/openssl-3.0.7/Config.kmk
r98389 r98395 190 190 include/openssl/x509err.h=>x509err.h \ 191 191 include/openssl/x509v3err.h=>x509v3err.h \ 192 \192 \ 193 193 openssl-mangling.h=>openssl-mangling.h \ 194 \194 \ 195 195 gen-includes/openssl/asn1.h=>asn1.h \ 196 196 gen-includes/openssl/asn1t.h=>asn1t.h \ … … 300 300 OPENSSL_SYSNAME_WIN32 \ 301 301 OPENSSL_RAND_SEED_OS 302 # Exclude WinCrypt.h, causes trouble all over the place302 # Exclude WinCrypt.h, causes trouble all over the place 303 303 TEMPLATE_LibCrypto_DEFS += \ 304 304 NOCRYPT … … 377 377 378 378 ifdef VBOX_WITH_BLD_RTSIGNTOOL_SIGNING 379 #380 # Build program versions of LibCrypto and SubLibCrypto for bldRTSignTool.381 #379 # 380 # Build program versions of LibCrypto and SubLibCrypto for bldRTSignTool. 381 # 382 382 TEMPLATE_VBoxLibCryptoBldProg = Build program template the OpenSSL crypto library. 383 383 TEMPLATE_VBoxLibCryptoBldProg_EXTENDS := VBoxAdvBldProg -
trunk/src/libs/openssl-3.0.7/crypto/Makefile.kmk
r98391 r98395 139 139 140 140 if defined(VBOX_NEED_EXTPACK_OPENSSL) && !defined(VBOX_ONLY_VALIDATIONKIT) # Not needed for Validation Kit. 141 #142 # The extension pack libcrypto.143 #141 # 142 # The extension pack libcrypto. 143 # 144 144 LIBRARIES += VBoxExtPack-libcrypto 145 145 VBoxExtPack-libcrypto = For the Oracle Extension Pack … … 156 156 VBoxExtPack-$(sublib)_DEFS = VBOX_IN_EXTPACK 157 157 VBoxExtPack-$(sublib)_DEFPATH = $($(sublib)_DEFPATH) 158 ## @todo kBuild: DEFPATH isn't inherited! FIXME!158 ## @todo kBuild: DEFPATH isn't inherited! FIXME! 159 159 endef 160 160 $(foreach sublib,$(VBOX_CRYPTO_SUBLIBS), $(eval $(def_VBoxExtPack_libcrypto_inherit))) … … 164 164 165 165 ifdef VBOX_WITH_BLD_RTSIGNTOOL_SIGNING 166 #167 # The build program libcrypto version.168 #166 # 167 # The build program libcrypto version. 168 # 169 169 LIBRARIES += VBoxBldProg-libcrypto 170 170 VBoxBldProg-libcrypto = For bldRTSignTool … … 183 183 VBoxBldProg-$(sublib)_TEMPLATE = VBoxSubLibCryptoBldProg 184 184 VBoxBldProg-$(sublib)_DEFPATH = $($(sublib)_DEFPATH) 185 ## @todo kBuild: DEFPATH isn't inherited! FIXME!185 ## @todo kBuild: DEFPATH isn't inherited! FIXME! 186 186 endef 187 187 $(foreach sublib,$(VBOX_CRYPTO_SUBLIBS), $(eval $(def_VBoxBldProg_libcrypto_inherit))) -
trunk/src/libs/openssl-3.0.7/providers/Makefile.kmk
r98391 r98395 87 87 88 88 ifdef VBOX_WITH_BLD_RTSIGNTOOL_SIGNING 89 #90 # The build program libproviders version.91 #89 # 90 # The build program libproviders version. 91 # 92 92 LIBRARIES += VBoxBldProg-libproviders 93 93 VBoxBldProg-libproviders = For bldRTSignTool … … 105 105 VBoxBldProg-$(sublib)_TEMPLATE = VBoxSubLibCryptoBldProg 106 106 VBoxBldProg-$(sublib)_DEFPATH = $($(sublib)_DEFPATH) 107 ## @todo kBuild: DEFPATH isn't inherited! FIXME!107 ## @todo kBuild: DEFPATH isn't inherited! FIXME! 108 108 endef 109 109 $(foreach sublib,$(VBOX_CRYPTO_PROVIDERS_SUBLIBS), $(eval $(def_VBoxBldProg_libproviders_inherit))) -
trunk/src/libs/softfloat-3e/Makefile.kmk
r98103 r98395 375 375 # -wd4389: f64_to_i64_r_minMag.c(93): warning C4389: '!=': signed/unsigned mismatch 376 376 VBox-SoftFloatR0_CFLAGS.win := $(VBox-SoftFloat_CFLAGS.win) -wd4245 -wd4389 377 ifn1of ($(KBUILD_TARGET), win)378 VBox-SoftFloatR0_CFLAGS:= $(VBox-SoftFloat_CFLAGS) -Wno-sign-compare377 ifn1of ($(KBUILD_TARGET), win) 378 VBox-SoftFloatR0_CFLAGS := $(VBox-SoftFloat_CFLAGS) -Wno-sign-compare 379 379 endif 380 380 381 381 382 382 ifdef VBOX_WITH_NOCRT_STATIC 383 #384 # Static No-CRT version of the above for use with VBoxGL.dll in the GAs.385 #386 LIBRARIES.win += VBox-SoftFloatGuestR3Shared387 VBox-SoftFloatGuestR3Shared_TEMPLATE:= NewerVccVBoxGuestR3Dll388 VBox-SoftFloatGuestR3Shared_EXTENDS:= VBox-SoftFloat389 VBox-SoftFloatGuestR3Shared_INST= $(INST_ADDITIONS_LIB)390 391 # -wd4389: f64_to_i64_r_minMag.c(93): warning C4389: '!=': signed/unsigned mismatch392 VBox-SoftFloatGuestR3Shared_CFLAGS.win:= $(VBox-SoftFloat_CFLAGS.win) -wd4245 -wd4389393 ifn1of ($(KBUILD_TARGET), win)394 VBox-SoftFloatGuestR3Shared_CFLAGS:= $(VBox-SoftFloat_CFLAGS) -Wno-sign-compare383 # 384 # Static No-CRT version of the above for use with VBoxGL.dll in the GAs. 385 # 386 LIBRARIES.win += VBox-SoftFloatGuestR3Shared 387 VBox-SoftFloatGuestR3Shared_TEMPLATE := NewerVccVBoxGuestR3Dll 388 VBox-SoftFloatGuestR3Shared_EXTENDS := VBox-SoftFloat 389 VBox-SoftFloatGuestR3Shared_INST = $(INST_ADDITIONS_LIB) 390 391 # -wd4389: f64_to_i64_r_minMag.c(93): warning C4389: '!=': signed/unsigned mismatch 392 VBox-SoftFloatGuestR3Shared_CFLAGS.win := $(VBox-SoftFloat_CFLAGS.win) -wd4245 -wd4389 393 ifn1of ($(KBUILD_TARGET), win) 394 VBox-SoftFloatGuestR3Shared_CFLAGS := $(VBox-SoftFloat_CFLAGS) -Wno-sign-compare 395 395 endif 396 396 397 #398 # And a x86 version of that again for amd64 targets.399 #400 LIBRARIES.win.amd64 += VBox-SoftFloatGuestR3Shared-x86401 VBox-SoftFloatGuestR3Shared-x86_TEMPLATE:= NewerVccVBoxGuestR3Dll402 VBox-SoftFloatGuestR3Shared-x86_EXTENDS:= VBox-SoftFloatGuestR3Shared403 VBox-SoftFloatGuestR3Shared-x86_BLD_TRG_ARCH := x86397 # 398 # And a x86 version of that again for amd64 targets. 399 # 400 LIBRARIES.win.amd64 += VBox-SoftFloatGuestR3Shared-x86 401 VBox-SoftFloatGuestR3Shared-x86_TEMPLATE := NewerVccVBoxGuestR3Dll 402 VBox-SoftFloatGuestR3Shared-x86_EXTENDS := VBox-SoftFloatGuestR3Shared 403 VBox-SoftFloatGuestR3Shared-x86_BLD_TRG_ARCH := x86 404 404 endif # VBOX_WITH_NOCRT_STATIC 405 405 -
trunk/src/libs/softfloat-3e/testfloat/Makefile.kmk
r98249 r98395 42 42 FLOAT_ROUND_ODD 43 43 ifn1of ($(KBUILD_TARGET), win) 44 TEMPLATE_VBoxTestFloat_DEFS.amd64 = $(TEMPLATE_VBoxR3DllNonPedantic_DEFS.amd64) LONG_DOUBLE_IS_EXTFLOAT8044 TEMPLATE_VBoxTestFloat_DEFS.amd64 = $(TEMPLATE_VBoxR3DllNonPedantic_DEFS.amd64) LONG_DOUBLE_IS_EXTFLOAT80 45 45 endif 46 46 if1of ($(KBUILD_TARGET), win) … … 120 120 source/writeCase_z_f128M.c \ 121 121 source/testLoops_common.c \ 122 \122 \ 123 123 source/test_a_ui32_z_f16.c \ 124 124 source/test_a_ui32_z_f32.c \ … … 225 225 source/test_abcz_f128.c \ 226 226 source/test_ab_f128_z_bool.c \ 227 \227 \ 228 228 source/genCases_ui32.c \ 229 229 source/genCases_ui64.c \ … … 254 254 tstTestFloatGen_SOURCES = \ 255 255 source/testfloat_gen.c \ 256 source/genLoops.c256 source/genLoops.c 257 257 258 258 PROGRAMS += tstTestFloatTime -
trunk/src/libs/zlib-1.2.13/Makefile.kmk
r98103 r98395 30 30 31 31 LIBRARIES += VBox-zlib 32 if1of ($(KBUILD_TARGET), os2 win)32 if1of ($(KBUILD_TARGET), os2 win) 33 33 # only required for vbox-img 34 34 LIBRARIES += VBox-zlib-static … … 59 59 VBox-zlib-static_DEFS = $(VBox-zlib_DEFS) 60 60 ifdef VBOX_WITH_NOCRT_STATIC 61 VBox-zlib-static_DEFS += IPRT_NO_CRT_FOR_3RD_PARTY61 VBox-zlib-static_DEFS += IPRT_NO_CRT_FOR_3RD_PARTY 62 62 endif 63 63 VBox-zlib-static_SOURCES = $(VBox-zlib_SOURCES)
Note:
See TracChangeset
for help on using the changeset viewer.

