Changeset 98248 in vbox

Timestamp:

Jan 23, 2023 5:15:58 PM (2 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

155447

Message:

/*.kmk,configure*: s/VBOX_VORBIS/VBoxLibVorbis/ (sdk) bugref:10348

Location:

trunk

Files:

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

trunk/Config.kmk

@@ -4976 +4976 @@
 
 ifdef VBOX_WITH_LIBVORBIS
- SDK_VBOX_VORBIS               := libvorbis for dll linking.
- SDK_VBOX_VORBIS_DEFAULT_INCS  := $(PATH_ROOT)/src/libs/libvorbis-1.3.7/include
- SDK_VBOX_VORBIS_INCS          ?= $(SDK_VBOX_VORBIS_DEFAULT_INCS)
- SDK_VBOX_VORBIS_LIBS          ?= $(PATH_STAGE_LIB)/VBox-libvorbis$(VBOX_SUFF_LIB)
+ SDK_VBoxLibVorbis               := libvorbis for dll linking.
+ SDK_VBoxLibVorbis_DEFAULT_INCS  := $(PATH_ROOT)/src/libs/libvorbis-1.3.7/include
+ SDK_VBoxLibVorbis_INCS          ?= $(SDK_VBoxLibVorbis_DEFAULT_INCS)
+ SDK_VBoxLibVorbis_LIBS          ?= $(PATH_STAGE_LIB)/VBox-libvorbis$(VBOX_SUFF_LIB)
 endif
 

trunk/configure

@@ -1839 +1839 @@
     if test_compile "$LIBVRB $I_INCVRB" vorbis vorbis nofatal; then
       if test_execute; then
-        cnf_append "SDK_VBOX_VORBIS_INCS" "$INCVRB"
-        cnf_append "SDK_VBOX_VORBIS_LIBS" "`strip_l "$LIBVRB"`"
+        cnf_append "SDK_VBoxLibVorbis_INCS" "$INCVRB"
+        cnf_append "SDK_VBoxLibVorbis_LIBS" "`strip_l "$LIBVRB"`"
       fi
     else

trunk/src/VBox/Main/Makefile.kmk

@@ -1042 +1042 @@
   ifdef VBOX_WITH_LIBVORBIS
    VBOX_MAIN_DEFS += VBOX_WITH_LIBVORBIS
-   VBoxC_SDKS     += VBOX_VORBIS
+   VBoxC_SDKS     += VBoxLibVorbis
    ## @todo We also need to specify this for VBoxSVC, as we need to have VBOX_WITH_LIBVORBIS defined
    ##       for SystemProperties::getSupportedRecordingAudioCodecs().
    #        SystemPropertiesImpl_DEFS += VBOX_WITH_LIBVORBIS didn't work for precompiled headers on Windows --
    #        needs to be solved properly so that we can remove the following _SDKS from VBoxSVC again.
-   VBoxSVC_SDKS   += VBOX_VORBIS
+   VBoxSVC_SDKS   += VBoxLibVorbis
   endif
   VBoxC_SOURCES += src-client/DrvAudioRec.cpp

trunk/src/libs/Makefile.kmk

@@ -141 +141 @@
   # libvorbis for supporting audio with video recording.
   if   defined(VBOX_WITH_LIBVORBIS) \
-    && ("$(SDK_VBOX_VORBIS_INCS)" == "$(SDK_VBOX_VORBIS_DEFAULT_INCS)")
+    && ("$(SDK_VBoxLibVorbis_INCS)" == "$(SDK_VBoxLibVorbis_DEFAULT_INCS)")
    include $(PATH_SUB_CURRENT)/libvorbis-1.3.7/Makefile.kmk
   endif