third_party/exiv2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Changes to compile on MinGW.

Browse Source
This commit is contained in:
Andreas Huggel 2007-10-20 23:57:10 +00:00
parent 24e9e36713
commit c23fe2cf76
4 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/config.mk.in
View File

@ -94,7 +94,7 @@ ENABLE_XMP = @ENABLE_XMP@
ifdef ENABLE_XMP
XMPSDK_LIBRARY = xmpsdk
XMPSDK_DIR = $(top_srcdir)/xmpsdk
XMPSDK_CPPFLAGS = -DUNIX_ENV -I$(XMPSDK_DIR)/include
XMPSDK_CPPFLAGS = -I$(XMPSDK_DIR)/include
XMPSDK_LDFLAGS = -L$(XMPSDK_DIR)/src
XMPSDK_LIBS = -l$(XMPSDK_LIBRARY)
else

5
test/xmpparser-test.sh
View File

@ -65,10 +65,11 @@ $exiv2 -v -px exiv2-empty.jpg
# ----------------------------------------------------------------------
# Evaluate results
diff -q $diffargs $results $good
cat $results | tr -d '\r' > $results-stripped
diff -q $diffargs $results-stripped $good
rc=$?
if [ $rc -eq 0 ] ; then
echo "All testcases passed."
else
diff $diffargs $results $good
diff $diffargs $results-stripped $good
fi

16
xmpsdk/include/XMP_Environment.h
View File

@ -34,6 +34,22 @@
/* requires these to be defined without values, they are only used here to define XMP-specific */
/* macros with 0 or 1 values. */
/* 20-Oct-07, ahu: Determine the platform, set the above defines accordingly. */
#define _FILE_OFFSET_BITS 64
#if defined __CYGWIN32__ && !defined __CYGWIN__
/* For backwards compatibility with Cygwin b19 and
earlier, we define __CYGWIN__ here, so that
we can rely on checking just for that macro. */
# define __CYGWIN__ __CYGWIN32__
#endif
#if defined WIN32 && !defined __CYGWIN__
# define WIN_ENV 1
#elif 0
/* Todo: How to determine MAC_ENV ? */
#else
# define UNIX_ENV 1
#endif
/* ! Tempting though it might be to have a standard macro for big or little endian, there seems */
/* ! to be no decent way to do that on our own in UNIX. Forcing it on the client isn't acceptable. */

2
xmpsdk/src/Makefile
View File

@ -85,7 +85,7 @@ SHELL = /bin/sh
.PRECIOUS: %.cpp
# For a debug build, replace -DNDEBUG=1 with -DDEBUG=1 -D_DEBUG=1
CPPFLAGS += -I../include -funsigned-char -DUNIX_ENV=1 -DXMP_IMPL=1 -DXMP_ClientBuild=0 -D_FILE_OFFSET_BITS=64 -DHAVE_EXPAT_CONFIG_H=1 -DXML_STATIC=1 -DNDEBUG=1 $(EXPAT_CPPFLAGS)
CPPFLAGS += -I../include -funsigned-char -DNDEBUG=1 $(EXPAT_CPPFLAGS)
LDFLAGS += $(EXPAT_LDFLAGS)
LIBS += $(EXPAT_LIBS)