projects
/
idzebra-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make sure DISPLAY is unset for inkscape processing.
[idzebra-moved-to-github.git]
/
win
/
zebra.nsi
diff --git
a/win/zebra.nsi
b/win/zebra.nsi
index
dbcf924
..
ef5767f
100644
(file)
--- a/
win/zebra.nsi
+++ b/
win/zebra.nsi
@@
-1,13
+1,16
@@
-; $Id: zebra.nsi,v 1.39 2007-01-24 15:23:59 adam Exp $
+; $Id: zebra.nsi,v 1.50 2008-03-05 09:29:10 adam Exp $
-!define VERSION "2.0.10"
+!define VERSION "2.0.28"
; VS 2005
; !define VS_RUNTIME_DLL "c:\Program Files\Microsoft Visual Studio 8\VC\redist\x86\Microsoft.VC80.CRT\msvcr80.dll"
; !define VS_RUNTIME_MANIFEST "c:\Program Files\Microsoft Visual Studio 8\VC\redist\x86\Microsoft.VC80.CRT\Microsoft.VC80.CRT.manifest"
; VS 2003
; VS 2005
; !define VS_RUNTIME_DLL "c:\Program Files\Microsoft Visual Studio 8\VC\redist\x86\Microsoft.VC80.CRT\msvcr80.dll"
; !define VS_RUNTIME_MANIFEST "c:\Program Files\Microsoft Visual Studio 8\VC\redist\x86\Microsoft.VC80.CRT\Microsoft.VC80.CRT.manifest"
; VS 2003
-!define VS_RUNTIME_DLL "c:\Program files\Microsoft Visual Studio .NET 2003\SDK\v1.1\Bin\msvcr71.dll"
+; !define VS_RUNTIME_DLL "c:\Program files\Microsoft Visual Studio .NET 2003\SDK\v1.1\Bin\msvcr71.dll"
+
+; VS 6.0
+; (no defines)
!include "MUI.nsh"
!include "MUI.nsh"
@@
-75,17
+78,25
@@
SectionEnd ; end of default section
Section "Zebra Runtime"
SectionIn 1 2
SetOutPath $INSTDIR\bin
Section "Zebra Runtime"
SectionIn 1 2
SetOutPath $INSTDIR\bin
+!ifdef VS_RUNTIME_DLL
File "${VS_RUNTIME_DLL}"
File "${VS_RUNTIME_DLL}"
-; File "${VS_RUNTIME_MANIFEST}"
+!endif
+!ifdef VS_RUNTIME_MANIFEST
+ File "${VS_RUNTIME_MANIFEST}"
+ File ..\bin\*.manifest
+!endif
File ..\bin\*.exe
File ..\bin\*.exe
-; File ..\bin\*.manifest
File ..\bin\idzebra.dll
File ..\bin\iconv.dll
File ..\bin\zlib1.dll
File ..\bin\libxml2.dll
File ..\bin\libxslt.dll
File ..\bin\idzebra.dll
File ..\bin\iconv.dll
File ..\bin\zlib1.dll
File ..\bin\libxml2.dll
File ..\bin\libxslt.dll
- File ..\bin\yaz.dll
+ File ..\bin\yaz3.dll
File ..\bin\libexpat.dll
File ..\bin\libexpat.dll
+ File ..\bin\icudt38.dll
+ File ..\bin\icuin38.dll
+ File ..\bin\icuuc38.dll
+ File ..\bin\yaz_icu3.dll
SectionEnd
Section "Zebra Development"
SectionEnd
Section "Zebra Development"