cheng/libtiff
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix Cmake build issues caused by Windows large file updates.

Browse Source
This commit is contained in:
Bob Friesenhahn 2015-08-21 01:59:33 +00:00
parent 8ba4a1c894
commit c65c70205c
4 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -397,6 +397,10 @@ int main(void) {
}" }"
HAVE_SNPRINTF) HAVE_SNPRINTF)
if(NOT HAVE_SNPRINTF)
add_definitions(-DNEED_LIBPORT)
endif()
# CPU bit order # CPU bit order
set(fillorder FILLORDER_MSB2LSB) set(fillorder FILLORDER_MSB2LSB)
if(CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "i.*86.*" OR if(CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "i.*86.*" OR

6
ChangeLog
View File

@ -1,3 +1,9 @@
2015-08-20 Bob Friesenhahn <bfriesen@simple.dallas.tx.us>
* tools/CMakeLists.txt, port/snprintf.c: Patch by Roger Leigh to
fix build issues when using Cmake due to Windows large file
changes.
2015-08-18 Bob Friesenhahn <bfriesen@simple.dallas.tx.us> 2015-08-18 Bob Friesenhahn <bfriesen@simple.dallas.tx.us>
* libtiff/tiffiop.h: First cut at supporting large files under * libtiff/tiffiop.h: First cut at supporting large files under

4
port/snprintf.c
View File

@ -11,7 +11,7 @@
#include <stdarg.h> #include <stdarg.h>
#include "libport.h" #include "libport.h"
int vsnprintf(char* str, size_t size, const char* format, va_list ap) int _TIFF_vsnprintf_f(char* str, size_t size, const char* format, va_list ap)
{ {
int count = -1; int count = -1;
@ -23,7 +23,7 @@ int vsnprintf(char* str, size_t size, const char* format, va_list ap)
return count; return count;
} }
int snprintf(char* str, size_t size, const char* format, ...) int _TIFF_snprintf_f(char* str, size_t size, const char* format, ...)
{ {
int count; int count;
va_list ap; va_list ap;

1
tools/CMakeLists.txt
View File

@ -26,6 +26,7 @@ extra_dist(Makefile.vc)
include_directories(${PROJECT_SOURCE_DIR}/libtiff include_directories(${PROJECT_SOURCE_DIR}/libtiff
${PROJECT_BINARY_DIR}/libtiff ${PROJECT_BINARY_DIR}/libtiff
${PROJECT_SOURCE_DIR}/port
${CMAKE_CURRENT_BINARY_DIR}) ${CMAKE_CURRENT_BINARY_DIR})
add_executable(bmp2tiff bmp2tiff.c) add_executable(bmp2tiff bmp2tiff.c)