diff options
| author | dcommander <dcommander@632fc199-4ca6-4c93-a231-07263d6284db> | 2010-02-24 07:24:26 +0000 |
|---|---|---|
| committer | dcommander <dcommander@632fc199-4ca6-4c93-a231-07263d6284db> | 2010-02-24 07:24:26 +0000 |
| commit | 701a83c9e4591aaa3543abb8b5ebf93105a43aaa (patch) | |
| tree | 7817a4a57d173340214e9f959e30ce7d6fb35f0c /win | |
| parent | d249abbaa6baf116a97ea7facae5aee08838ae3d (diff) | |
Visual C++ libraries can't be made to work with MinGW because of the dependency on msvcr90.dll, so build a separate installer for MinGW libraries
git-svn-id: svn://svn.code.sf.net/p/libjpeg-turbo/code/trunk@151 632fc199-4ca6-4c93-a231-07263d6284db
Diffstat (limited to 'win')
| -rwxr-xr-x | win/Makefile | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/win/Makefile b/win/Makefile index 4fdd58f..382857c 100755 --- a/win/Makefile +++ b/win/Makefile @@ -229,15 +229,11 @@ $(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) //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 // + makensis -nocd -DVERSION=$(VERSION) -DAPPNAME=libjpeg-turbo \ + -DWLIBDIR=windows -DWSRCDIR=. -DWBLDDIR=windows -DWHDRDIR=win \ + -DPLATFORM="Visual C++" release/libjpeg-turbo.nsi test: testclean $(ODIR)/cjpeg.exe $(ODIR)/djpeg.exe $(ODIR)/jpegtran.exe \ |