please change "mspsdk" to "ms_psdk" in order to avoid conflict with the 
player team's

Looks good otherwise

-->Henry

At 05:26 PM 8/12/2004 -0700, Liam Murray wrote:

>Summary:
>
>Adds MS platform sdk path to LIBPATH so the platform sdk libraries are 
>searched before msvc libraries when linking.
>
>Applies to win32-i386-vc6 and related builds (i.e., not 7.0) that require 
>MS platform sdk.
>
>Overview:
>
>A while back for ipv6 we added the requirement that the full Feb 2003 MS 
>platform sdk be installed when building with msvc 6.0. Currently we end up 
>including the platform sdk headers but when we link we only link with the 
>default msvc libraries. The platform sdk lib path is not used in the 
>linker search. Although this has worked so far without problems, we really 
>should be linking with the libraries accompanying the headers. This mimics 
>the way the build environment is set up when you install the platform sdk 
>and run the environment setup batch files: the sdk header path is added at 
>the front of the INCLUDE path and the sdk lib path is added at the front 
>of the LIB path.
>
>(This way of adding the path was suggested by Fredrick.)
>
>
>Files affected:
>
>common/umake/mspsdk/umakefil
>
>Branch:
>
>Head
>
>Builds verified:
>win32-i386-vc6
>
>Liam
>
>Index: umakefil
>===================================================================
>RCS file: /cvsroot/common/umake/mspsdk/umakefil,v
>retrieving revision 1.1
>diff -u -w -r1.1 umakefil
>--- umakefil    4 Jun 2004 02:12:13 -0000       1.1
>+++ umakefil    13 Aug 2004 00:05:58 -0000
>@@ -4,9 +4,22 @@
>  #
>
>  # Add SDK header to include path
>-
>-#if ("HELIX_FEATURE_IPV6" in project.defines):
>  path = GetSDKPath("mspsdk")
>  project.AddModuleIncludes(os.path.join(path, "include"))
>+
>+# AddSystemPaths doesn't work on Windows
>+# project.AddSystemPaths(os.path.join(path, "lib"))
>+
>+# force platform sdk lib path be searched first
>+class WinLinkerPSDK(WinLinker):
>+    def __init__(self):
>+       self.oldLinkerExtraOptions = platform.link.extra_options()
>+       WinLinker.__init__(self)
>+
>+    def extra_options(self):
>+       libPath = os.path.join(GetSDKPath("mspsdk"), "lib")
>+        return [ '/LIBPATH:"%s"' % libPath ] + self.oldLinkerExtraOptions
>+
>+platform.link = WinLinkerPSDK()
>
>
>_______________________________________________
>Common-dev mailing list
>Common-dev at lists.helixcommunity.org
>http://lists.helixcommunity.org/mailman/listinfo/common-dev