aboutsummaryrefslogtreecommitdiffstats
path: root/win32
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2010-06-20 17:01:15 -0700
committerH. Peter Anvin <hpa@zytor.com>2010-06-20 17:07:52 -0700
commit2ef260d392537d22c927735e6b9e78b02d36bb7b (patch)
tree2613b5e58834702827a0523df98b2fc24683f9b2 /win32
parent8cf2a1fb42a61f6d19afee86f52ff260fabd1cfa (diff)
downloadsyslinux-2ef260d392537d22c927735e6b9e78b02d36bb7b.tar.gz
syslinux-2ef260d392537d22c927735e6b9e78b02d36bb7b.tar.xz
syslinux-2ef260d392537d22c927735e6b9e78b02d36bb7b.zip
Merge syslinux/extlinux patch code and core code
Merge the SYSLINUX and EXTLINUX patching code and core code, removing EXTLINUX as a separate derivative. All the disk-based systems now use the same code. Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'win32')
-rw-r--r--win32/Makefile1
-rw-r--r--win32/syslinux.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/win32/Makefile b/win32/Makefile
index a0be1d46..af95b2e6 100644
--- a/win32/Makefile
+++ b/win32/Makefile
@@ -45,6 +45,7 @@ WINCC_IS_GOOD := $(shell $(WINCC) $(WINCFLAGS) $(WINLDFLAGS) -o hello.exe hello.
.SUFFIXES: .c .o .i .s .S
SRCS = syslinux.c \
+ ../libinstaller/fat.c \
../libinstaller/syslxmod.c \
../libinstaller/bootsect_bin.c \
../libinstaller/ldlinux_bin.c \
diff --git a/win32/syslinux.c b/win32/syslinux.c
index bd042739..297b97b5 100644
--- a/win32/syslinux.c
+++ b/win32/syslinux.c
@@ -433,7 +433,7 @@ int main(int argc, char *argv[])
/*
* Patch ldlinux.sys and the boot sector
*/
- syslinux_patch(sectors, nsectors, stupid, raid_mode, subdir);
+ syslinux_patch(sectors, nsectors, stupid, raid_mode, subdir, NULL);
/*
* Rewrite the file