Changeset 48283 in vbox

Timestamp:

Sep 5, 2013 12:17:10 AM (11 years ago)

Author:

vboxsync

Message:

Fixed VBOX_ZLIB bug in previous commit.

Location:

trunk

Files:

• Config.kmk (modified) (1 diff)
• src/VBox/Runtime/Makefile.kmk (modified) (1 diff)

trunk/Config.kmk

@@ -2704 +2704 @@
  SDK_VBOX_ZLIB_INCS  ?= $(PATH_ROOT)/src/libs/zlib-1.2.6
  SDK_VBOX_ZLIB_LIBS  ?= $(PATH_STAGE_LIB)/VBox-zlib$(VBOX_SUFF_LIB)
- SDK_VBOX_ZLIB_LIBS.x86 ?= $(PATH_STAGE_LIB)/VBox-zlib-x86$(VBOX_SUFF_LIB)
 else
  SDK_VBOX_ZLIB_INCS  ?=
  SDK_VBOX_ZLIB_LIBS  ?= z
- SDK_VBOX_ZLIB_LIBS.x86 ?= z
  SDK_VBOX_ZLIB_DEFS.linux ?= _LARGEFILE64_SOURCE
+endif
+
+SDK_VBOX_ZLIB-x86    = .
+SDK_VBOX_ZLIB-x86_EXTENDS = VBOX_ZLIB
+if1of ($(KBUILD_TARGET), os2 solaris win)
+ SDK_VBOX_ZLIB_LIBS-x86  ?= $(PATH_STAGE_LIB)/VBox-zlib-x86$(VBOX_SUFF_LIB)
 endif
 

trunk/src/VBox/Runtime/Makefile.kmk

@@ -1439 +1439 @@
 endif
 VBoxRT-x86_LIBS                  += \
-        $(SDK_VBOX_ZLIB_LIBS.x86)
+        $(SDK_VBOX_ZLIB_LIBS-x86)
 ifndef SDK_VBOX_OPENSSL_LIBS
  VBoxRT-x86_LIBS                 += \