Changeset 98247 in vbox

Timestamp:

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

Author:

vboxsync

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

155446

Message:

/*.kmk,configure*: s/VBOX_OGG/VBoxLibOgg/ (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

@@ -4969 +4969 @@
 
 ifdef VBOX_WITH_LIBOGG
- SDK_VBOX_OGG                  := libogg for dll linking.
- SDK_VBOX_OGG_DEFAULT_INCS     := $(PATH_ROOT)/src/libs/libogg-1.3.5/include
- SDK_VBOX_OGG_INCS             ?= $(SDK_VBOX_OGG_DEFAULT_INCS)
- SDK_VBOX_OGG_LIBS             ?= $(PATH_STAGE_LIB)/VBox-libogg$(VBOX_SUFF_LIB)
+ SDK_VBoxLibOgg                := libogg for dll linking.
+ SDK_VBoxLibOgg_DEFAULT_INCS   := $(PATH_ROOT)/src/libs/libogg-1.3.5/include
+ SDK_VBoxLibOgg_INCS           ?= $(SDK_VBoxLibOgg_DEFAULT_INCS)
+ SDK_VBoxLibOgg_LIBS           ?= $(PATH_STAGE_LIB)/VBox-libogg$(VBOX_SUFF_LIB)
 endif
 

trunk/configure

@@ -1876 +1876 @@
     if test_compile "$LIBOGG $I_INCOGG" ogg ogg nofatal; then
       if test_execute; then
-        cnf_append "SDK_VBOX_OGG_INCS" "$INCOGG"
-        cnf_append "SDK_VBOX_OGG_LIBS" "`strip_l "$LIBOGG"`"
+        cnf_append "SDK_VBoxLibOgg_INCS" "$INCOGG"
+        cnf_append "SDK_VBoxLibOgg_LIBS" "`strip_l "$LIBOGG"`"
       fi
     else

trunk/src/VBox/Main/Makefile.kmk

@@ -1035 +1035 @@
   ifdef VBOX_WITH_LIBOGG
    VBOX_MAIN_DEFS += VBOX_WITH_LIBOGG
-   VBoxC_SDKS     += VBOX_OGG
+   VBoxC_SDKS     += VBoxLibOgg
    VBoxC_DEFS     += VBOX_WITH_LIBOGG
    ## @todo We need this for libvorbis down below. Remove once the libvorbis @todo is resolved.
-   VBoxSVC_SDKS   += VBOX_OGG
+   VBoxSVC_SDKS   += VBoxLibOgg
   endif
   ifdef VBOX_WITH_LIBVORBIS

trunk/src/libs/Makefile.kmk

@@ -135 +135 @@
   # libogg, needed for building libvorbis.
   if   defined(VBOX_WITH_LIBOGG) \
-    && ("$(SDK_VBOX_OGG_INCS)" == "$(SDK_VBOX_OGG_DEFAULT_INCS)")
+    && ("$(SDK_VBoxLibOgg_INCS)" == "$(SDK_VBoxLibOgg_DEFAULT_INCS)")
    include $(PATH_SUB_CURRENT)/libogg-1.3.5/Makefile.kmk
   endif