Changeset 107122 in vbox for trunk/src/libs

Timestamp:

Nov 22, 2024 3:42:33 PM (8 weeks ago)

Author:

vboxsync

Message:

src/libs/zlib: Tweaks for building NSIS. bugref:10791

File:

• trunk/src/libs/zlib-1.2.13/Makefile.kmk (modified) (2 diffs)

trunk/src/libs/zlib-1.2.13/Makefile.kmk

@@ -71 +71 @@
 # Builds a Windows DLL in a separate tree so that it can be found by the scons build system.
 # Required for building NSIS (Windows Guest Additions installer) from source.
-if defined(VBOX_WITH_ADDITIONS) || !defined(VBOX_WITHOUT_ADDITIONS)
+if defined(VBOX_WITH_ADDITIONS) && !defined(VBOX_WITHOUT_ADDITIONS)
  DLLS.win += nsis-zlib-dll
  nsis-zlib-dll_EXTENDS     := VBox-zlib
@@ -89 +89 @@
  nsis-zlib-install_SOURCES   = \
         $(nsis-zlib-dll_1_TARGET) \
-        $(basename $(nsis-zlib-dll_1_TARGET)).lib=>lib/zlib.lib \
-        $(basename $(nsis-zlib-dll_1_TARGET)).lib=>lib/zlib1.lib \
-        zconf.h=>include/zconf.h \
-        zlib.h=>include/zlib.h
+        $(basename $(nsis-zlib-dll_1_TARGET)).lib=>zdll.lib \
+        zconf.h \
+        zlib.h
 endif