summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBob Friesenhahn <bfriesen@simple.dallas.tx.us>2020-01-28 08:16:05 -0600
committerBob Friesenhahn <bfriesen@simple.dallas.tx.us>2020-01-28 08:16:05 -0600
commited3b07c4e214795931f8ab67cfe4be13755fa8f8 (patch)
tree770394668ff759f54501a20660ab6a15d5d2315a
parent550f8708d25b913333052cb5c6d3d75f1afdff39 (diff)
downloadlibtiff-git-ed3b07c4e214795931f8ab67cfe4be13755fa8f8.tar.gz
Make sure that tif_config.h is produced prior to entering the port
directory and add an include path so that the port files can include tif_config.h. Do not actually include tif_config.h at this time since CMake and Autotools builds are not prepared for that. This issue could be handled by updating the CMake and Autotools builds or by adding a define which directs libport.h to include tif_config.h.
-rw-r--r--Makefile.vc3
-rw-r--r--port/Makefile.vc2
2 files changed, 5 insertions, 0 deletions
diff --git a/Makefile.vc b/Makefile.vc
index 6e66c730..eeb5d04d 100644
--- a/Makefile.vc
+++ b/Makefile.vc
@@ -31,6 +31,9 @@
all: port lib tools
port::
+ cd libtiff
+ $(MAKE) /f Makefile.vc tif_config.h
+ cd..
cd port
$(MAKE) /f Makefile.vc
cd..
diff --git a/port/Makefile.vc b/port/Makefile.vc
index 501f7d74..6122b192 100644
--- a/port/Makefile.vc
+++ b/port/Makefile.vc
@@ -55,6 +55,8 @@ EXTRAFLAGS = -DHAVE_STRTOULL $(EXTRAFLAGS)
STRTOULL_OBJ = strtoull.obj
!ENDIF
+INCL = -I..\libtiff
+
OBJ = \
snprintf.obj \
strcasecmp.obj \