- Timestamp:
- Jan 23, 2023 5:45:52 PM (21 months ago)
- Location:
- trunk
- Files:
-
- 15 edited
-
Config.kmk (modified) (3 diffs)
-
configure (modified) (1 diff)
-
src/VBox/Additions/common/VBoxControl/Makefile.kmk (modified) (1 diff)
-
src/VBox/Devices/Makefile.kmk (modified) (1 diff)
-
src/VBox/ExtPacks/VBoxDTrace/Makefile.kmk (modified) (1 diff)
-
src/VBox/Main/Makefile.kmk (modified) (2 diffs)
-
src/VBox/Runtime/Makefile.kmk (modified) (3 diffs)
-
src/VBox/Storage/testcase/Makefile.kmk (modified) (2 diffs)
-
src/VBox/ValidationKit/Config.kmk (modified) (1 diff)
-
src/VBox/ValidationKit/utils/audio/Makefile.kmk (modified) (1 diff)
-
src/VBox/ValidationKit/utils/misc/Makefile.kmk (modified) (1 diff)
-
src/libs/Makefile.kmk (modified) (1 diff)
-
src/libs/curl-7.83.1/Makefile.kmk (modified) (1 diff)
-
src/libs/libpng-1.6.37/Makefile.kmk (modified) (1 diff)
-
src/libs/libxml2-2.9.14/Makefile.kmk (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk/Config.kmk
r98254 r98255 5050 5050 5051 5051 # zlib 5052 SDK_VB OX_ZLIB:= zlib for dll linking.5052 SDK_VBoxZlib := zlib for dll linking. 5053 5053 if1of ($(KBUILD_TARGET), os2 solaris win) 5054 SDK_VB OX_ZLIB_INCS ?= $(PATH_ROOT)/src/libs/zlib-1.2.135055 SDK_VB OX_ZLIB_LIBS ?= $(PATH_STAGE_LIB)/VBox-zlib$(VBOX_SUFF_LIB)5054 SDK_VBoxZlib_INCS ?= $(PATH_ROOT)/src/libs/zlib-1.2.13 5055 SDK_VBoxZlib_LIBS ?= $(PATH_STAGE_LIB)/VBox-zlib$(VBOX_SUFF_LIB) 5056 5056 else 5057 SDK_VB OX_ZLIB_INCS ?=5058 SDK_VB OX_ZLIB_LIBS ?= z5059 SDK_VB OX_ZLIB_DEFS.linux ?= _LARGEFILE64_SOURCE5060 endif 5061 5062 SDK_VB OX_ZLIB-x86 := zlib/x865063 SDK_VB OX_ZLIB-x86_EXTENDS = VBOX_ZLIB5057 SDK_VBoxZlib_INCS ?= 5058 SDK_VBoxZlib_LIBS ?= z 5059 SDK_VBoxZlib_DEFS.linux ?= _LARGEFILE64_SOURCE 5060 endif 5061 5062 SDK_VBoxZlib-x86 := zlib/x86 5063 SDK_VBoxZlib-x86_EXTENDS = VBoxZlib 5064 5064 if1of ($(KBUILD_TARGET), os2 solaris win) 5065 SDK_VB OX_ZLIB_LIBS-x86 ?= $(PATH_STAGE_LIB)/VBox-zlib-x86$(VBOX_SUFF_LIB)5066 endif 5067 5068 SDK_VB OX_ZLIB_STATIC:= zlib for static linking5069 SDK_VB OX_ZLIB_STATIC_EXTENDS := VBOX_ZLIB5065 SDK_VBoxZlib_LIBS-x86 ?= $(PATH_STAGE_LIB)/VBox-zlib-x86$(VBOX_SUFF_LIB) 5066 endif 5067 5068 SDK_VBoxZlibStatic := zlib for static linking 5069 SDK_VBoxZlibStatic_EXTENDS := VBoxZlib 5070 5070 if1of ($(KBUILD_TARGET), os2 win) # Not required on solaris. 5071 SDK_VB OX_ZLIB_STATIC_LIBS ?= $(PATH_STAGE_LIB)/VBox-zlib-static$(VBOX_SUFF_LIB)5071 SDK_VBoxZlibStatic_LIBS ?= $(PATH_STAGE_LIB)/VBox-zlib-static$(VBOX_SUFF_LIB) 5072 5072 endif 5073 5073 … … 6596 6596 TEMPLATE_VBoxR3Static_LIBS.$(KBUILD_TARGET_ARCH) += \ 6597 6597 $(SDK_VBoxLzf_STATIC_LIBS) \ 6598 $(SDK_VB OX_ZLIB_STATIC_LIBS)6598 $(SDK_VBoxZlibStatic_LIBS) 6599 6599 else 6600 6600 TEMPLATE_VBoxR3Static_LIBS.$(KBUILD_TARGET_ARCH) += \ 6601 6601 $(SDK_VBoxLzf_LIBS) \ 6602 $(SDK_VB OX_ZLIB_LIBS)6602 $(SDK_VBoxZlib_LIBS) 6603 6603 if1of ($(KBUILD_TARGET),darwin freebsd) 6604 6604 TEMPLATE_VBoxR3Static_LIBS += iconv … … 6882 6882 $(if-expr !defined(SDK_VBoxLibXml2_LIBS),$(PATH_STAGE_LIB)/VBox-libxml2-static$(VBOX_SUFF_LIB),) \ 6883 6883 $(if-expr "$(KBUILD_TARGET)" == "win" || "$(KBUILD_TARGET)" == "os2" \ 6884 ,$(SDK_VBoxLzf_STATIC_LIBS) $(SDK_VB OX_ZLIB_STATIC_LIBS) \6885 ,$(SDK_VBoxLzf_LIBS) $(SDK_VB OX_ZLIB_LIBS)) \6884 ,$(SDK_VBoxLzf_STATIC_LIBS) $(SDK_VBoxZlibStatic_LIBS) \ 6885 ,$(SDK_VBoxLzf_LIBS) $(SDK_VBoxZlib_LIBS)) \ 6886 6886 ,$(TEMPLATE_$(TEMPLATE_VBoxR3AutoTest_EXTENDS)_LIBS.$(KBUILD_TARGET_ARCH))) 6887 6887 -
trunk/configure
r98254 r98255 958 958 if test_execute; then 959 959 echo "if1of (\$(KBUILD_TARGET),darwin freebsd haiku linux)" >> $CNF 960 cnf_append " SDK_VB OX_ZLIB_LIBS" "`strip_l "$LIBZ"`"961 cnf_append " SDK_VB OX_ZLIB_INCS" "$INCZ"960 cnf_append " SDK_VBoxZlib_LIBS" "`strip_l "$LIBZ"`" 961 cnf_append " SDK_VBoxZlib_INCS" "$INCZ" 962 962 echo "endif" >> $CNF 963 963 fi -
trunk/src/VBox/Additions/common/VBoxControl/Makefile.kmk
r98195 r98255 47 47 VBoxControl_DEFS.win += \ 48 48 $(if $(VBOX_WITH_DPC_LATENCY_CHECKER),VBOX_WITH_DPC_LATENCY_CHECKER,) 49 VBoxControl_SDKS = VB OX_ZLIB_STATIC49 VBoxControl_SDKS = VBoxZlibStatic 50 50 VBoxControl_SOURCES = \ 51 51 VBoxControl.cpp -
trunk/src/VBox/Devices/Makefile.kmk
r98251 r98255 577 577 578 578 if defined(VBOX_WITH_CLOUD_NET) && defined(VBOX_WITH_LIBSSH) 579 VBoxDD_SDKS += VBoxLibSsh VB OX_ZLIBVBoxOpenSsl579 VBoxDD_SDKS += VBoxLibSsh VBoxZlib VBoxOpenSsl 580 580 VBoxDD_DEFS += VBOX_WITH_CLOUD_NET 581 581 VBoxDD_SOURCES += \ -
trunk/src/VBox/ExtPacks/VBoxDTrace/Makefile.kmk
r98128 r98255 117 117 VBoxDTraceCmd_DEFS.linux = _XOPEN_SOURCE=700 _LARGEFILE64_SOURCE 118 118 VBoxDTraceCmd_DEFS.win = YY_USE_PROTOS=1 YYENABLE_NLS=0 YYLTYPE_IS_TRIVIAL=0 119 VBoxDTraceCmd_SDKS = VB OX_ZLIB119 VBoxDTraceCmd_SDKS = VBoxZlib 120 120 ifn1of ($(KBUILD_TARGET), win) 121 121 VBoxDTraceCmd_CFLAGS = -Wno-format $(VBOX_GCC_Wno-overlength-strings) -Wno-sign-compare -Wno-strict-prototypes -Wno-missing-prototypes -Wno-missing-declarations -Wno-shadow -
trunk/src/VBox/Main/Makefile.kmk
r98252 r98255 583 583 $(LIB_DDU) 584 584 585 VBoxSVC_SDKS = VBoxLibPng VB OX_ZLIB585 VBoxSVC_SDKS = VBoxLibPng VBoxZlib 586 586 VBoxSVC_LIBS.solaris = \ 587 587 adm \ … … 1013 1013 endif 1014 1014 1015 VBoxC_SDKS = VBoxLibPng VB OX_ZLIB1015 VBoxC_SDKS = VBoxLibPng VBoxZlib 1016 1016 1017 1017 ifdef VBOX_WITH_RECORDING -
trunk/src/VBox/Runtime/Makefile.kmk
r98254 r98255 357 357 RuntimeBaseR3_INCS = \ 358 358 include \ 359 $(SDK_VB OX_ZLIB_INCS) \359 $(SDK_VBoxZlib_INCS) \ 360 360 $(SDK_VBoxLzf_INCS) 361 361 … … 2861 2861 endif 2862 2862 VBoxRT_LIBS += \ 2863 $(SDK_VB OX_ZLIB_LIBS)2863 $(SDK_VBoxZlib_LIBS) 2864 2864 ifndef SDK_VBoxOpenSslStatic_LIBS 2865 2865 VBoxRT_LIBS += \ … … 3018 3018 endif 3019 3019 VBoxRT-x86_LIBS += \ 3020 $(SDK_VB OX_ZLIB_LIBS-x86)3020 $(SDK_VBoxZlib_LIBS-x86) 3021 3021 ifndef SDK_VBoxOpenSslStatic_LIBS 3022 3022 VBoxRT-x86_LIBS += \ -
trunk/src/VBox/Storage/testcase/Makefile.kmk
r98254 r98255 164 164 vbox-img_LIBS += \ 165 165 $(SDK_VBoxLzf_STATIC_LIBS) \ 166 $(SDK_VB OX_ZLIB_STATIC_LIBS)166 $(SDK_VBoxZlibStatic_LIBS) 167 167 else 168 168 vbox-img_LIBS += \ 169 169 $(SDK_VBoxLzf_LIBS) \ 170 $(SDK_VB OX_ZLIB_LIBS)170 $(SDK_VBoxZlib_LIBS) 171 171 endif 172 172 ifeq ($(KBUILD_TARGET),linux) … … 214 214 vdkeystoremgr_LIBS += \ 215 215 $(SDK_VBoxLzf_STATIC_LIBS) \ 216 $(SDK_VB OX_ZLIB_STATIC_LIBS)216 $(SDK_VBoxZlibStatic_LIBS) 217 217 else 218 218 vdkeystoremgr_LIBS += \ 219 219 $(SDK_VBoxLzf_LIBS) \ 220 $(SDK_VB OX_ZLIB_LIBS)220 $(SDK_VBoxZlib_LIBS) 221 221 endif 222 222 ifeq ($(KBUILD_TARGET),linux) -
trunk/src/VBox/ValidationKit/Config.kmk
r98234 r98255 99 99 ifneq ($(KBUILD_TARGET),win) 100 100 TEMPLATE_VBoxValidationKitR3_LIBS += \ 101 $(SDK_VB OX_ZLIB_LIBS)101 $(SDK_VBoxZlib_LIBS) 102 102 endif 103 103 -
trunk/src/VBox/ValidationKit/utils/audio/Makefile.kmk
r98164 r98255 177 177 vkatadd_EXTENDS_BY = appending 178 178 vkatadd_NAME = VBoxAudioTest 179 vkatadd_SDKS = VB OX_ZLIB_STATIC179 vkatadd_SDKS = VBoxZlibStatic 180 180 vkatadd_LDFLAGS.darwin = -framework IOKit 181 181 vkatadd_LIBS.solaris = m -
trunk/src/VBox/ValidationKit/utils/misc/Makefile.kmk
r98103 r98255 71 71 PROGRAMS += vts_tar 72 72 vts_tar_TEMPLATE = VBoxValidationKitR3 73 vts_tar_SDKS = VB OX_ZLIB_STATIC73 vts_tar_SDKS = VBoxZlibStatic 74 74 vts_tar_SOURCES = vts_tar.cpp 75 75 -
trunk/src/libs/Makefile.kmk
r98254 r98255 116 116 # zlib is used by the IPRT compression code, libpng and others. 117 117 if !defined(VBOX_ONLY_SDK) \ 118 && "$(SDK_VB OX_ZLIB_INCS)" == "$(PATH_ROOT)/src/libs/zlib-1.2.13"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 -
trunk/src/libs/curl-7.83.1/Makefile.kmk
r98241 r98255 33 33 LIBRARIES += VBox-libcurl 34 34 VBox-libcurl_TEMPLATE = VBoxR3RuntimeDllNonPedantic 35 VBox-libcurl_SDKS = VB OX_ZLIBVBoxOpenSslStatic35 VBox-libcurl_SDKS = VBoxZlib VBoxOpenSslStatic 36 36 VBox-libcurl_DEFS = \ 37 37 CURL_STATICLIB \ -
trunk/src/libs/libpng-1.6.37/Makefile.kmk
r98103 r98255 31 31 LIBRARIES += VBox-libpng 32 32 VBox-libpng_TEMPLATE = VBoxR3DllNonPedantic 33 VBox-libpng_SDKS = VB OX_ZLIB33 VBox-libpng_SDKS = VBoxZlib 34 34 VBox-libpng_CFLAGS.win = -wd4310 35 35 # -wd2220 -wd4431 # pngrutil.c(1268) : warning C4310: cast truncates constant value -
trunk/src/libs/libxml2-2.9.14/Makefile.kmk
r98103 r98255 33 33 endif 34 34 VBox-libxml2_TEMPLATE = VBoxR3RuntimeDllNonPedantic 35 VBox-libxml2_SDKS = VB OX_ZLIB35 VBox-libxml2_SDKS = VBoxZlib 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 \
Note:
See TracChangeset
for help on using the changeset viewer.

