ryan/mozjpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix Windows package script to accommodate new output directory for VC build

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/libjpeg-turbo/code/trunk@147 632fc199-4ca6-4c93-a231-07263d6284db
This commit is contained in:
DRC
2010-02-23 22:56:05 +00:00
parent 3cd2e503c6
commit a9a7b22443
2 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
release/libjpeg-turbo.nsi
View File

@@ -1,6 +1,6 @@
Name "libjpeg-turbo SDK"
OutFile libjpeg-turbo.exe
InstallDir c:\libjpeg-turbo
OutFile ${WSRCDIR}\libjpeg-turbo.exe
InstallDir ${WINSTDIR}
SetCompressor bzip2
@@ -13,13 +13,13 @@ UninstPage instfiles
Section "libjpeg-turbo SDK (required)"
SectionIn RO
SetOutPath $SYSDIR
File "turbojpeg.dll"
File "jpeg62.dll"
File "${WSRCDIR}\turbojpeg.dll"
File "${WSRCDIR}\jpeg62.dll"
SetOutPath $INSTDIR\lib
File "turbojpeg.lib"
File "turbojpeg-static.lib"
File "jpeg.lib"
File "jpeg-static.lib"
File "${WSRCDIR}\turbojpeg.lib"
File "${WSRCDIR}\turbojpeg-static.lib"
File "${WSRCDIR}\jpeg.lib"
File "${WSRCDIR}\jpeg-static.lib"
SetOutPath $INSTDIR\include
File "win\jconfig.h"
File "jerror.h"

9
win/Makefile
View File

@@ -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 \