- Timestamp:
- Jan 23, 2023 12:19:14 PM (21 months ago)
- Location:
- trunk
- Files:
-
- 6 edited
-
Config.kmk (modified) (1 diff)
-
configure (modified) (1 diff)
-
configure.vbs (modified) (1 diff)
-
src/VBox/Runtime/Makefile.kmk (modified) (2 diffs)
-
src/VBox/Runtime/testcase/Makefile.kmk (modified) (1 diff)
-
src/libs/Makefile.kmk (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk/Config.kmk
r98237 r98238 4893 4893 4894 4894 ifdef VBOX_WITH_LIBCURL 4895 SDK_VB OX_LIBCURL:= libcurl for dll linking.4896 SDK_VB OX_LIBCURL_INCS ?= $(PATH_ROOT)/src/libs/curl-7.83.1/include4897 SDK_VB OX_LIBCURL_LIBS ?= $(PATH_STAGE_LIB)/VBox-libcurl$(VBOX_SUFF_LIB)4898 SDK_VB OX_LIBCURL_DEFS ?= BUILDING_LIBCURL4899 4900 SDK_VB OX_LIBCURL-x86 = libcurl/x86 for dll linking.4901 SDK_VB OX_LIBCURL-x86_INCS ?= $(PATH_ROOT)/src/libs/curl-7.83.1/include4902 SDK_VB OX_LIBCURL-x86_LIBS.x86 ?= $(PATH_STAGE_LIB)/VBox-libcurl-x86$(VBOX_SUFF_LIB)4903 SDK_VB OX_LIBCURL-x86_DEFS ?= BUILDING_LIBCURL4895 SDK_VBoxLibCurl := libcurl for dll linking. 4896 SDK_VBoxLibCurl_INCS ?= $(PATH_ROOT)/src/libs/curl-7.83.1/include 4897 SDK_VBoxLibCurl_LIBS ?= $(PATH_STAGE_LIB)/VBox-libcurl$(VBOX_SUFF_LIB) 4898 SDK_VBoxLibCurl_DEFS ?= BUILDING_LIBCURL 4899 4900 SDK_VBoxLibCurl-x86 = libcurl/x86 for dll linking. 4901 SDK_VBoxLibCurl-x86_INCS ?= $(PATH_ROOT)/src/libs/curl-7.83.1/include 4902 SDK_VBoxLibCurl-x86_LIBS.x86 ?= $(PATH_STAGE_LIB)/VBox-libcurl-x86$(VBOX_SUFF_LIB) 4903 SDK_VBoxLibCurl-x86_DEFS ?= BUILDING_LIBCURL 4904 4904 endif 4905 4905 -
trunk/configure
r98103 r98238 1097 1097 if test_compile "$LIBCURL $I_INCCURL" libcurl libcurl; then 1098 1098 if test_execute; then 1099 cnf_append "SDK_VB OX_LIBCURL_LIBS" "`strip_l "$LIBCURL"`"1100 cnf_append "SDK_VB OX_LIBCURL_INCS" "$INCCURL"1099 cnf_append "SDK_VBoxLibCurl_LIBS" "`strip_l "$LIBCURL"`" 1100 cnf_append "SDK_VBoxLibCurl_INCS" "$INCCURL" 1101 1101 fi 1102 1102 fi -
trunk/configure.vbs
r98103 r98238 1732 1732 strPathCurl = UnixSlashes(PathAbs(strPathCurl)) 1733 1733 if bln32Bit = True then 1734 CfgPrintAssign "SDK_VB OX_LIBCURL-x86_INCS", strPathCurl & "/include"1735 CfgPrintAssign "SDK_VB OX_LIBCURL-x86_LIBS.x86", strPathCurl & "/libcurl.lib"1734 CfgPrintAssign "SDK_VBoxLibCurl-x86_INCS", strPathCurl & "/include" 1735 CfgPrintAssign "SDK_VBoxLibCurl-x86_LIBS.x86", strPathCurl & "/libcurl.lib" 1736 1736 else 1737 CfgPrintAssign "SDK_VB OX_LIBCURL_INCS", strPathCurl & "/include"1738 CfgPrintAssign "SDK_VB OX_LIBCURL_LIBS", strPathCurl & "/libcurl.lib"1737 CfgPrintAssign "SDK_VBoxLibCurl_INCS", strPathCurl & "/include" 1738 CfgPrintAssign "SDK_VBoxLibCurl_LIBS", strPathCurl & "/libcurl.lib" 1739 1739 end if 1740 1740 -
trunk/src/VBox/Runtime/Makefile.kmk
r98181 r98238 2764 2764 VBoxRT_SDKS = VBOX_LIBXML2 2765 2765 ifdef VBOX_WITH_LIBCURL 2766 VBoxRT_SDKS += VB OX_LIBCURL2766 VBoxRT_SDKS += VBoxLibCurl 2767 2767 endif 2768 2768 VBoxRT_SDKS += VBOX_OPENSSL … … 3003 3003 VBoxRT-x86_SDKS = VBOX_LIBXML2 3004 3004 ifdef VBOX_WITH_LIBCURL 3005 VBoxRT-x86_SDKS += VB OX_LIBCURL-x863005 VBoxRT-x86_SDKS += VBoxLibCurl-x86 3006 3006 endif 3007 3007 VBoxRT-x86_SDKS += VBOX_OPENSSL-x86 -
trunk/src/VBox/Runtime/testcase/Makefile.kmk
r98169 r98238 375 375 tstRTHttp-1_TEMPLATE = VBoxR3TstExe 376 376 tstRTHttp-1_SOURCES = tstRTHttp-1.cpp 377 tstRTHttp-1_SDKS = VB OX_LIBCURL377 tstRTHttp-1_SDKS = VBoxLibCurl 378 378 endif 379 379 -
trunk/src/libs/Makefile.kmk
r98236 r98238 43 43 && !defined(VBOX_ONLY_SDK) \ 44 44 && (!defined(VBOX_ONLY_VALIDATIONKIT) || defined(VBOX_WITH_VALIDATIONKIT_UNITTESTS_PACKING)) \ 45 && "$(SDK_VB OX_LIBCURL_INCS)" == "$(PATH_ROOT)/src/libs/curl-7.83.1/include"45 && "$(SDK_VBoxLibCurl_INCS)" == "$(PATH_ROOT)/src/libs/curl-7.83.1/include" 46 46 include $(PATH_SUB_CURRENT)/curl-7.83.1/Makefile.kmk 47 47 endif
Note:
See TracChangeset
for help on using the changeset viewer.

