From 0773fdd000807ca0ff3047c6b3edfebb575b154d Mon Sep 17 00:00:00 2001 From: dcommander Date: Tue, 23 Feb 2010 22:56:05 +0000 Subject: Fix Windows package script to accommodate new output directory for VC build git-svn-id: svn://svn.code.sf.net/p/libjpeg-turbo/code/trunk@147 632fc199-4ca6-4c93-a231-07263d6284db --- win/Makefile | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'win/Makefile') diff --git a/win/Makefile b/win/Makefile index 41aa5f5..4fdd58f 100755 --- a/win/Makefile +++ b/win/Makefile @@ -229,10 +229,15 @@ $(ODIR)/jpegut.exe: $(ODIR)/jpegut.obj $(ODIR)/turbojpeg.lib $(LINK) $(LDFLAGS) -out:$@ $^ +WINSTDIR=c:\\libjpeg-turbo +WSRCDIR=windows + dist: all $(RM) $(ODIR)/libjpeg-turbo.exe - makensis /nocd //DVERSION=$(VERSION) release/libjpeg-turbo.nsi || \ - makensis /nocd /DVERSION=$(VERSION) release/libjpeg-turbo.nsi # Cygwin doesn't like the // + makensis /nocd //DVERSION=$(VERSION) //DWINSTDIR=$(WINSTDIR) \ + //DWSRCDIR=$(WSRCDIR) release/libjpeg-turbo.nsi || \ + makensis /nocd /DVERSION=$(VERSION) /DWINSTDIR=$(WINSTDIR) \ + /DWSRCDIR=$(WSRCDIR) release/libjpeg-turbo.nsi # Cygwin doesn't like the // test: testclean $(ODIR)/cjpeg.exe $(ODIR)/djpeg.exe $(ODIR)/jpegtran.exe \ -- cgit v1.2.3