diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2017-01-24 23:34:04 +0100 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2017-01-25 12:58:28 +0100 |
| commit | be5a6457a8a4523b8b731244da34b2fadcd6fd8e (patch) | |
| tree | 57eaa07c3e598cf90d37c400d315388224c4657b /windows | |
| parent | 5580322ec95f723c4ffc1c0c3d840294b942ccba (diff) | |
| download | libgd-be5a6457a8a4523b8b731244da34b2fadcd6fd8e.tar.gz | |
Enable libtiff support on Windows
Diffstat (limited to 'windows')
| -rw-r--r-- | windows/Makefile.vc | 8 | ||||
| -rw-r--r-- | windows/gentest.bat | 6 | ||||
| -rw-r--r-- | windows/readme.md | 6 |
3 files changed, 13 insertions, 7 deletions
diff --git a/windows/Makefile.vc b/windows/Makefile.vc index c4cdce1..73a155e 100644 --- a/windows/Makefile.vc +++ b/windows/Makefile.vc @@ -97,7 +97,7 @@ LIB_OBJS= \ $(LIBGD_OBJ_DIR)\gd_webp.obj LIBS=kernel32.lib ole32.lib user32.lib advapi32.lib shell32.lib ws2_32.lib Dnsapi.lib Gdi32.Lib -LIBS_GD=libjpeg_a.lib freetype_a.lib libpng_a.lib libiconv_a.lib zlib_a.lib libwebp_a.lib libxpm_a.lib +LIBS_GD=libjpeg_a.lib freetype_a.lib libpng_a.lib libiconv_a.lib zlib_a.lib libwebp_a.lib libxpm_a.lib libtiff.lib INCLUDES=/Isrc /I$(WITH_DEVEL)\include -I$(WITH_DEVEL)\include\libpng16 -I$(WITH_DEVEL)\include\freetype -I$(WITH_DEVEL)\include\freetype2 /Itests /Itests\gdtest -I$(WITH_DEVEL)\include\ @@ -126,6 +126,7 @@ CFLAGS= $(CFLAGS) \ /DHAVE_LIBWEBP=1\ /DHAVE_LIBZ=1\ /DHAVE_LIBXPM=1\ + /DHAVE_LIBTIFF=1\ $(INCLUDES) TEST_CFLAGS=$(CFLAGS) @@ -191,7 +192,10 @@ make_dirs: @echo #endif>> $(GD_CONFIG_H) @echo #ifndef HAVE_SYS_STAT_H>> $(GD_CONFIG_H) @echo #define HAVE_SYS_STAT_H>> $(GD_CONFIG_H) - @echo #endif>> $(GD_CONFIG_H) + @echo #endif>> $(GD_CONFIG_H) + @echo #ifndef HAVE_LIBTIFF>> $(GD_CONFIG_H) + @echo #define HAVE_LIBTIFF>> $(GD_CONFIG_H) + @echo #endif>> $(GD_CONFIG_H) run_tests: pretest @cd $(TDR) diff --git a/windows/gentest.bat b/windows/gentest.bat index 2908a3e..f57d08b 100644 --- a/windows/gentest.bat +++ b/windows/gentest.bat @@ -15,19 +15,19 @@ copy NUL !TESTMK! > nul copy NUL !TESTLIST! > nul
for /D %%d in (!testsdir!/*) do (
- if NOT "%%d"=="fontconfig" if NOT "%%d"=="gdtest" if NOT "%%d"=="tiff" for %%f in (!testsdir!/%%d/*.c) do (
+ if NOT "%%d"=="fontconfig" if NOT "%%d"=="gdtest" for %%f in (!testsdir!/%%d/*.c) do (
echo TEST_EXES=!builddir!\tests\%%d_%%~nf.exe ^$^(TEST_EXES^) >> !TESTMK!
)
)
for /D %%d in (!testsdir!/*) do (
- if NOT "%%d"=="fontconfig" if NOT "%%d"=="gdtest" if NOT "%%d"=="tiff" for %%f in (!testsdir!/%%d/*.c) do (
+ if NOT "%%d"=="fontconfig" if NOT "%%d"=="gdtest" for %%f in (!testsdir!/%%d/*.c) do (
echo !builddir!\%%d_%%~nf.obj: !testsdir!\%%d\%%f; ^$^(CC^) ^$^(TEST_CFLAGS^) /c ^$** /Fd$*.pdb /Fo:$@ >> !TESTMK!
)
)
for /D %%d in (!testsdir!/*) do (
- if NOT "%%d"=="fontconfig" if NOT "%%d"=="gdtest" if NOT "%%d"=="tiff" for %%f in (!testsdir!/%%d/*.c) do (
+ if NOT "%%d"=="fontconfig" if NOT "%%d"=="gdtest" for %%f in (!testsdir!/%%d/*.c) do (
echo !builddir!\tests\%%d_%%~nf.exe: !builddir!\%%d_%%~nf.obj; !LD! !LDFLAGS! $** /out:$@ >> !TESTMK!
echo %%d_%%~nf.exe >> !TESTLIST!
)
diff --git a/windows/readme.md b/windows/readme.md index ce6da45..e9b8217 100644 --- a/windows/readme.md +++ b/windows/readme.md @@ -1,13 +1,15 @@ # Building on Windows with Visual Studio 2015
* Get the required dependencies from
- http://windows.php.net/downloads/php-sdk/deps/vc14/. Choose the x86 or x64
- packages depending on your needs.
+ http://windows.php.net/downloads/php-sdk/deps/vc14/ and
+ http://windows.php.net/downloads/pecl/deps/, respectively. Choose the x86 or
+ x64 packages depending on your needs.
* freetype
* libiconv
* libjpeg
* libpng
+ * libtiff
* libwebp
* libxpm
* zlib
|