Changeset 106855 in vbox for trunk/src/libs

Timestamp:

Nov 6, 2024 3:07:33 PM (2 months ago)

Author:

vboxsync

Message:

libs/zlib-1.2.13/Makefile.kmk: Cleaned up some warnings and fun around the nsis-zlib stuff. bugref:10791

File:

• trunk/src/libs/zlib-1.2.13/Makefile.kmk (modified) (1 diff)

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

@@ -73 +73 @@
 if defined(VBOX_WITH_ADDITIONS) || !defined(VBOX_WITHOUT_ADDITIONS)
  DLLS.win += nsis-zlib-dll
- nsis-zlib-dll_TEMPLATE = VBoxR3DllNonPedantic
- nsis-zlib-dll_SOURCES.win += \
+ nsis-zlib-dll_EXTENDS     := VBox-zlib
+ nsis-zlib-dll_NAME        := zlib1
+ nsis-zlib-dll_TEMPLATE    := VBoxR3DllNonPedantic
+ nsis-zlib-dll_INSTTYPE    := none
+ nsis-zlib-dll_DEFS        := ZLIB_DLL $(VBox-zlib_DEFS)
+ nsis-zlib-dll_SOURCES.win := \
         win32/zlib1.rc \
         win32/zlib.def
- nsis-zlib-dll_EXTENDS  = VBox-zlib
- nsis-zlib-dll_NAME     = zlib1
- nsis-zlib-dll_DEFINES += ZLIB_DLL
- nsis-zlib-dll_INSTTYPE = stage
- nsis-zlib-dll_INST     = $(INST_DEBUG)nsis-zlib/
 
- INSTALLS.win += nsis-zlib-lib
- nsis-zlib-lib_TEMPLATE := DUMMY
- nsis-zlib-lib_EXTENDS   = nsis-zlib-dll
- nsis-zlib-lib_MODE     := a+r,u+w
- nsis-zlib-lib_DEPS     += \
-        $(nsis-zlib-dll_0_OUTDIR)/zlib1.lib
- nsis-zlib-lib_INST      = $(INST_DEBUG)nsis-zlib/lib/
- nsis-zlib-lib_SOURCES  := \
-        win32/zlib.def \
-        $(PATH_STAGE_LIB)/zlib1.lib=>zdll.lib
-
- INSTALLS.win += nsis-zlib-include
- nsis-zlib-include_TEMPLATE := DUMMY
- nsis-zlib-include_MODE     := a+r,u+w
- nsis-zlib-include_INST      = $(INST_DEBUG)nsis-zlib/include/
- nsis-zlib-include_SOURCES  := \
-        zconf.h \
-        zlib.h
+ INSTALLS.win += nsis-zlib-install
+ nsis-zlib-install_TEMPLATE := DUMMY
+ nsis-zlib-install_INSTTYPE := stage
+ nsis-zlib-install_INST     := nsis-zlib/
+ nsis-zlib-install_MODE     := a+r,u+w
+ 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
 endif