Changeset 44300 in vbox for trunk

Timestamp:

Jan 15, 2013 4:20:58 PM (12 years ago)

Author:

vboxsync

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

83217

Message:

Windows build fixes.

Location:

trunk

Files:

• Config.kmk (modified) (1 diff)
• src/VBox/Runtime/common/zip/tarcmd.cpp (modified) (2 diffs)

trunk/Config.kmk

@@ -2682 +2682 @@
  SDK_VBOX_ZLIB_LIBS  ?= z
  SDK_VBOX_ZLIB_DEFS.linux ?= _LARGEFILE64_SOURCE
+endif
+
+SDK_VBOX_ZLIB_STATIC  = .
+SDK_VBOX_ZLIB_STATIC_EXTENDS ?= VBOX_ZLIB
+if1of ($(KBUILD_TARGET), os2 win) # Not required on solaris.
+ SDK_VBOX_ZLIB_STATIC_LIBS ?= $(PATH_STAGE_LIB)/VBox-zlib-static$(VBOX_SUFF_LIB)
 endif
 

trunk/src/VBox/Runtime/common/zip/tarcmd.cpp

@@ -645 +645 @@
 #endif
 
+#if !defined(RT_OS_WINDOWS) /** @todo implement RTPathSetMode on windows... */
     if (!RTFS_IS_SYMLINK(UnixInfo.Attr.fMode)) /* RTPathSetMode follows symbolic links atm. */
     {
@@ -656 +657 @@
             rcExit = RTMsgErrorExit(RTEXITCODE_FAILURE, "%s: Error changing mode: %Rrc", szDst, rc);
     }
+#endif
 
     return rcExit;