diff options
| author | Liu Aleaxander <Aleaxander@gmail.com> | 2009-06-23 17:59:06 +0800 |
|---|---|---|
| committer | Liu Aleaxander <Aleaxander@gmail.com> | 2009-06-23 17:59:06 +0800 |
| commit | 58f6a16188b761a0512c807ce8fe88d99890e276 (patch) | |
| tree | 2eee331751a0f6fbc0021b4cf4b19492a40a24d6 /core/Makefile | |
| parent | c757a46143e82b51e15d1c0428ad841f6ad48f02 (diff) | |
| parent | 39f7aaa7b65411159316836e4294592eaf1c4d70 (diff) | |
| download | syslinux-58f6a16188b761a0512c807ce8fe88d99890e276.tar.gz | |
Merge branch 'isolinux'
Conflicts:
core/Makefile
core/diskstart.inc
core/fs.c
Diffstat (limited to 'core/Makefile')
| -rw-r--r-- | core/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/core/Makefile b/core/Makefile index c2238972..1cb11706 100644 --- a/core/Makefile +++ b/core/Makefile @@ -34,7 +34,8 @@ CODEPAGE = cp865 # The targets to build in this directory... BTARGET = kwdhash.gen \ extlinux.bin extlinux.bss extlinux.sys \ - ldlinux.bss ldlinux.sys ldlinux.bin + ldlinux.bss ldlinux.sys ldlinux.bin \ + isolinux.bin isolinux-debug.bin # All primary source files for the main syslinux files NASMSRC := $(wildcard *.asm) |