Changeset 31514 in vbox

Timestamp:

Aug 10, 2010 9:53:44 AM (15 years ago)

Author:

vboxsync

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

64606

Message:

Windows build fix

Location:

trunk/src

Files:

• VBox/Devices/Storage/testcase/Makefile.kmk (modified) (2 diffs)
• libs/liblzf-3.4/Makefile.kmk (modified) (2 diffs)
• libs/zlib-1.2.1/Makefile.kmk (modified) (2 diffs)

trunk/src/VBox/Devices/Storage/testcase/Makefile.kmk

@@ -76 +76 @@
  tstVDSetUuid_LIBS   = $(LIB_DDU) $(LIB_RUNTIME)
  VBoxFixHdd_LIBS = \
-        $(VBOX_LIB_RUNTIME_STATIC) \
+        $(VBOX_LIB_RUNTIME_STATIC)
+ if1of ($(KBUILD_TARGET),os2 win)
+  VBoxFixHdd_LIBS += \
+        $(PATH_LIB)/VBox-liblzf-static$(VBOX_SUFF_LIB) \
+        $(PATH_LIB)/VBox-zlib-static$(VBOX_SUFF_LIB)
+ else
+  VBoxFixHdd_LIBS += \
         $(PATH_LIB)/VBox-liblzf$(VBOX_SUFF_LIB) \
         $(SDK_VBOX_ZLIB_LIBS)
+ endif
  ifeq ($(KBUILD_TARGET),linux)
   VBoxFixHdd_LIBS += crypt
@@ -84 +91 @@
   VBoxFixHdd_LIBS += iconv
  else ifeq ($(KBUILD_TARGET),win)
-  VBoxFixHdd_SDKS.win = VBOX_NTDLL VBOX_ZLIB WINPSDK $(VBOX_WINDDK)
+  VBoxFixHdd_SDKS.win = VBOX_NTDLL
  endif
  tstVD_SOURCES  = tstVD.cpp

trunk/src/libs/liblzf-3.4/Makefile.kmk

@@ -21 +21 @@
 
 LIBRARIES += VBox-liblzf
+if1of ($(KBUILD_TARGET),os2 win)
+ LIBRARIES += VBox-liblzf-static
+endif
 VBox-liblzf_TEMPLATE = VBOXR3
 VBox-liblzf_BLD_TYPE = release # WARNING! Always optimizing this lib.
@@ -30 +33 @@
         lzf_d.c
 
+VBox-liblzf-static_TEMPLATE   = VBOXR3STATIC
+VBox-liblzf-static_BLD_TYPE   = $(VBox-liblzf_BLD_TYPE)
+VBox-liblzf-static_DEFS       = $(VBox-liblzf_DEFS)
+VBox-liblzf-static_DEFS.x86   = $(VBox-liblzf_DEFS.x86)
+VBox-liblzf-static_DEFS.amd64 = $(VBox-liblzf_DEFS.amd64)
+VBox-liblzf-static_SOURCES    = $(VBox-liblzf_SOURCES)
+
 include $(KBUILD_PATH)/subfooter.kmk
 

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

@@ -20 +20 @@
 
 LIBRARIES += VBox-zlib
+if1of ($(KBUILD_TARGET),os2 win)
+ LIBRARIES += VBox-zlib-static
+endif
 VBox-zlib_TEMPLATE = VBOXR3
 VBox-zlib_DEFS = verbose=-1
@@ -36 +39 @@
         inffast.c
 
+VBox-zlib-static_TEMPLATE = VBOXR3STATIC
+VBox-zlib-static_DEFS = $(VBox-zlib_DEFS)
+VBox-zlib-static_SOURCES = $(VBox-zlib_SOURCES)
+
 include $(KBUILD_PATH)/subfooter.kmk