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

support both libtiff-5.dll and libtiff-6.dll

Browse Source
This commit is contained in:
Thomas Bernard 2023-01-21 20:24:54 +01:00
parent a121977c42
commit 0f762fb360
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
install/WinInstaller.nsi
View File

@ -7,7 +7,11 @@
!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
!if /FileExists ..\bin\libtiff-5.dll
!define TIFFDLL libtiff-5.dll !define TIFFDLL libtiff-5.dll
!else if /FileExists ..\bin\libtiff-6.dll
!define TIFFDLL libtiff-6.dll
!endif
;-------------------------------- ;--------------------------------
;Include Modern UI ;Include Modern UI

4
src/Makefile
View File

@ -146,7 +146,7 @@ ifdef COMSPEC
PLATFORM = win32 PLATFORM = win32
#some misc files we have to add to the release archive under windows. #some misc files we have to add to the release archive under windows.
PLATFORMFILES += $(wildcard ../bin/libpng*.dll) $(wildcard ../bin/libjpeg*.dll) bin/zlib1.dll $(TTFLIBS) PLATFORMFILES += $(wildcard ../bin/libpng*.dll) $(wildcard ../bin/libjpeg*.dll) bin/zlib1.dll $(TTFLIBS)
PLATFORMFILES += bin/libtiff-5.dll PLATFORMFILES += $(wildcard ../bin/libtiff-*.dll)
ifdef APPVEYOR ifdef APPVEYOR
ZIP = 7z ZIP = 7z
ZIPOPT = a ZIPOPT = a
@ -534,7 +534,7 @@ endif
PLATFORM = win32 PLATFORM = win32
PLATFORMOBJ = winres.o PLATFORMOBJ = winres.o
PLATFORMFILES = $(wildcard ../bin/libpng*.dll) $(wildcard ../bin/libjpeg*.dll) bin/zlib1.dll $(TTFLIBS) PLATFORMFILES = $(wildcard ../bin/libpng*.dll) $(wildcard ../bin/libjpeg*.dll) bin/zlib1.dll $(TTFLIBS)
PLATFORMFILES += bin/libtiff-5.dll PLATFORMFILES += $(wildcard ../bin/libtiff-*.dll)
ifeq ($(API),sdl) ifeq ($(API),sdl)
PLATFORMFILES += bin/SDL.dll bin/SDL_image.dll PLATFORMFILES += bin/SDL.dll bin/SDL_image.dll
endif endif