Changeset 98239 in vbox

Timestamp:

Jan 23, 2023 12:21:53 PM (2 years ago)

Author:

vboxsync

Message:

*.kmk,configure*: s/VBOX_LIBPNG/VBoxLibPng/ (SDK) bugref:10348

Location:

trunk

Files:

• Config.kmk (modified) (1 diff)
• configure (modified) (1 diff)
• src/VBox/Main/Makefile.kmk (modified) (2 diffs)
• src/libs/Makefile.kmk (modified) (1 diff)

trunk/Config.kmk

@@ -4904 +4904 @@
 endif
 
-SDK_VBOX_LIBPNG                := protable network graphics (png) library for dll linking.
-SDK_VBOX_LIBPNG_INCS           ?= $(PATH_ROOT)/src/libs/libpng-1.6.37
-SDK_VBOX_LIBPNG_LIBS           ?= $(PATH_STAGE_LIB)/VBox-libpng$(VBOX_SUFF_LIB)
+SDK_VBoxLibPng                := protable network graphics (png) library for dll linking.
+SDK_VBoxLibPng_INCS           ?= $(PATH_ROOT)/src/libs/libpng-1.6.37
+SDK_VBoxLibPng_LIBS           ?= $(PATH_STAGE_LIB)/VBox-libpng$(VBOX_SUFF_LIB)
 
 # lzf

trunk/configure

@@ -1025 +1025 @@
   if test_compile "$LIBPNG $I_INCPNG" libpng libpng; then
     if test_execute; then
-      cnf_append "SDK_VBOX_LIBPNG_LIBS" "`strip_l "$LIBPNG"`"
-      cnf_append "SDK_VBOX_LIBPNG_INCS" "$INCPNG"
+      cnf_append "SDK_VBoxLibPng_LIBS" "`strip_l "$LIBPNG"`"
+      cnf_append "SDK_VBoxLibPng_INCS" "$INCPNG"
     fi
   fi

trunk/src/VBox/Main/Makefile.kmk

@@ -583 +583 @@
         $(LIB_DDU)
 
-VBoxSVC_SDKS = VBOX_LIBPNG VBOX_ZLIB
+VBoxSVC_SDKS = VBoxLibPng VBOX_ZLIB
 VBoxSVC_LIBS.solaris = \
         adm \
@@ -1013 +1013 @@
 endif
 
-VBoxC_SDKS = VBOX_LIBPNG VBOX_ZLIB
+VBoxC_SDKS = VBoxLibPng VBOX_ZLIB
 
 ifdef VBOX_WITH_RECORDING

trunk/src/libs/Makefile.kmk

@@ -147 +147 @@
   # libpng for screenshots in main.
   if  !defined(VBOX_ONLY_DOCS) \
-   && "$(SDK_VBOX_LIBPNG_INCS)" == "$(PATH_ROOT)/src/libs/libpng-1.6.37"
+   && "$(SDK_VBoxLibPng_INCS)" == "$(PATH_ROOT)/src/libs/libpng-1.6.37"
    include $(PATH_SUB_CURRENT)/libpng-1.6.37/Makefile.kmk
   endif