From c32b0d164e5eb1b1237847e3e5e11ea46754b71c Mon Sep 17 00:00:00 2001 From: Guenter Knauf Date: Wed, 18 Aug 2010 17:22:33 +0200 Subject: [PATCH] Fixed Win32 makefile which was now broken at resource build. --- win32/Makefile.win32 | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/win32/Makefile.win32 b/win32/Makefile.win32 index c6a24ce..4bd2b66 100644 --- a/win32/Makefile.win32 +++ b/win32/Makefile.win32 @@ -65,6 +65,7 @@ else endif CP = cp -afv # RM = rm -f +MD = mkdir # Here you can find a native Win32 binary of the original awk: # http://www.gknw.net/development/prgtools/awk-20070501.zip AWK = awk @@ -98,7 +99,7 @@ LIBEXT = a RANLIB = $(CROSSPREFIX)ranlib #LDLIBS += -lwsock32 LDLIBS += -lws2_32 -RCFLAGS = -O coff -i +RCFLAGS = -DLIBSSH2_VERSION_ONLY -I. -I ../include -O coff -i CFLAGS += -fno-strict-aliasing CFLAGS += -Wall # -pedantic endif @@ -123,7 +124,8 @@ ifeq ($(findstring /sh,$(SHELL)),/sh) DL = ' DS = / else -DS = \\ +XX = +DS = $(XX)\$(XX) endif vpath %.c . ../src @@ -198,13 +200,13 @@ clean: -$(RM) -r $(OBJDIR) $(OBJDIR): - @mkdir $@ + @$(MD) $@ $(DISTDIR): - @mkdir $@ + @$(MD) $@ $(DEVLDIR): - @mkdir $@ + @$(MD) $@ $(TARGET).$(LIBEXT): $(OBJS) @echo Creating $@ @@ -222,7 +224,7 @@ $(TARGET).dll $(TARGET)dll.a: $(OBJL) $(OBJDIR)/%.res: %.rc @echo Creating $@ - @$(RC) $(RCFLAGS) -DLIBSSH2_VERSION_ONLY -I. -I ../include $< -o $@ + @$(RC) $(RCFLAGS) $< -o $@ $(DISTDIR)/readme.txt: Makefile.win32