m/grafX2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add libtiff-5.dll to install.

Browse Source
This commit is contained in:
Thomas Bernard 2018-11-30 19:10:36 +01:00
parent 775a594858
commit 4eead5974d
No known key found for this signature in database
GPG Key ID: 0FF11B67A5C0863C
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
3rdparty/Makefile vendored
View File

@ -174,6 +174,9 @@ $(PREFIX)/lib/libtiff.a: $(LIBTIFF)/.ok
--with-jpeg-include-dir=$(PREFIX)/include --with-jpeg-lib-dir=$(PREFIX)/lib --with-jpeg-include-dir=$(PREFIX)/include --with-jpeg-lib-dir=$(PREFIX)/lib
cd $(LIBTIFF) && $(MAKE) cd $(LIBTIFF) && $(MAKE)
cd $(LIBTIFF) && $(MAKE) install cd $(LIBTIFF) && $(MAKE) install
ifdef WIN32CROSS
$(CP) $(PREFIX)/bin/libtiff*.dll ../bin
endif
$(LIBTIFF)/.ok: archives/$(LIBTIFFARCH) $(LIBTIFF)/.ok: archives/$(LIBTIFFARCH)
$(TAR) xzf $< $(TAR) xzf $<

3
install/WinInstaller.nsi
View File

@ -9,6 +9,7 @@
!define FREETYPEDLL libfreetype-6.dll !define FREETYPEDLL libfreetype-6.dll
!define JPEGDLL libjpeg-9.dll !define JPEGDLL libjpeg-9.dll
!define PNGDLL libpng16-16.dll !define PNGDLL libpng16-16.dll
!define TIFFDLL libtiff-5.dll
;-------------------------------- ;--------------------------------
;Include Modern UI ;Include Modern UI
@ -101,6 +102,7 @@ Section "Grafx2" SecProgram
File ..\bin\${JPEGDLL} File ..\bin\${JPEGDLL}
File ..\bin\zlib1.dll File ..\bin\zlib1.dll
File ..\bin\${PNGDLL} File ..\bin\${PNGDLL}
File ..\bin\${TIFFDLL}
SetOutPath "$INSTDIR\share\grafx2" SetOutPath "$INSTDIR\share\grafx2"
File ..\share\grafx2\gfx2.gif File ..\share\grafx2\gfx2.gif
File ..\share\grafx2\gfx2def.ini File ..\share\grafx2\gfx2def.ini
@ -197,6 +199,7 @@ Section "un.SecProgram"
Delete "$INSTDIR\bin\${FREETYPEDLL}" Delete "$INSTDIR\bin\${FREETYPEDLL}"
Delete "$INSTDIR\bin\zlib1.dll" Delete "$INSTDIR\bin\zlib1.dll"
Delete "$INSTDIR\bin\${PNGDLL}" Delete "$INSTDIR\bin\${PNGDLL}"
Delete "$INSTDIR\bin\${TIFFDLL}"
Delete "$INSTDIR\bin\stdout.txt" Delete "$INSTDIR\bin\stdout.txt"
Delete "$INSTDIR\bin\stderr.txt" Delete "$INSTDIR\bin\stderr.txt"
RMDir "$INSTDIR\bin" RMDir "$INSTDIR\bin"