diff options
| author | Igor Pashev <pashev.igor@gmail.com> | 2014-06-05 07:53:13 +0400 |
|---|---|---|
| committer | Igor Pashev <pashev.igor@gmail.com> | 2014-06-05 07:53:13 +0400 |
| commit | 1f9a9ca84829dabee36cdbb71c35f5ceadd6928a (patch) | |
| tree | be32397db09c52beb901df79066ef9376e4c1ce9 /Makefile.kmk | |
| parent | 80ef8a04e98a296f1040de080e69860b82e1aab7 (diff) | |
| parent | c62f2e29abd05a0afd640f6e55f5e2585406c78f (diff) | |
| download | kbuild-1f9a9ca84829dabee36cdbb71c35f5ceadd6928a.tar.gz | |
Merge branch 'master' of git://anonscm.debian.org/pkg-virtualbox/kbuild
Conflicts:
debian/changelog
debian/control
Diffstat (limited to 'Makefile.kmk')
| -rw-r--r-- | Makefile.kmk | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/Makefile.kmk b/Makefile.kmk index 79c58e9..91c98c0 100644 --- a/Makefile.kmk +++ b/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 2440 2011-07-06 12:17:51Z bird $ +# $Id: Makefile.kmk 2674 2013-01-31 13:28:27Z bird $ ## @file # Top-Level Sub-Makefile for kBuild. # @@ -69,14 +69,13 @@ kBuild_bin_SOURCES.os2 = \ kBuild/bin/$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)/libc06.dll=>libc06.dll \ kBuild/bin/$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)/libc061.dll=>libc061.dll \ kBuild/bin/$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)/libc062.dll=>libc062.dll \ - kBuild/bin/$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)/libc063.dll=>libc063.dll + kBuild/bin/$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)/libc063.dll=>libc063.dll \ + kBuild/bin/$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)/libc064.dll=>libc064.dll \ + kBuild/bin/$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)/libc065.dll=>libc065.dll if1of ($(KBUILD_TARGET), nt win) -kBuild_bin_SOURCES.$(KBUILD_TARGET).x86 = \ - kBuild/bin/$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)/msvcr71.dll=>msvcr71.dll -kBuild_bin_SOURCES.$(KBUILD_TARGET).amd64 = \ - kBuild/bin/$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)/Microsoft.VC80.CRT/msvcr80.dll=>Microsoft.VC80.CRT/msvcr80.dll \ - kBuild/bin/$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)/Microsoft.VC80.CRT/Microsoft.VC80.CRT.manifest=>Microsoft.VC80.CRT/Microsoft.VC80.CRT.manifest +kBuild_bin_SOURCES.$(KBUILD_TARGET) = \ + kBuild/bin/$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)/msvcr100.dll kBuild_bin_SOURCES.profile = \ D:/coding/kStuff/svn/trunk/out/win.$(KBUILD_TARGET_ARCH)/release/kStuff/bin/kPrf2.dll \ D:/coding/kStuff/svn/trunk/out/win.$(KBUILD_TARGET_ARCH)/release/kStuff/bin/kPrf2WinApiWrappers.dll |