diff options
| author | dcommander <dcommander@3789f03b-4d11-0410-bbf8-ca57d06f2519> | 2010-02-23 22:56:05 +0000 |
|---|---|---|
| committer | dcommander <dcommander@3789f03b-4d11-0410-bbf8-ca57d06f2519> | 2010-02-23 22:56:05 +0000 |
| commit | 02d98d477575101937a30eb927143423b679425c (patch) | |
| tree | 199e3bfd73e38a1c0feade8c70e6e9cc9c723093 /trunk/win | |
| parent | a23251bef90c8d20bd927ea2ef7500ab95424e8d (diff) | |
Fix Windows package script to accommodate new output directory for VC build
git-svn-id: https://libjpeg-turbo.svn.sourceforge.net/svnroot/libjpeg-turbo@147 3789f03b-4d11-0410-bbf8-ca57d06f2519
Diffstat (limited to 'trunk/win')
| -rwxr-xr-x | trunk/win/Makefile | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/trunk/win/Makefile b/trunk/win/Makefile index 41aa5f5..4fdd58f 100755 --- a/trunk/win/Makefile +++ b/trunk/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 \ |