From 94831068fb5573b1ebdb9def9c2ad09f0694d45c Mon Sep 17 00:00:00 2001 From: Simon Tatham Date: Sat, 13 May 2017 20:10:55 +0100 Subject: Build a Windows halibut.exe using clang-cl. Or rather, clang in MS-targeted code generation but still with the Unix-style command line, which lets me use the existing Makefile with almost no change. --- Makefile | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index c9499e4..7402323 100644 --- a/Makefile +++ b/Makefile @@ -76,7 +76,9 @@ CFLAGS += -DLOGALLOC LIBS += -lefence endif -all: halibut +EXE =# + +all: halibut$(EXE) SRC := ../ @@ -91,6 +93,7 @@ LIBCHARSET_GENPFX = charset-# MD = -MD CFLAGS += -I$(LIBCHARSET_SRCDIR) -I$(LIBCHARSET_OBJDIR) include $(LIBCHARSET_SRCDIR)Makefile +CC_LINK = $(CC) -o $@ MODULES := main malloc ustring error help licence version misc tree234 MODULES += input in_afm in_pf in_sfnt keywords contents index biblio @@ -100,8 +103,8 @@ MODULES += winhelp winchm deflate lzx lz77 huffman psdata wcwidth OBJECTS := $(addsuffix .o,$(MODULES)) $(LIBCHARSET_OBJS) DEPS := $(addsuffix .d,$(MODULES)) -halibut: $(OBJECTS) - $(CC) $(LFLAGS) -o halibut $(OBJECTS) $(LIBS) +halibut$(EXE): $(OBJECTS) + $(CC_LINK) $(LFLAGS) $(OBJECTS) $(LIBS) %.o: $(SRC)%.c $(CC) $(CFLAGS) -MD -c $< -- cgit v1.1