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

git-svn-id: svn+ssh://svn.code.sf.net/p/libjpeg-turbo/code/trunk@147 632fc199-4ca6-4c93-a231-07263d6284db

diff --git a/release/libjpeg-turbo.nsi b/release/libjpeg-turbo.nsi
index 24cf3fdb6fefcbd4e850c929d96620eacde4d561..61923b59ab1b40e4ce309b7257c47d7f70a74986 100644 (file)
--- a/release/libjpeg-turbo.nsi
+++ b/release/libjpeg-turbo.nsi
@@ -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"

diff --git a/win/Makefile b/win/Makefile
index 41aa5f585ab5910ad92d8b4975a2739f730d9c8f..4fdd58faa09b5af49b94faf02fb78f884d2a96a7 100755 (executable)
--- 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 \