aboutsummaryrefslogtreecommitdiffstats
path: root/win32
diff options
context:
space:
mode:
authorMatt Fleming <matt.fleming@intel.com>2012-11-05 13:13:25 +0000
committerMatt Fleming <matt.fleming@intel.com>2012-11-05 13:21:04 +0000
commit0b26e59c8f5dc7a8a124a033a78e08c7a2028bcd (patch)
tree9a892c852fabd0a75d10c856105b4488cc87f66c /win32
parentcdeba8ac82f529a3a4a544c4e8346887ef81cb74 (diff)
parentb210bd5bfd0d7182b0a65f507c7557eeb90d5b16 (diff)
downloadsyslinux-0b26e59c8f5dc7a8a124a033a78e08c7a2028bcd.tar.gz
syslinux-0b26e59c8f5dc7a8a124a033a78e08c7a2028bcd.tar.xz
syslinux-0b26e59c8f5dc7a8a124a033a78e08c7a2028bcd.zip
Merge tag 'syslinux-5.00-pre9' into for-hpa/elflink/firmware
This merge also includes the Syslinux-4.06 release. Conflicts: Makefile com32/hdt/Makefile com32/modules/Makefile com32/samples/hello.c mtools/Makefile
Diffstat (limited to 'win32')
-rw-r--r--win32/Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/win32/Makefile b/win32/Makefile
index 943a966a..a417a4b8 100644
--- a/win32/Makefile
+++ b/win32/Makefile
@@ -57,6 +57,7 @@ LIBSRC = ../libinstaller/fs.c \
../libinstaller/getopt/getopt_long.c \
../libinstaller/bootsect_bin.c \
../libinstaller/ldlinux_bin.c \
+ ../libinstaller/ldlinuxc32_bin.c \
../libinstaller/mbr_bin.c \
$(wildcard $(SRC)/../libfat/*.c)
LIBOBJS = $(patsubst %.c,%.obj,$(notdir $(LIBSRC)))