diff options
| author | dcommander <dcommander@3789f03b-4d11-0410-bbf8-ca57d06f2519> | 2010-02-24 07:24:26 +0000 |
|---|---|---|
| committer | dcommander <dcommander@3789f03b-4d11-0410-bbf8-ca57d06f2519> | 2010-02-24 07:24:26 +0000 |
| commit | 69de3011e09e5d5ee5a319663c6324b1661ad6df (patch) | |
| tree | d24645ca15cf4ca1b7bb53ac21fae0132c52af9c /trunk/win | |
| parent | 0caccbe88d69dad2d3c3fb890ecf23b8cf70e9de (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: https://libjpeg-turbo.svn.sourceforge.net/svnroot/libjpeg-turbo@151 3789f03b-4d11-0410-bbf8-ca57d06f2519
Diffstat (limited to 'trunk/win')
| -rwxr-xr-x | trunk/win/Makefile | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/trunk/win/Makefile b/trunk/win/Makefile index 4fdd58f..382857c 100755 --- a/trunk/win/Makefile +++ b/trunk/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 \ |