Update to XMP SDK 5.1.2

17 files changed, 994 insertions, 412 deletions

diff --git a/build/XMP_BuildInfo.h b/build/XMP_BuildInfo.h
index 2b387c8..6641cb3 100644
--- a/build/XMP_BuildInfo.h
+++ b/build/XMP_BuildInfo.h
@@ -1,13 +1,9 @@
 #ifndef __XMP_BuildInfo_h__
 #define __XMP_BuildInfo_h__ 1
 
-/* --------------------------------------------------------------------------------------------- */
-/* ** IMPORTANT ** This file must be usable by strict ANSI C compilers. No "//" comments, etc.   */
-/* --------------------------------------------------------------------------------------------- */
-
 /*
 // =================================================================================================
-// Copyright 2002-2008 Adobe Systems Incorporated
+// Copyright 2002 Adobe Systems Incorporated
 // All Rights Reserved.
 //
 // NOTICE:  Adobe permits you to use, modify, and distribute this file in accordance with the terms
@@ -15,8 +11,7 @@
 // =================================================================================================
 */
 
-#define kXMP_Copyright Copyright (c) 2002-2008, Adobe Systems Incorporated
-#define kXMP_CopyrightStr "Copyright (c) 2002-2008, Adobe Systems Incorporated"
-#define kXMP_AdobeIPStr "<AdobeIP#0000425>"
+#define kXMP_Copyright Copyright (c) 2002, Adobe Systems Incorporated
+#define kXMP_CopyrightStr "Copyright (c) 2002, Adobe Systems Incorporated"
 
 #endif	/* __XMP_BuildInfo_h__ */
diff --git a/build/gcc3.2/XMPCore.mak b/build/gcc3.2/XMPCore.mak
deleted file mode 100644
index d9ca7e2..0000000
--- a/build/gcc3.2/XMPCore.mak
+++ /dev/null
@@ -1,214 +0,0 @@
-# ==================================================================================================
-# Copyright 2002-2004 Adobe Systems Incorporated
-# All Rights Reserved.
-#
-# NOTICE:  Adobe permits you to use, modify, and distribute this file in accordance with the terms
-# of the Adobe license agreement accompanying it.
-# ==================================================================================================
-
-# ==================================================================================================
-
-# Define internal use variables.
-
-Error =
-TargetOS = ${OS}
-
-ifeq "${TargetOS}" ""
-	TargetOS = ${os}
-endif
-
-ifeq "${TargetOS}" ""
-	TargetOS = ${MACHTYPE}${OSTYPE}
-endif
-
-ifeq "${TargetOS}" "i386linux"	# Linux ${MACHTYPE}${OSTYPE} is i386linux.
-	TargetOS = i80386linux
-endif
-
-ifeq "${TargetOS}" "linux"
-	TargetOS = i80386linux
-endif
-
-ifeq "${TargetOS}" "solaris"
-	TargetOS = sparcsolaris
-endif
-
-ifneq "${TargetOS}" "i80386linux"
-	ifneq "${TargetOS}" "sparcsolaris"
-		Error += Invalid target OS "${TargetOS}"
-	endif
-endif
-
-TargetStage = ${STAGE}
-
-ifeq "${TargetStage}" ""
-	TargetStage = ${stage}
-endif
-
-ifeq "${TargetStage}" ""
-	TargetStage = debug
-endif
-
-ifneq "${TargetStage}" "debug"
-	ifneq "${TargetStage}" "release"
-		Error += Invalid target stage "${TargetStage}"
-	endif
-endif
-
-ifeq "${TargetStage}" "debug"
-   LibSuffix = StaticDebug
-endif
-
-ifeq "${TargetStage}" "release"
-   LibSuffix = StaticRelease
-endif
-
-BuildRoot  = ../..
-TargetRoot = ${BuildRoot}/public/libraries/${TargetOS}/${TargetStage}
-TempRoot   = ${BuildRoot}/intermediate/${TargetOS}/${TargetStage}
-
-HeaderRoot = ${BuildRoot}/public/include
-SourceRoot = ${BuildRoot}/source
-ExpatRoot  = ${BuildRoot}/third-party/expat
-MD5Root    = ${BuildRoot}/third-party/MD5
-
-LibName    = ${TargetRoot}/libXMPCore${LibSuffix}.a
-
-# ==================================================================================================
-
-CC  = gcc
-CPP = gcc -x c++
-AR  = ar -rs
-
-CPPFLAGS = -Wno-multichar -Wno-implicit -Wno-ctor-dtor-privacy -funsigned-char -fexceptions
-CPPFLAGS += -DUNIX_ENV=1 -DXMP_IMPL=1 -DXMP_ClientBuild=0 -D_FILE_OFFSET_BITS=64 -DHAVE_EXPAT_CONFIG_H=1 -DXML_STATIC=1
-
-ifeq "${TargetOS}" "i80386linux"
-	CPPFLAGS += -mtune=i686
-endif
-
-ifeq "${TargetOS}" "sparcsolaris"
-	CPPFLAGS += -mtune=ultrasparc
-endif
-
-ifeq "$(TargetStage)" "debug"
-	CPPFLAGS += -DDEBUG=1 -D_DEBUG=1 -g -O0
-endif
-
-ifeq "$(TargetStage)" "release"
-	CPPFLAGS += -DNDEBUG=1 -O2 -Os
-endif
-
-# ==================================================================================================
-
-CPPObjs = $(foreach objs,${CPPSources:.cpp=.o},${TempRoot}/$(objs))
-CCObjs  = $(foreach objs,${CCSources:.c=.o},${TempRoot}/$(objs))
-
-vpath %.incl_cpp \
-    ${HeaderRoot}: \
-    ${HeaderRoot}/client-glue:
-
-vpath %.cpp \
-    ${SourceRoot}/XMPCore: \
-    ${SourceRoot}/common: \
-    ${HeaderRoot}: \
-    ${HeaderRoot}/client-glue: \
-    ${ExpatRoot}/lib: \
-    ${MD5Root}:
-
-vpath %.c \
-    ${SourceRoot}/XMPCore: \
-    ${HeaderRoot}: \
-    ${HeaderRoot}/client-glue: \
-    ${ExpatRoot}/lib:
-
-CPPSources =  \
-    XMPMeta.cpp \
-    XMPMeta-GetSet.cpp \
-    XMPMeta-Parse.cpp \
-    XMPMeta-Serialize.cpp \
-    XMPIterator.cpp \
-    XMPUtils.cpp \
-    XMPUtils-FileInfo.cpp \
-    XMPCore_Impl.cpp \
-    ExpatAdapter.cpp \
-    ParseRDF.cpp \
-    UnicodeConversions.cpp \
-    MD5.cpp \
-    WXMPMeta.cpp \
-    WXMPIterator.cpp \
-    WXMPUtils.cpp \
-    XML_Node.cpp
-
-CCSources = \
-    xmlparse.c \
-    xmlrole.c \
-    xmltok.c
-
-Includes = \
-   -I${HeaderRoot} \
-   -I${SourceRoot}/XMPCore \
-   -I${SourceRoot}/common \
-   -I${BuildRoot}/build \
-   -I${BuildRoot}/build/gcc3.2/${TargetOS} \
-   -I${ExpatRoot}/lib \
-   -I${MD5Root}
-
-.SUFFIXES:                # Delete the default suffixes
-.SUFFIXES: .o .c .cpp     # Define our suffix list
-
-# ==================================================================================================
-
-${TempRoot}/%.o : %.c
-	@echo ""
-	@echo "Compiling $<"
-	${CC} ${CPPFLAGS} ${Includes} -c $< -o $@
-
-${TempRoot}/%.o : %.cpp
-	@echo ""
-	@echo "Compiling $<"
-	${CPP} ${CPPFLAGS} ${Includes} -c $< -o $@
-
-# ==================================================================================================
-
-.PHONY: all msg create_dirs
-
-all : msg create_dirs ${LibName}
-
-msg :
-ifeq "${Error}" ""
-	@echo ""
-	@echo Building XMP toolkit for ${TargetOS} ${TargetStage}
-else
-	@echo ""
-	@echo "Error: ${Error}"
-	@echo ""
-	@echo "# To build the XMP Toolkit :"
-	@echo "#   make -f XMPCore.mak [OS=<os>] [STAGE=<stage>]"
-	@echo "# where"
-	@echo "#   OS    = i80386linux | sparcsolaris"
-	@echo "#   STAGE = debug | release"
-	@echo "#"
-	@echo "# The OS and STAGE symbols can also be lowercase, os and stage."
-	@echo "# This makefile is only for Linux and Solaris, AIX and HPUX do"
-	@echo "# not use gcc, their makefiles are in other build folders. If" 
-	@echo "# the OS is omitted it will try to default from the OSTYPE and"
-	@echo "# MACHTYPE environment variables. If the stage is omitted it"
-	@echo "# defaults to debug."
-	@echo ""
-	exit 1
-endif
-
-create_dirs :
-	mkdir -p ${TempRoot}
-	mkdir -p ${TargetRoot}
-
-${LibName} : ${CCObjs} ${CPPObjs}
-	@echo ""
-	@echo "Linking $@"
-	rm -f $@
-	${AR}  $@ $?
-	@echo ""
-
-clean : msg
-	rm -f ${TempRoot}/* ${TargetRoot}/*
diff --git a/build/gcc3.2/sparcsolaris/expat_config.h b/build/gcc3.2/sparcsolaris/expat_config.h
deleted file mode 100644
index 48bdd2e..0000000
--- a/build/gcc3.2/sparcsolaris/expat_config.h
+++ /dev/null
@@ -1,95 +0,0 @@
-/* expat_config.h.  Generated by configure.  */
-/* expat_config.h.in.  Generated from configure.in by autoheader.  */
-
-/* *** Tweaked by hand for 32 bit Sparc Solaris builds */
-
-/* 1234 = LIL_ENDIAN, 4321 = BIGENDIAN */
-#define BYTEORDER 4321
-
-/* Define to 1 if you have the `bcopy' function. */
-#define HAVE_BCOPY 1
-
-/* Define to 1 if you have the <check.h> header file. */
-/* #undef HAVE_CHECK_H */
-
-/* Define to 1 if you have the <dlfcn.h> header file. */
-#define HAVE_DLFCN_H 1
-
-/* Define to 1 if you have the <fcntl.h> header file. */
-#define HAVE_FCNTL_H 1
-
-/* Define to 1 if you have the `getpagesize' function. */
-#define HAVE_GETPAGESIZE 1
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-#define HAVE_INTTYPES_H 1
-
-/* Define to 1 if you have the `memmove' function. */
-#define HAVE_MEMMOVE 1
-
-/* Define to 1 if you have the <memory.h> header file. */
-#define HAVE_MEMORY_H 1
-
-/* Define to 1 if you have a working `mmap' system call. */
-#define HAVE_MMAP 1
-
-/* Define to 1 if you have the <stdint.h> header file. */
-/* #undef HAVE_STDINT_H */
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-#define HAVE_STDLIB_H 1
-
-/* Define to 1 if you have the <strings.h> header file. */
-#define HAVE_STRINGS_H 1
-
-/* Define to 1 if you have the <string.h> header file. */
-#define HAVE_STRING_H 1
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#define HAVE_SYS_STAT_H 1
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#define HAVE_SYS_TYPES_H 1
-
-/* Define to 1 if you have the <unistd.h> header file. */
-#define HAVE_UNISTD_H 1
-
-/* Define to the address where bug reports for this package should be sent. */
-#define PACKAGE_BUGREPORT "expat-bugs@mail.libexpat.org"
-
-/* Define to the full name of this package. */
-#define PACKAGE_NAME "expat"
-
-/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "expat 1.95.8"
-
-/* Define to the one symbol short name of this package. */
-#define PACKAGE_TARNAME "expat"
-
-/* Define to the version of this package. */
-#define PACKAGE_VERSION "1.95.8"
-
-/* Define to 1 if you have the ANSI C header files. */
-#define STDC_HEADERS 1
-
-/* whether byteorder is bigendian */
-#define WORDS_BIGENDIAN 1
-
-/* Define to specify how much context to retain around the current parse
-   point. */
-#define XML_CONTEXT_BYTES 1024
-
-/* Define to make parameter entity parsing functionality available. */
-/* #define XML_DTD 1 */
-
-/* Define to make XML Namespaces functionality available. */
-#define XML_NS 1
-
-/* Define to empty if `const' does not conform to ANSI C. */
-/* #undef const */
-
-/* Define to `long' if <sys/types.h> does not define. */
-/* #undef off_t */
-
-/* Define to `unsigned' if <sys/types.h> does not define. */
-/* #undef size_t */
diff --git a/build/gcc4/XMPCore.mak b/build/gcc4/XMPCore.mak
new file mode 100644
index 0000000..0891abd
--- /dev/null
+++ b/build/gcc4/XMPCore.mak
@@ -0,0 +1,334 @@
+# ==================================================================================================
+# Copyright 2008 Adobe Systems Incorporated
+# All Rights Reserved.
+#
+# NOTICE:  Adobe permits you to use, modify, and distribute this file in accordance with the terms
+# of the Adobe license agreement accompanying it.
+# ==================================================================================================
+Error =
+
+TargetOS = ${os}
+ifneq "${TargetOS}" "i80386linux"
+	ifneq "${TargetOS}" "sparcsolaris"
+		ifneq "${TargetOS}" "rs6000aix"
+			ifneq "${TargetOS}" "hppahpux"
+				Error += Invalid target OS "${TargetOS}"
+			endif
+		endif
+	endif
+endif
+
+OSVer =
+ifeq "${TargetOS}" "i80386linux"
+	OSVer = linux2.6
+endif
+ifeq "${TargetOS}" "sparcsolaris"
+	OSVer = solaris9
+endif
+ifeq "${TargetOS}" "rs6000aix"
+        OSVer = aix5.2
+endif
+ifeq "${TargetOS}" "hppahpux"
+        OSVer = hp11.11
+endif
+
+ifeq "${OSVer}" ""
+	Error = Undefined OSVer
+endif
+
+# ensure libpath is set:
+LibraryPath = ${libpath}
+ifeq "${libpath}" ""
+	Error += Unspecified library path. Must set libpath=...
+endif
+
+# ------------------------------------------------------------------------------------
+# ------------------------------------------------------------------------------------
+TargetStage = ${stage}
+ifneq "${TargetStage}" "debug"
+	ifneq "${TargetStage}" "release"
+		Error += Invalid target stage "${TargetStage}"
+	endif
+endif
+
+# architecture (x86, x64)
+TargetArch = ${arch}
+ifeq "${TargetArch}" ""
+	Error += Unspecified target architecture "${TargetArch}"
+else
+	ifneq "${TargetArch}" "x86"
+		ifneq "${TargetArch}" "x64"
+			Error += Invalid target architecture "${TargetArch}"
+		endif
+	endif
+endif
+
+# ensure that in local mode, libpath is set:
+LibraryPath = ${libpath}
+
+# ------------------------------------------------------------
+# Define variables for input and output directories and files.
+
+XMPRoot  = ../..
+
+# 64-bit specific additions: (added in every 32-bit case, remain empty if not 64 bit mode)
+x64_ext =
+x64_compileFlags =
+x64_linkFlags =
+
+ifeq "${TargetArch}" "x64"
+	x64_ext = _x64
+	x64_compileFlags =-m64
+	x64_linkFlags =-m64
+endif
+
+LibRoot    = ${XMPRoot}/public/libraries/${TargetOS}${x64_ext}/${TargetStage}
+TempRoot   = ${XMPRoot}/temp/XMPCore/${TargetOS}${x64_ext}/${TargetStage}
+TargetRoot = ${XMPRoot}/target/${TargetOS}${x64_ext}/${TargetStage}/bin
+
+LibName = ${LibRoot}/staticXMPCore${x64_ext}.ar
+ModeOpt = -DXMP_StaticBuild=1
+
+# ==================================================================================================
+# ---------------------------------------------------------------------------------------------
+# Define compile and link tools and options. We've moved to gcc on all platforms.
+
+ToolName = gcc
+LibPathVar = LD_LIBRARY_PATH
+ifeq "${TargetOS}" "hppahpux"
+	LibPathVar = SHLIB_PATH
+endif
+
+ToolPath = ${PATH}
+Compile = PATH=${ToolPath} ${ToolName}
+Link    = PATH=${ToolPath} ${LibPathVar}=${LibraryPath} ${ToolName}
+
+# Do something innocuous by default for Strip.
+Strip = ls
+
+ifeq "${TargetStage}" "release"
+	Strip = PATH=${ToolPath} strip
+
+	ifeq "${TargetOS}" "rs6000aix"
+		Strip = PATH=/usr/bin strip
+	endif
+
+	ifeq "${TargetOS}" "hppahpux"
+		# Don't have a good gcc strip on HPUX yet.
+		Strip = ls
+	endif
+endif
+
+CPPFlags =
+
+XMPDefines = -DUNIX_ENV=1 -DHAVE_EXPAT_CONFIG_H=1 -DXML_STATIC=1 ${ModeOpt}
+
+ifneq "${TargetArch}" "x64"
+	XMPDefines += -DXMP_64=0
+else
+	XMPDefines += -DXMP_64=1 -D__x86_64__=1 
+endif
+
+DashG = -g
+ifeq "${TargetOS}" "rs6000aix"
+	DashG = -gxcoff
+endif
+
+ifeq "${TargetStage}" "debug"
+	CompileFlags = ${DashG} -O0 -DDEBUG=1 -D_DEBUG=1
+endif
+
+OptFlags = -O2 -Os
+
+ifeq "${TargetStage}" "release"
+	CompileFlags = ${OptFlags} -DNDEBUG=1
+endif
+
+Includes = \
+   -I${XMPRoot}/public/include \
+   -I${XMPRoot}/source/common \
+   -I${XMPRoot}/source/XMPCore \
+   -I${XMPRoot}/third-party/expat/lib \
+   -I${XMPRoot}/third-party/MD5 \
+   -I${XMPRoot}/build \
+   -I${XMPRoot}/build/gcc4
+
+# --------------------------------
+# Define settings specific to gcc.
+
+CPPFlags = -x c++ -Wno-ctor-dtor-privacy
+
+CompileFlags += -fPIC -funsigned-char -fexceptions -D_FILE_OFFSET_BITS=64
+CompileFlags += -Wno-multichar -Wno-implicit
+
+LinkFlags   = -shared -fPIC -z defs -Xlinker -Bsymbolic -Xlinker --version-script -Xlinker XMPCore.exp
+RuntimeLibs = -lc -lm -lpthread -L${ToolPath}/lib -Bdynamic -lstdc++ -shared-libgcc
+
+ifeq "${TargetOS}" "i80386linux"
+	CompileFlags += -mtune=i686
+	LinkFlags += -Wl,-rpath,'$$ORIGIN'
+endif
+
+ifeq "${TargetOS}" "sparcsolaris"
+	CompileFlags += -mcpu=ultrasparc
+endif
+
+# We need special link options on AIX and HPUX because gcc uses the native linker on them.
+
+ifeq "${TargetOS}" "hppahpux"
+	CompileFlags += -D_REENTRANT
+	LinkFlags     = -shared -fPIC -Xlinker -Bsymbolic -Xlinker -c -Xlinker XMPCore-acc.exp
+	RuntimeLibs   = -lc -lm -L${ToolPath}/lib -Bdynamic -lstdc++ -shared-libgcc
+endif		
+
+ifeq "${TargetOS}" "rs6000aix"
+	CompileFlags += -D_LARGE_FILE_API=1 -D_REENTRANT -pthread
+	LinkFlags     = -shared -fPIC -Bsymbolic -Xlinker -bE:XMPCore-vacpp.exp -pthread
+	RuntimeLibs  += -Xlinker -brtl
+endif
+
+
+# add 64 bit flags (empty if n/a)
+CompileFlags += ${x64_compileFlags}
+LinkFlags += ${x64_linkFlags}
+
+# ==================================================================================================
+# Define the set of source files.
+
+vpath %.incl_cpp\
+    ${XMPRoot}/public/include:\
+    ${XMPRoot}/public/include/client-glue:\
+
+vpath %.cpp\
+    ${XMPRoot}/source/XMPCore:\
+    ${XMPRoot}/source/common:\
+    ${XMPRoot}/public/include:\
+    ${XMPRoot}/public/include/client-glue:\
+    ${XMPRoot}/third-party/MD5
+
+vpath %.c\
+    ${XMPRoot}/third-party/expat/lib
+
+CSources = \
+    xmlparse.c \
+    xmlrole.c \
+    xmltok.c
+
+CPPSources = \
+    XMPMeta.cpp \
+    XMPMeta-GetSet.cpp \
+    XMPMeta-Parse.cpp \
+    XMPMeta-Serialize.cpp \
+    XMPIterator.cpp \
+    XMPUtils.cpp \
+    XMPUtils-FileInfo.cpp \
+    XMPCore_Impl.cpp \
+    WXMPMeta.cpp \
+    WXMPIterator.cpp \
+    WXMPUtils.cpp \
+    ExpatAdapter.cpp \
+    XML_Node.cpp \
+    ParseRDF.cpp \
+    UnicodeConversions.cpp \
+	XMP_LibUtils.cpp \
+    MD5.cpp \
+
+CObjs   = $(foreach objs,${CSources:.c=.o},${TempRoot}/$(objs))
+CPPObjs = $(foreach objs,${CPPSources:.cpp=.o},${TempRoot}/$(objs))
+
+.SUFFIXES:                # Delete the default suffixes
+.SUFFIXES: .o .c .cpp     # Define our suffix list
+
+# ==================================================================================================
+
+# ---------------------------------------
+# Define the generic compile build rules.
+
+${TempRoot}/%.o : %.c
+	@echo "------------------------------"
+	@echo "source= $<"
+	@echo "target= $@"
+	@echo "TargetPaths= ${TargetPaths}"
+	
+	@echo x64_ext = ${x64_ext}
+	@echo x64_compileFlags = ${x64_compileFlags}
+	@echo x64_linkFlags = ${x64_linkFlags}
+	
+	rm -f $@
+	${Compile} ${CompileFlags} ${XMPDefines} ${Includes} -c $< -o $@
+	@touch $@
+
+${TempRoot}/%.o : %.cpp
+	@echo "------------------------------"
+	@echo "source= $<"
+	@echo "target= $@"
+	@echo "TargetPaths= ${TargetPaths}"
+
+	@echo x64_ext = ${x64_ext}
+	@echo x64_compileFlags = ${x64_compileFlags}
+	@echo x64_linkFlags = ${x64_linkFlags}
+	@echo CompileFlags = ${CompileFlags}
+
+	rm -f $@
+	${Compile} ${CPPFlags} ${CompileFlags} ${XMPDefines} ${Includes} -c $< -o $@
+	@touch $@
+
+# ==================================================================================================
+
+.PHONY: all rebuild msg create_dirs
+
+# full re-build (with prior cleaning)
+all : msg clean create_dirs cleanTemp ${LibName} listOutput
+
+# currently a forward, soon to be the real thing ('all' only outputting usage info)
+rebuild: all
+
+# lazy build
+build: msg create_dirs ${LibName} listOutput
+	@echo "lazy build done."
+
+msg :
+ifeq "${Error}" ""
+	@echo "----------------------------------------------------------------------------------"
+	@echo Building XMPCore for ${TargetOS} ${TargetStage} --------------------
+else
+	@echo ""
+	@echo "Error: ${Error}"
+	@echo ""
+	@echo "# To build the Adobe XMP Core DLL:"
+	@echo "#   make -f XMPCore.mak [os=<os>] [stage=<stage>] [arch=<arch>]"
+	@echo "# where"
+	@echo "#   os    = i80386linux | sparcsolaris | rs6000aix | hppahpux"
+	@echo "#   stage = debug | release"
+	@echo "#   arch  = x86 | x64  (just say x86 for anything 32 bit)"
+	@echo "#"
+	@echo ""
+	@exit 1
+endif
+
+create_dirs :
+	@mkdir -p ${LibRoot} ${TempRoot} ${TargetRoot}
+
+${LibName} : ${CObjs} ${CPPObjs}
+	@echo ""
+	@echo "Linking $@"
+	rm -f $@
+	ar -qsc $@ ${CObjs} ${CPPObjs}
+	@#touch file to set actual, full date
+	@touch $@
+
+clean: cleanTemp cleanLib
+	
+cleanTemp:
+	rm -rf ${TempRoot}/*
+	
+cleanLib:
+	rm -f  ${LibName}
+	rm -rf ${XMPRoot}/build/common-unix/intermediate/${TargetOS}/
+
+listOutput:
+	@echo $
+	@echo "output directory: ${LibRoot}"
+	@ls -l ${LibRoot}
+
+
diff --git a/build/gcc4/XMPFiles.mak b/build/gcc4/XMPFiles.mak
new file mode 100644
index 0000000..294903a
--- /dev/null
+++ b/build/gcc4/XMPFiles.mak
@@ -0,0 +1,389 @@
+# ==================================================================================================
+# Copyright 2008 Adobe Systems Incorporated
+# All Rights Reserved.
+#
+# NOTICE:  Adobe permits you to use, modify, and distribute this file in accordance with the terms
+# of the Adobe license agreement accompanying it.
+# ==================================================================================================
+
+# ---------------------------------
+# Make sure the target OS is known.
+
+Error =
+
+TargetOS = ${os}
+ifneq "${TargetOS}" "i80386linux"
+	ifneq "${TargetOS}" "sparcsolaris"
+		ifneq "${TargetOS}" "rs6000aix"
+			ifneq "${TargetOS}" "hppahpux"
+				Error += Invalid target OS "${TargetOS}"
+			endif
+		endif
+	endif
+endif
+
+# deduct endianess and OSVer (not sure if the latter reflects much)
+OSVer =
+ifeq "${TargetOS}" "i80386linux"
+	OSVer = linux2.6
+	EndianSetting = -DkBigEndianHost=0
+endif
+ifeq "${TargetOS}" "sparcsolaris"
+	OSVer = solaris9
+	EndianSetting = -DkBigEndianHost=1
+endif
+ifeq "${TargetOS}" "rs6000aix"
+	OSVer = aix5.2
+	EndianSetting = -DkBigEndianHost=1
+endif
+ifeq "${TargetOS}" "hppahpux"
+	OSVer = hp11.11
+	EndianSetting = -DkBigEndianHost=1
+endif
+
+ifeq "${OSVer}" ""
+	Error = Undefined OSVer
+endif
+
+# ensure libpath is set:
+LibraryPath = ${libpath}
+ifeq "${libpath}" ""
+	Error += Unspecified library path. Must set libpath=...
+endif
+
+# -----------------------------------------------------------------------
+# -----------------------------------------------------------------------
+# Make sure the stage (debug/release) is known.
+
+TargetStage = ${stage}
+ifneq "${TargetStage}" "debug"
+	ifneq "${TargetStage}" "release"
+		Error += Invalid target stage "${TargetStage}"
+	endif
+endif
+
+# architecture (x86, x64)
+TargetArch = ${arch}
+ifeq "${TargetArch}" ""
+	Error += Unspecified target architecture "${TargetArch}"
+else
+	ifneq "${TargetArch}" "x86"
+		ifneq "${TargetArch}" "x64"
+			Error += Invalid target architecture "${TargetArch}"
+		endif
+	endif
+endif
+
+# ensure that in local mode, libpath is set:
+LibraryPath = ${libpath}
+
+# ------------------------------------------------------------
+# Define variables for input and output directories and files.
+
+XMPRoot  = ../..
+
+# 64-bit specific additions: (added in every 32-bit case, remain empty if not 64 bit mode)
+x64_ext =
+x64_compileFlags =
+x64_linkFlags =
+
+ifeq "${TargetArch}" "x64"
+	x64_ext = _x64
+	x64_compileFlags =-m64
+	x64_linkFlags =-m64
+endif
+
+LibRoot    = ${XMPRoot}/public/libraries/${TargetOS}${x64_ext}/${TargetStage}
+TempRoot   = ${XMPRoot}/temp/XMPFiles/${TargetOS}${x64_ext}/${TargetStage}
+TargetRoot = ${XMPRoot}/target/${TargetOS}${x64_ext}/${TargetStage}/bin
+
+LibName = ${LibRoot}/staticXMPFiles${x64_ext}.ar
+ModeOpt = -DXMP_StaticBuild=1
+
+# ==================================================================================================
+
+# ---------------------------------------------------------------------------------------------
+# Define compile and link tools and options. We've moved to gcc on all platforms.
+
+ToolName = gcc
+LibPathVar = LD_LIBRARY_PATH
+ifeq "${TargetOS}" "hppahpux"
+	LibPathVar = SHLIB_PATH
+endif
+
+ToolPath = ${PATH}
+Compile = PATH=${ToolPath} ${ToolName}
+Link    = PATH=${ToolPath} ${LibPathVar}=${LibraryPath} ${ToolName}
+	
+# Do something innocuous by default for Strip.
+Strip = ls
+
+ifeq "${TargetStage}" "release"
+	Strip = PATH=${ToolPath} strip
+
+	ifeq "${TargetOS}" "rs6000aix"
+		Strip = PATH=/usr/bin strip
+	endif
+
+	ifeq "${TargetOS}" "hppahpux"
+		# Don't have a good gcc strip on HPUX yet.
+		Strip = ls
+	endif
+endif
+
+CPPFlags =
+
+XMPDefines = -DUNIX_ENV=1 -DHAVE_EXPAT_CONFIG_H=1 -DXML_STATIC=1 ${EndianSetting} ${ModeOpt}
+
+ifneq "${TargetArch}" "x64"
+	XMPDefines += -DXMP_64=0
+else
+	XMPDefines += -DXMP_64=1 -D__x86_64__=1
+endif
+
+DashG = -g
+ifeq "${TargetOS}" "rs6000aix"
+	DashG = -gxcoff
+endif
+
+ifeq "${TargetStage}" "debug"
+	CompileFlags = ${DashG} -O0 -DDEBUG=1 -D_DEBUG=1
+endif
+
+OptFlags = -O2 -Os
+
+ifeq "${TargetStage}" "release"
+	CompileFlags = ${OptFlags} -DNDEBUG=1
+endif
+
+Includes = \
+   -I${XMPRoot}/public/include \
+   -I${XMPRoot}/source/common \
+   -I${XMPRoot}/source/XMPFiles \
+   -I${XMPRoot}/source/XMPFiles/FileHandlers \
+   -I${XMPRoot}/source/XMPFiles/FormatSupport \
+   -I${XMPRoot}/third-party/MD5 \
+   -I${XMPRoot}/third-party/zlib \
+   -I${XMPRoot}/build \
+   -I${XMPRoot}/build/gcc4
+
+# --------------------------------
+# Define settings specific to gcc.
+CPPFlags = -x c++ -Wno-ctor-dtor-privacy
+
+CompileFlags += -fPIC -funsigned-char -fexceptions -D_FILE_OFFSET_BITS=64
+CompileFlags += -Wno-multichar -Wno-implicit
+
+LinkFlags   = -shared -fPIC -z defs -Xlinker -Bsymbolic -Xlinker --version-script -Xlinker XMPFiles.exp
+RuntimeLibs = -lc -lm -lpthread -L${ToolPath}/lib -Bdynamic -lstdc++ -shared-libgcc
+
+ifeq "${TargetOS}" "i80386linux"
+	CompileFlags += -mtune=i686
+	LinkFlags += -Wl,-rpath,'$$ORIGIN'
+endif
+
+ifeq "${TargetOS}" "sparcsolaris"
+	CompileFlags += -mcpu=ultrasparc
+endif
+
+# We need special link options on AIX and HPUX because gcc uses the native linker on them.
+
+ifeq "${TargetOS}" "hppahpux"
+	CompileFlags += -D_REENTRANT
+	LinkFlags     = -shared -fPIC -Xlinker -Bsymbolic -Xlinker -c -Xlinker XMPFiles-acc.exp
+	RuntimeLibs   = ${LibRoot}/libAdobeXMP.sl -lc -lm -L${ToolPath}/lib -Bdynamic -lstdc++ -shared-libgcc
+endif		
+
+ifeq "${TargetOS}" "rs6000aix"
+	CompileFlags += -D_LARGE_FILE_API=1 -D_REENTRANT -pthread
+	LinkFlags     = -shared -fPIC -Bsymbolic -Xlinker -bE:XMPFiles-vacpp.exp -pthread
+	RuntimeLibs  += -Xlinker -brtl
+endif
+
+# add 64 bit flags (empty if n/a)
+CompileFlags += ${x64_compileFlags}
+LinkFlags += ${x64_linkFlags}
+
+# ==================================================================================================
+# -------------------------------
+# Define the set of source files.
+
+vpath %.incl_cpp\
+    ${XMPRoot}/public/include:\
+    ${XMPRoot}/public/include/client-glue:\
+
+vpath %.cpp\
+    ${XMPRoot}/source/XMPFiles:\
+    ${XMPRoot}/source/XMPFiles/FileHandlers:\
+    ${XMPRoot}/source/XMPFiles/FormatSupport:\
+    ${XMPRoot}/source/common:\
+    ${XMPRoot}/public/include:\
+    ${XMPRoot}/public/include/client-glue:\
+    ${XMPRoot}/third-party/MD5:\
+    ${XMPRoot}/third-party/zuid/interfaces:\
+    ${XMPRoot}/third-party/zuid/sources
+
+vpath %.c\
+    ${XMPRoot}/third-party/zlib
+
+CSources = \
+	adler32.c \
+    compress.c \
+    crc32.c \
+    deflate.c \
+    gzclose.c \
+    gzlib.c \
+    gzread.c \
+    gzwrite.c \
+    inflate.c \
+    infback.c \
+    inftrees.c \
+    inffast.c \
+    trees.c \
+    uncompr.c \
+    zutil.c
+
+CPPSources = \
+	WXMPFiles.cpp \
+	XMPFiles.cpp \
+	XMPFiles_Impl.cpp \
+	XMP_LibUtils.cpp \
+	LargeFileAccess.cpp \
+	UnicodeConversions.cpp \
+	XML_Node.cpp \
+	MD5.cpp \
+	ASF_Handler.cpp \
+	AVCHD_Handler.cpp \
+	RIFF_Handler.cpp \
+	Basic_Handler.cpp \
+	FLV_Handler.cpp \
+	InDesign_Handler.cpp \
+	JPEG_Handler.cpp \
+	MP3_Handler.cpp \
+	MPEG2_Handler.cpp \
+	MPEG4_Handler.cpp \
+	P2_Handler.cpp \
+	PNG_Handler.cpp \
+	PostScript_Handler.cpp \
+	PSD_Handler.cpp \
+	Scanner_Handler.cpp \
+	SonyHDV_Handler.cpp \
+	SWF_Handler.cpp \
+	TIFF_Handler.cpp \
+	Trivial_Handler.cpp \
+	UCF_Handler.cpp \
+	XDCAM_Handler.cpp \
+	XDCAMEX_Handler.cpp \
+	ASF_Support.cpp \
+	IPTC_Support.cpp \
+	MOOV_Support.cpp \
+	ISOBaseMedia_Support.cpp \
+	PNG_Support.cpp \
+	PSIR_FileWriter.cpp \
+	PSIR_MemoryReader.cpp \
+	QuickTime_Support.cpp \
+	Reconcile_Impl.cpp \
+	ReconcileIPTC.cpp \
+	ReconcileLegacy.cpp \
+	ReconcileTIFF.cpp \
+	RIFF.cpp \
+	RIFF_Support.cpp \
+	SWF_Support.cpp \
+	TIFF_FileWriter.cpp \
+	TIFF_MemoryReader.cpp \
+	TIFF_Support.cpp \
+	XDCAM_Support.cpp \
+	XMPScanner.cpp
+
+CObjs   = $(foreach objs,${CSources:.c=.o},${TempRoot}/$(objs))
+CPPObjs = $(foreach objs,${CPPSources:.cpp=.o},${TempRoot}/$(objs))
+
+.SUFFIXES:                # Delete the default suffixes
+.SUFFIXES: .o .c .cpp     # Define our suffix list
+
+# ==================================================================================================
+
+# ---------------------------------------
+# Define the generic compile build rules.
+
+${TempRoot}/%.o : %.c
+	@echo "------------------------------"
+	@echo "source= $<"
+	@echo "target= $@"
+	@echo x64_ext = ${x64_ext}
+	@echo x64_compileFlags = ${x64_compileFlags}
+	@echo x64_linkFlags = ${x64_linkFlags}
+	rm -f $@
+	${Compile} ${CompileFlags} ${XMPDefines} ${Includes} -c $< -o $@
+	
+${TempRoot}/%.o : %.cpp
+	@echo "------------------------------"
+	@echo "source= $<"
+	@echo "target= $@"
+	@echo x64_ext = ${x64_ext}
+	@echo x64_compileFlags = ${x64_compileFlags}
+	@echo x64_linkFlags = ${x64_linkFlags}
+	rm -f $@
+	${Compile} ${CPPFlags} ${CompileFlags} ${XMPDefines} ${Includes} -c $< -o $@
+	
+# ==================================================================================================
+
+.PHONY: all rebuild msg create_dirs
+
+# full re-build (with prior cleaning)
+all : msg clean create_dirs cleanTemp ${LibName}
+
+# currently a forward, soon to be the real thing ('all' only outputting usage info)
+rebuild: all
+
+# lazy build
+build: msg create_dirs ${LibName} listOutput
+	@echo "lazy build done."
+
+msg :
+ifeq "${Error}" ""
+	@echo "----------------------------------------------------------------------------------"
+	@echo Building XMPFiles for ${TargetOS} ${TargetStage} --------------------
+else
+	@echo ""
+	@echo "Error: ${Error}"
+	@echo ""
+	@echo "# To build the Adobe XMPFiles DLL:"
+	@echo "#   make -f XMPFiles.mak [os=<os>] [stage=<stage>] [arch=<arch>] "
+	@echo "# where"
+	@echo "#   os    = i80386linux | sparcsolaris | rs6000aix | hppahpux"
+	@echo "#   stage = debug | release"
+	@echo "#   arch  = x86 | x64"
+	@echo "#"
+	@echo "# The os and stage symbols can also be uppercase, OS and STAGE."
+	@echo "# If the os is omitted it will try to default from the OSTYPE"
+	@echo "# and MACHTYPE environment variables. If the stage is omitted"
+	@echo "# it defaults to debug."
+	@echo ""
+	@exit 1
+endif
+
+create_dirs :
+	@mkdir -p ${LibRoot} ${TempRoot} ${TargetRoot}
+
+${LibName} : ${CObjs} ${CPPObjs}
+	@echo ""
+	@echo "Linking $@"
+	rm -f $@
+	ar -qsc $@ ${CObjs} ${CPPObjs}
+	@#touch file to set actual, full date
+	@touch $@
+
+clean: cleanTemp cleanLib
+
+cleanTemp:
+	rm -rf ${TempRoot}/*
+	
+cleanLib:
+	rm -f  ${LibName}
+	rm -rf ${XMPRoot}/build/common-unix/intermediate/${TargetOS}/
+
+listOutput:
+	@echo "output directory: ${LibRoot}"
+	@ls -l ${LibRoot}
+
diff --git a/build/gcc4/XMPToolkit.mak b/build/gcc4/XMPToolkit.mak
new file mode 100644
index 0000000..e612b85
--- /dev/null
+++ b/build/gcc4/XMPToolkit.mak
@@ -0,0 +1,111 @@
+# ========================================================================================
+# Copyright 2008 Adobe Systems Incorporated
+# All Rights Reserved.
+#
+# NOTICE:  Adobe permits you to use, modify, and distribute this file in accordance
+# with the terms of the Adobe license agreement accompanying it.
+# =======================================================================================
+Error =
+
+TargetStage = ${stage}
+ifneq "${TargetStage}" "debug"
+	ifneq "${TargetStage}" "release"
+		Error += Invalid target stage "${TargetStage}"
+	endif
+endif
+
+TargetOS = ${os}
+ifneq "${TargetOS}" "i80386linux"
+	ifneq "${TargetOS}" "sparcsolaris"
+		ifneq "${TargetOS}" "rs6000aix"
+			ifneq "${TargetOS}" "hppahpux"
+				Error += Invalid target OS "${TargetOS}"
+			endif
+		endif
+	endif
+endif
+
+TargetArch = ${arch}
+ifeq "${TargetArch}" ""
+	Error += Unspecified target architecture "${TargetArch}"
+else
+	ifneq "${TargetArch}" "x86"
+		ifneq "${TargetArch}" "x64"
+			Error += Invalid target architecture "${TargetArch}"
+		endif
+	endif
+endif
+
+# ensure libpath is set:
+LibraryPath = ${libpath}
+ifeq "${libpath}" ""
+	Error += Unspecified library path. Must set libpath=...
+endif
+
+# =============================================================================================
+XMPRoot  = ../..
+# =============================================================================================
+.PHONY: usage_advice build rebuild msg
+
+all : msg specify_target usage_advice
+
+# NB: pre-emtive msg target is used to output any errors encountered in argument parsing
+build : msg
+	make -f XMPCore.mak os=${TargetOS} arch=${TargetArch} \
+			stage=${TargetStage} libpath=${LibraryPath} build
+	make -f XMPFiles.mak os=${TargetOS} arch=${TargetArch} \
+			stage=${TargetStage} libpath=${LibraryPath} build
+	make -f XMPToolkit.mak os=${TargetOS} arch=${TargetArch} stage=${TargetStage} \
+			listOutput
+
+rebuild : msg
+	make -f XMPCore.mak os=${TargetOS} arch=${TargetArch} \
+			stage=${TargetStage} libpath=${LibraryPath} rebuild
+	make -f XMPFiles.mak os=${TargetOS} arch=${TargetArch} \
+			stage=${TargetStage} libpath=${LibraryPath} rebuild
+	make -f XMPToolkit.mak os=${TargetOS} arch=${TargetArch} stage=${TargetStage} \
+			listOutput
+
+clean: msg
+	make -C ${XMPRoot}/build/gcc4 -f XMPCore.mak os=${TargetOS} arch=${TargetArch} \
+			stage=${TargetStage} libpath=${LibraryPath} clean
+	make -C ${XMPRoot}/build/gcc4 -f XMPFiles.mak os=${TargetOS} arch=${TargetArch} \
+			stage=${TargetStage} libpath=${LibraryPath} clean
+	make -f XMPToolkit.mak os=${TargetOS} arch=${TargetArch} stage=${TargetStage} \
+			libpath=${LibraryPath} listOutput
+	
+msg :
+	@echo ""
+ifneq "${Error}" ""
+	@echo ""
+	@echo "Error: ${Error}"
+	@echo ""
+	@echo "make -f XMPToolkit.mak usage_advice for usage details"
+	@exit 1
+endif
+
+specify_target :
+	@echo "please specify target."
+	@echo ""
+
+usage_advice:
+	@echo "# To build XMPToolkit (XMPCore+XMPFiles):"
+	@echo "#   make -f XMPToolkit.mak os=<os> stage=<stage> arch=<arch> (build|clean|rebuild|listOutput)"
+	@echo "# "
+	@echo "#   os    = i80386linux | sparcsolaris | rs6000aix | hppahpux"
+	@echo "#   stage = debug | release"
+	@echo "#   arch  = x86 | x64  (just say x86 for anything 32 bit)"
+	@echo "#"
+	@echo "#                When using local:"	
+	@echo "#                Ensure path contains all the paths to your gcc compiler of choice."
+	@echo "#                You MUST set libpath to the directory where the matching libstdc++.a"
+	@echo "#                resides (directory name w/o trailing slash, i.e. /usr/lib/gcc/4.1.2/lib)"
+	@echo ""
+	@exit 0
+
+#Output lists same directory for Core and Files, hence only call on
+listOutput:
+	@echo ""
+	@make -f XMPFiles.mak os=${TargetOS} arch=${TargetArch} \
+		stage=${TargetStage} listOutput
+	@echo ""
diff --git a/build/gcc3.2/i80386linux/expat_config.h b/build/gcc4/expat_config.h
index 18fe7bc..53bcd9a 100644
--- a/build/gcc3.2/i80386linux/expat_config.h
+++ b/build/gcc4/expat_config.h
@@ -1,10 +1,42 @@
 /* expat_config.h.  Generated by configure.  */
 /* expat_config.h.in.  Generated from configure.in by autoheader.  */
 
-/* *** Tweaked by hand for 32 bit x86 Linux builds */
+/* *** Tweaked by hand for generic UNIX builds **** */
+
+#ifdef WORDS_BIGENDIAN
+	#error "WORDS_BIGENDIAN must be initially undefined"
+#endif
+
+#if TargetOS == i80386linux
+	/* #undef WORDS_BIGENDIAN */
+	#define HAVE_MMAP 1
+	#define HAVE_STDINT_H 1
+	/* #undef const */
+#elif TargetOS == sparcsolaris
+	#define WORDS_BIGENDIAN 1
+	#define HAVE_MMAP 1
+	/* #undef HAVE_STDINT_H */
+	/* #undef const */
+#elif TargetOS == rs60000aix
+	#define WORDS_BIGENDIAN 1
+	/* #undef HAVE_MMAP */
+	/* #undef HAVE_STDINT_H */
+	/* #undef const */
+#elif TargetOS == hppahpux
+	#define WORDS_BIGENDIAN 1
+	/* #undef HAVE_MMAP */
+	/* #undef HAVE_STDINT_H */
+	#define const 
+#else
+	#error "Unknown target OS"
+#endif
 
 /* 1234 = LIL_ENDIAN, 4321 = BIGENDIAN */
-#define BYTEORDER 1234
+#if WORDS_BIGENDIAN
+	#define BYTEORDER 4321
+#else
+	#define BYTEORDER 1234
+#endif
 
 /* Define to 1 if you have the `bcopy' function. */
 #define HAVE_BCOPY 1
@@ -30,12 +62,6 @@
 /* Define to 1 if you have the <memory.h> header file. */
 #define HAVE_MEMORY_H 1
 
-/* Define to 1 if you have a working `mmap' system call. */
-#define HAVE_MMAP 1
-
-/* Define to 1 if you have the <stdint.h> header file. */
-#define HAVE_STDINT_H 1
-
 /* Define to 1 if you have the <stdlib.h> header file. */
 #define HAVE_STDLIB_H 1
 
@@ -72,9 +98,6 @@
 /* Define to 1 if you have the ANSI C header files. */
 #define STDC_HEADERS 1
 
-/* whether byteorder is bigendian */
-/* #undef WORDS_BIGENDIAN */
-
 /* Define to specify how much context to retain around the current parse
    point. */
 #define XML_CONTEXT_BYTES 1024
@@ -85,9 +108,6 @@
 /* Define to make XML Namespaces functionality available. */
 #define XML_NS 1
 
-/* Define to empty if `const' does not conform to ANSI C. */
-/* #undef const */
-
 /* Define to `long' if <sys/types.h> does not define. */
 /* #undef off_t */
 
diff --git a/build/gcc4/usage_examples.txt b/build/gcc4/usage_examples.txt
new file mode 100644
index 0000000..269a0ae
--- /dev/null
+++ b/build/gcc4/usage_examples.txt
@@ -0,0 +1,29 @@
+# Copyright 2008 Adobe Systems Incorporated
+# All Rights Reserved.
+#
+# NOTICE:  Adobe permits you to use, modify, and distribute this file in accordance with the terms
+# of the Adobe license agreement accompanying it.
+
+change to the directory of this file
+	<SDKROOT>/build/gcc4
+before executing the following statements:
+
+32 bit -----------------------------------------------------------------------------
+
+build entire toolkit, 32 bit, debug.
+	make -f XMPToolkit.mak os=i80386linux stage=debug arch=x86 libpath=/usr/lib/gcc/i386-redhat-linux/4.1.2 build
+	- use clean or rebuild target respectively.
+	- this libpath is correct for Redhat 5, 32 bit. adjust for your distro/version...
+
+just re-build XMPCore, 32 bit:
+	make -f XMPCore.mak os=i80386linux stage=release arch=x86 libpath=/usr/lib/gcc/i386-redhat-linux/4.1.2 rebuild
+
+64 bit -----------------------------------------------------------------------------
+
+build entire toolkit, 64 bit (arch=x64), release:	
+		
+	make -f XMPToolkit.mak os=i80386linux stage=release arch=x64 libpath=/usr/lib/gcc/i386-redhat-linux/4.1.2 build
+
+	- use clean or rebuild target respectively.
+	- again: this libpath is correct for Redhat 5, 64 bit. adjust for your distro/version.
+
diff --git a/build/vsnet8/XMPCore.vcproj b/build/vc9/XMPCore.vcproj
index c53b05f..fd00bc2 100644
--- a/build/vsnet8/XMPCore.vcproj
+++ b/build/vc9/XMPCore.vcproj
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="Windows-1252"?>


 <VisualStudioProject


 	ProjectType="Visual C++"


-	Version="8,00"


+	Version="9,00"


 	Name="XMPCore"


 	ProjectGUID="{C5BB1536-3776-4474-861D-B5923C610FE4}"


 	RootNamespace="XMPCore"


 	Keyword="Win32Proj"


+	TargetFrameworkVersion="131072"


 	>


 	<Platforms>


 		<Platform


@@ -394,6 +395,10 @@
 					RelativePath="..\..\source\common\XML_Node.cpp"


 					>


 				</File>


+				<File


+					RelativePath="..\..\source\common\XMP_LibUtils.cpp"


+					>


+				</File>


 			</Filter>


 			<Filter


 				Name="XML Parser"


diff --git a/build/vsnet8/XMPFiles.vcproj b/build/vc9/XMPFiles.vcproj
index 3694d9c..1aef066 100644
--- a/build/vsnet8/XMPFiles.vcproj
+++ b/build/vc9/XMPFiles.vcproj
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="Windows-1252"?>


 <VisualStudioProject


 	ProjectType="Visual C++"


-	Version="8,00"


+	Version="9,00"


 	Name="XMPFiles"


 	ProjectGUID="{B9A2E1F1-4E5C-49AC-B052-604CAE21F56E}"


 	RootNamespace="XMPFilesStatic"


 	Keyword="Win32Proj"


+	TargetFrameworkVersion="131072"


 	>


 	<Platforms>


 		<Platform


@@ -45,7 +46,7 @@
 				Name="VCCLCompilerTool"


 				UseUnicodeResponseFiles="true"


 				Optimization="0"


-				AdditionalIncludeDirectories=".\;..\;..\..\public\include\;..\..\source\XMPFiles\;..\..\source\XMPFiles\FormatSupport\;..\..\source\common\;&quot;..\..\third-party\MD5\&quot;;&quot;..\..\third-party\QTDevWin\CIncludes\&quot;;&quot;..\..\third-party\zlib\&quot;"


+				AdditionalIncludeDirectories=".\;..\;..\..\public\include\;..\..\source\XMPFiles\;..\..\source\XMPFiles\FileHandlers;..\..\source\XMPFiles\FormatSupport\;..\..\source\common\;&quot;..\..\third-party\MD5\&quot;;&quot;..\..\third-party\zlib\&quot;"


 				PreprocessorDefinitions="WIN32=1;_WINDOWS=1;WIN_ENV=1;XMP_StaticBuild=1;DEBUG=1;_CRT_SECURE_NO_WARNINGS=1;_DEBUG=1"


 				StringPooling="true"


 				MinimalRebuild="true"


@@ -69,7 +70,6 @@
 			/>


 			<Tool


 				Name="VCLibrarianTool"


-				AdditionalDependencies="..\..\third-party\QTDevWin\Libraries\qtmlClient.lib Advapi32.lib User32.lib $(NOINHERIT)"


 				OutputFile="$(OutDir)/XMPFilesStaticDebug.lib"


 				IgnoreAllDefaultLibraries="false"


 			/>


@@ -118,7 +118,7 @@
 				Name="VCCLCompilerTool"


 				UseUnicodeResponseFiles="true"


 				Optimization="0"


-				AdditionalIncludeDirectories=".\;..\;..\..\public\include\;..\..\source\XMPFiles\;..\..\source\XMPFiles\FormatSupport\;..\..\source\common\;&quot;..\..\third-party\MD5\&quot;;&quot;..\..\third-party\QTDevWin\CIncludes\&quot;;&quot;..\..\third-party\zlib\&quot;"


+				AdditionalIncludeDirectories=".\;..\;..\..\public\include\;..\..\source\XMPFiles\;..\..\source\XMPFiles\FileHandlers;..\..\source\XMPFiles\FormatSupport\;..\..\source\common\;&quot;..\..\third-party\MD5\&quot;;&quot;..\..\third-party\zlib\&quot;"


 				PreprocessorDefinitions="WIN32=1;_WINDOWS=1;WIN_ENV=1;XMP_StaticBuild=1;DEBUG=1;_DEBUG=1;_CRT_SECURE_NO_WARNINGS=1"


 				StringPooling="true"


 				MinimalRebuild="true"


@@ -142,7 +142,7 @@
 			/>


 			<Tool


 				Name="VCLibrarianTool"


-				AdditionalDependencies="..\..\third-party\QTDevWin\Libraries\qtmlClient.lib Advapi32.lib User32.lib $(NOINHERIT)"


+				AdditionalDependencies="Advapi32.lib User32.lib $(NOINHERIT)"


 				OutputFile="$(OutDir)/XMPFilesStaticDebug.lib"


 				IgnoreAllDefaultLibraries="false"


 			/>


@@ -192,7 +192,7 @@
 				InlineFunctionExpansion="2"


 				FavorSizeOrSpeed="2"


 				WholeProgramOptimization="true"


-				AdditionalIncludeDirectories=".\;..\;..\..\public\include\;..\..\source\XMPFiles\;..\..\source\XMPFiles\FormatSupport\;..\..\source\common\;&quot;..\..\third-party\MD5\&quot;;&quot;..\..\third-party\QTDevWin\CIncludes\&quot;;&quot;..\..\third-party\zlib\&quot;"


+				AdditionalIncludeDirectories=".\;..\;..\..\public\include\;..\..\source\XMPFiles\;..\..\source\XMPFiles\FileHandlers;..\..\source\XMPFiles\FormatSupport\;..\..\source\common\;&quot;..\..\third-party\MD5\&quot;;&quot;..\..\third-party\zlib\&quot;"


 				PreprocessorDefinitions="WIN32=1;_WINDOWS=1;WIN_ENV=1;XMP_StaticBuild=1;NDEBUG=1;_CRT_SECURE_NO_WARNINGS=1"


 				StringPooling="true"


 				MinimalRebuild="false"


@@ -217,7 +217,6 @@
 			/>


 			<Tool


 				Name="VCLibrarianTool"


-				AdditionalDependencies="..\..\third-party\QTDevWin\Libraries\qtmlClient.lib Advapi32.lib User32.lib $(NOINHERIT)"


 				OutputFile="$(OutDir)/XMPFilesStaticRelease.lib"


 				IgnoreAllDefaultLibraries="false"


 			/>


@@ -268,7 +267,7 @@
 				InlineFunctionExpansion="2"


 				FavorSizeOrSpeed="2"


 				WholeProgramOptimization="true"


-				AdditionalIncludeDirectories=".\;..\;..\..\public\include\;..\..\source\XMPFiles\;..\..\source\XMPFiles\FormatSupport\;..\..\source\common\;&quot;..\..\third-party\MD5\&quot;;&quot;..\..\third-party\QTDevWin\CIncludes\&quot;;&quot;..\..\third-party\zlib\&quot;"


+				AdditionalIncludeDirectories=".\;..\;..\..\public\include\;..\..\source\XMPFiles\;..\..\source\XMPFiles\FileHandlers;..\..\source\XMPFiles\FormatSupport\;..\..\source\common\;&quot;..\..\third-party\MD5\&quot;;&quot;..\..\third-party\zlib\&quot;"


 				PreprocessorDefinitions="WIN32=1;_WINDOWS=1;WIN_ENV=1;XMP_StaticBuild=1;NDEBUG=1;_CRT_SECURE_NO_WARNINGS=1"


 				StringPooling="true"


 				MinimalRebuild="false"


@@ -293,7 +292,7 @@
 			/>


 			<Tool


 				Name="VCLibrarianTool"


-				AdditionalDependencies="..\..\third-party\QTDevWin\Libraries\qtmlClient.lib Advapi32.lib User32.lib $(NOINHERIT)"


+				AdditionalDependencies="Advapi32.lib User32.lib $(NOINHERIT)"


 				OutputFile="$(OutDir)/XMPFilesStaticRelease.lib"


 				IgnoreAllDefaultLibraries="false"


 			/>


@@ -343,6 +342,10 @@
 					>


 				</File>


 				<File


+					RelativePath="..\..\source\common\XMP_LibUtils.cpp"


+					>


+				</File>


+				<File


 					RelativePath="..\..\source\XMPFiles\XMPFiles.cpp"


 					>


 				</File>


@@ -363,10 +366,6 @@
 					>


 				</File>


 				<File


-					RelativePath="..\..\source\XMPFiles\FileHandlers\AVI_Handler.cpp"


-					>


-				</File>


-				<File


 					RelativePath="..\..\source\XMPFiles\FileHandlers\Basic_Handler.cpp"


 					>


 				</File>


@@ -383,10 +382,6 @@
 					>


 				</File>


 				<File


-					RelativePath="..\..\source\XMPFiles\FileHandlers\MOV_Handler.cpp"


-					>


-				</File>


-				<File


 					RelativePath="..\..\source\XMPFiles\FileHandlers\MP3_Handler.cpp"


 					>


 				</File>


@@ -415,6 +410,10 @@
 					>


 				</File>


 				<File


+					RelativePath="..\..\source\XMPFiles\FileHandlers\RIFF_Handler.cpp"


+					>


+				</File>


+				<File


 					RelativePath="..\..\source\XMPFiles\FileHandlers\Scanner_Handler.cpp"


 					>


 				</File>


@@ -439,10 +438,6 @@
 					>


 				</File>


 				<File


-					RelativePath="..\..\source\XMPFiles\FileHandlers\WAV_Handler.cpp"


-					>


-				</File>


-				<File


 					RelativePath="..\..\source\XMPFiles\FileHandlers\XDCAM_Handler.cpp"


 					>


 				</File>


@@ -459,7 +454,7 @@
 					>


 				</File>


 				<File


-					RelativePath="..\..\source\XMPFiles\FormatSupport\ID3_Support.cpp"


+					RelativePath="..\..\source\XMPFiles\FormatSupport\ID3_Support.hpp"


 					>


 				</File>


 				<File


@@ -467,6 +462,14 @@
 					>


 				</File>


 				<File


+					RelativePath="..\..\source\XMPFiles\FormatSupport\ISOBaseMedia_Support.cpp"


+					>


+				</File>


+				<File


+					RelativePath="..\..\source\XMPFiles\FormatSupport\MOOV_Support.cpp"


+					>


+				</File>


+				<File


 					RelativePath="..\..\source\XMPFiles\FormatSupport\PNG_Support.cpp"


 					>


 				</File>


@@ -499,6 +502,10 @@
 					>


 				</File>


 				<File


+					RelativePath="..\..\source\XMPFiles\FormatSupport\RIFF.cpp"


+					>


+				</File>


+				<File


 					RelativePath="..\..\source\XMPFiles\FormatSupport\RIFF_Support.cpp"


 					>


 				</File>


@@ -550,10 +557,6 @@
 						>


 					</File>


 					<File


-						RelativePath="..\..\third-party\zlib\gzio.c"


-						>


-					</File>


-					<File


 						RelativePath="..\..\third-party\zlib\infback.c"


 						>


 					</File>


diff --git a/build/vsnet8/XMPToolkitSDK.sln b/build/vc9/XMPToolkitSDK.sln
index a9a79f6..2fac016 100644
--- a/build/vsnet8/XMPToolkitSDK.sln
+++ b/build/vc9/XMPToolkitSDK.sln
@@ -1,5 +1,5 @@
-Microsoft Visual Studio Solution File, Format Version 9.00


-# Visual Studio 2005 


+Microsoft Visual Studio Solution File, Format Version 10.00


+# Visual Studio 2008


 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "XMPCore", "XMPCore.vcproj", "{C5BB1536-3776-4474-861D-B5923C610FE4}"


 EndProject


 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "XMPFiles", "XMPFiles.vcproj", "{B9A2E1F1-4E5C-49AC-B052-604CAE21F56E}"


diff --git a/build/vsnet8/expat_config.h b/build/vc9/expat_config.h
index 945d0bd..945d0bd 100644
--- a/build/vsnet8/expat_config.h
+++ b/build/vc9/expat_config.h
diff --git a/build/xcode2/XMPToolkitSDK-Common.xcconfig b/build/xcode3/XMPToolkitSDK-Common.xcconfig
index 1f70b4f..959b3a6 100644
--- a/build/xcode2/XMPToolkitSDK-Common.xcconfig
+++ b/build/xcode3/XMPToolkitSDK-Common.xcconfig
@@ -24,9 +24,9 @@ INFOPLIST_FILE =
 INFOPLIST_PREPROCESS = 
 INFOPLIST_PREFIX_HEADER = 
 
-ARCHS = ppc i386
-MACOSX_DEPLOYMENT_TARGET = 10.3
-SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk
+ARCHS = i386 x86_64
+MACOSX_DEPLOYMENT_TARGET = 10.5
+SDKROOT = /Developer/SDKs/MacOSX10.5.sdk
 
 SHARED_PRECOMPS_DIR =
 PRECOMPS_INCLUDE_HEADERS_FROM_BUILT_PRODUCTS_DIR = NO
@@ -34,7 +34,8 @@ GCC_PRECOMPILE_PREFIX_HEADER = NO
 
 HEADER_SEARCH_PATHS = . ../ ${PUBLIC_ROOT}/include ${SOURCE_ROOT}/XMPCore ${SOURCE_ROOT}/XMPFiles ${SOURCE_ROOT}/XMPFiles/FormatSupport ${SOURCE_ROOT}/common ${EXPAT_ROOT}/lib /Developer/Headers/FlatCarbon
 
-COMMON_DEFINES = MAC_ENV=1 HAVE_EXPAT_CONFIG_H=1 XML_STATIC=1
+COMMON_DEFINES[arch=x86_64] = MAC_ENV=1 HAVE_EXPAT_CONFIG_H=1 XML_STATIC=1 XMP_64=1
+COMMON_DEFINES[arch=i386] = MAC_ENV=1 HAVE_EXPAT_CONFIG_H=1 XML_STATIC=1 XMP_64=0
 
 GCC_CHAR_IS_UNSIGNED_CHAR = YES
 GCC_ENABLE_PASCAL_STRINGS = NO
diff --git a/build/xcode2/XMPToolkitSDK-Debug.xcconfig b/build/xcode3/XMPToolkitSDK-Debug.xcconfig
index f1ecb32..f1ecb32 100644
--- a/build/xcode2/XMPToolkitSDK-Debug.xcconfig
+++ b/build/xcode3/XMPToolkitSDK-Debug.xcconfig
diff --git a/build/xcode2/XMPToolkitSDK-Release.xcconfig b/build/xcode3/XMPToolkitSDK-Release.xcconfig
index f74a4ca..f74a4ca 100644
--- a/build/xcode2/XMPToolkitSDK-Release.xcconfig
+++ b/build/xcode3/XMPToolkitSDK-Release.xcconfig
diff --git a/build/xcode2/XMPToolkitSDK.xcodeproj/project.pbxproj b/build/xcode3/XMPToolkitSDK.xcodeproj/project.pbxproj
index e3f322f..fd9a0df 100644
--- a/build/xcode2/XMPToolkitSDK.xcodeproj/project.pbxproj
+++ b/build/xcode3/XMPToolkitSDK.xcodeproj/project.pbxproj
@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 42;
+	objectVersion = 44;
 	objects = {
 
 /* Begin PBXAggregateTarget section */
@@ -28,23 +28,25 @@
 		0102D1C80B7B8472001AF6F7 /* MD5.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 014A2AA10B78FF1400A80B2A /* MD5.cpp */; };
 		011127FF0E5C549500114B41 /* ASF_Handler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 011127FE0E5C549400114B41 /* ASF_Handler.cpp */; };
 		011128000E5C549500114B41 /* ASF_Handler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 011127FE0E5C549400114B41 /* ASF_Handler.cpp */; };
-		011128010E5C549500114B41 /* ASF_Handler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 011127FE0E5C549400114B41 /* ASF_Handler.cpp */; };
-		011128020E5C549500114B41 /* ASF_Handler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 011127FE0E5C549400114B41 /* ASF_Handler.cpp */; };
 		011128040E5C54A000114B41 /* ASF_Support.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 011128030E5C54A000114B41 /* ASF_Support.cpp */; };
 		011128050E5C54A000114B41 /* ASF_Support.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 011128030E5C54A000114B41 /* ASF_Support.cpp */; };
-		011128060E5C54A000114B41 /* ASF_Support.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 011128030E5C54A000114B41 /* ASF_Support.cpp */; };
-		011128070E5C54A000114B41 /* ASF_Support.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 011128030E5C54A000114B41 /* ASF_Support.cpp */; };
 		014796520B776899007CF8F4 /* XMPCore_Impl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 014796510B776899007CF8F4 /* XMPCore_Impl.cpp */; };
 		014796530B776899007CF8F4 /* XMPCore_Impl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 014796510B776899007CF8F4 /* XMPCore_Impl.cpp */; };
 		014A2AA20B78FF2C00A80B2A /* MD5.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 014A2AA10B78FF1400A80B2A /* MD5.cpp */; };
 		014A2AA30B78FF2C00A80B2A /* MD5.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 014A2AA10B78FF1400A80B2A /* MD5.cpp */; };
+		014AD4C6104FFA4800D3708E /* RIFF_Handler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 014AD4C5104FFA4800D3708E /* RIFF_Handler.cpp */; };
+		014AD4C7104FFA4800D3708E /* RIFF_Handler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 014AD4C5104FFA4800D3708E /* RIFF_Handler.cpp */; };
+		014AD4C8104FFA4800D3708E /* RIFF_Handler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 014AD4C5104FFA4800D3708E /* RIFF_Handler.cpp */; };
+		014AD4C9104FFA4800D3708E /* RIFF_Handler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 014AD4C5104FFA4800D3708E /* RIFF_Handler.cpp */; };
+		014AD4CB104FFA5800D3708E /* RIFF.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 014AD4CA104FFA5800D3708E /* RIFF.cpp */; };
+		014AD4CC104FFA5800D3708E /* RIFF.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 014AD4CA104FFA5800D3708E /* RIFF.cpp */; };
+		014AD4CD104FFA5800D3708E /* RIFF.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 014AD4CA104FFA5800D3708E /* RIFF.cpp */; };
+		014AD4CE104FFA5800D3708E /* RIFF.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 014AD4CA104FFA5800D3708E /* RIFF.cpp */; };
 		019024C30E34DB86000FC1F0 /* AVCHD_Handler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 019024AC0E34DB86000FC1F0 /* AVCHD_Handler.cpp */; };
-		019024C40E34DB86000FC1F0 /* AVI_Handler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 019024AD0E34DB86000FC1F0 /* AVI_Handler.cpp */; };
 		019024C50E34DB86000FC1F0 /* Basic_Handler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 019024AE0E34DB86000FC1F0 /* Basic_Handler.cpp */; };
 		019024C60E34DB86000FC1F0 /* FLV_Handler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 019024AF0E34DB86000FC1F0 /* FLV_Handler.cpp */; };
 		019024C80E34DB86000FC1F0 /* InDesign_Handler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 019024B10E34DB86000FC1F0 /* InDesign_Handler.cpp */; };
 		019024C90E34DB86000FC1F0 /* JPEG_Handler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 019024B20E34DB86000FC1F0 /* JPEG_Handler.cpp */; };
-		019024CA0E34DB86000FC1F0 /* MOV_Handler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 019024B30E34DB86000FC1F0 /* MOV_Handler.cpp */; };
 		019024CB0E34DB86000FC1F0 /* MP3_Handler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 019024B40E34DB86000FC1F0 /* MP3_Handler.cpp */; };
 		019024CC0E34DB86000FC1F0 /* MPEG2_Handler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 019024B50E34DB86000FC1F0 /* MPEG2_Handler.cpp */; };
 		019024CD0E34DB86000FC1F0 /* MPEG4_Handler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 019024B60E34DB86000FC1F0 /* MPEG4_Handler.cpp */; };
@@ -57,16 +59,13 @@
 		019024D40E34DB86000FC1F0 /* TIFF_Handler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 019024BD0E34DB86000FC1F0 /* TIFF_Handler.cpp */; };
 		019024D50E34DB86000FC1F0 /* Trivial_Handler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 019024BE0E34DB86000FC1F0 /* Trivial_Handler.cpp */; };
 		019024D60E34DB86000FC1F0 /* UCF_Handler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 019024BF0E34DB86000FC1F0 /* UCF_Handler.cpp */; };
-		019024D70E34DB86000FC1F0 /* WAV_Handler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 019024C00E34DB86000FC1F0 /* WAV_Handler.cpp */; };
 		019024D80E34DB86000FC1F0 /* XDCAM_Handler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 019024C10E34DB86000FC1F0 /* XDCAM_Handler.cpp */; };
 		019024D90E34DB86000FC1F0 /* XDCAMEX_Handler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 019024C20E34DB86000FC1F0 /* XDCAMEX_Handler.cpp */; };
 		019024DA0E34DB86000FC1F0 /* AVCHD_Handler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 019024AC0E34DB86000FC1F0 /* AVCHD_Handler.cpp */; };
-		019024DB0E34DB86000FC1F0 /* AVI_Handler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 019024AD0E34DB86000FC1F0 /* AVI_Handler.cpp */; };
 		019024DC0E34DB86000FC1F0 /* Basic_Handler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 019024AE0E34DB86000FC1F0 /* Basic_Handler.cpp */; };
 		019024DD0E34DB86000FC1F0 /* FLV_Handler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 019024AF0E34DB86000FC1F0 /* FLV_Handler.cpp */; };
 		019024DF0E34DB86000FC1F0 /* InDesign_Handler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 019024B10E34DB86000FC1F0 /* InDesign_Handler.cpp */; };
 		019024E00E34DB86000FC1F0 /* JPEG_Handler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 019024B20E34DB86000FC1F0 /* JPEG_Handler.cpp */; };
-		019024E10E34DB86000FC1F0 /* MOV_Handler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 019024B30E34DB86000FC1F0 /* MOV_Handler.cpp */; };
 		019024E20E34DB86000FC1F0 /* MP3_Handler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 019024B40E34DB86000FC1F0 /* MP3_Handler.cpp */; };
 		019024E30E34DB86000FC1F0 /* MPEG2_Handler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 019024B50E34DB86000FC1F0 /* MPEG2_Handler.cpp */; };
 		019024E40E34DB86000FC1F0 /* MPEG4_Handler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 019024B60E34DB86000FC1F0 /* MPEG4_Handler.cpp */; };
@@ -79,15 +78,12 @@
 		019024EB0E34DB86000FC1F0 /* TIFF_Handler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 019024BD0E34DB86000FC1F0 /* TIFF_Handler.cpp */; };
 		019024EC0E34DB86000FC1F0 /* Trivial_Handler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 019024BE0E34DB86000FC1F0 /* Trivial_Handler.cpp */; };
 		019024ED0E34DB86000FC1F0 /* UCF_Handler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 019024BF0E34DB86000FC1F0 /* UCF_Handler.cpp */; };
-		019024EE0E34DB86000FC1F0 /* WAV_Handler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 019024C00E34DB86000FC1F0 /* WAV_Handler.cpp */; };
 		019024EF0E34DB86000FC1F0 /* XDCAM_Handler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 019024C10E34DB86000FC1F0 /* XDCAM_Handler.cpp */; };
 		019024F00E34DB86000FC1F0 /* XDCAMEX_Handler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 019024C20E34DB86000FC1F0 /* XDCAMEX_Handler.cpp */; };
-		0190251D0E34DC7E000FC1F0 /* ID3_Support.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 019025080E34DC7E000FC1F0 /* ID3_Support.cpp */; };
 		0190251E0E34DC7E000FC1F0 /* IPTC_Support.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 019025090E34DC7E000FC1F0 /* IPTC_Support.cpp */; };
 		019025200E34DC7E000FC1F0 /* PNG_Support.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0190250B0E34DC7E000FC1F0 /* PNG_Support.cpp */; };
 		019025210E34DC7E000FC1F0 /* PSIR_FileWriter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0190250C0E34DC7E000FC1F0 /* PSIR_FileWriter.cpp */; };
 		019025220E34DC7E000FC1F0 /* PSIR_MemoryReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0190250D0E34DC7E000FC1F0 /* PSIR_MemoryReader.cpp */; };
-		019025230E34DC7E000FC1F0 /* QuickTime_Support.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0190250E0E34DC7E000FC1F0 /* QuickTime_Support.cpp */; };
 		019025240E34DC7E000FC1F0 /* Reconcile_Impl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0190250F0E34DC7E000FC1F0 /* Reconcile_Impl.cpp */; };
 		019025250E34DC7E000FC1F0 /* ReconcileIPTC.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 019025100E34DC7E000FC1F0 /* ReconcileIPTC.cpp */; };
 		019025260E34DC7E000FC1F0 /* ReconcileLegacy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 019025110E34DC7E000FC1F0 /* ReconcileLegacy.cpp */; };
@@ -98,12 +94,10 @@
 		0190252B0E34DC7E000FC1F0 /* XDCAM_Support.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 019025170E34DC7E000FC1F0 /* XDCAM_Support.cpp */; };
 		0190252C0E34DC7E000FC1F0 /* TIFF_Support.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 019025190E34DC7E000FC1F0 /* TIFF_Support.cpp */; };
 		0190252D0E34DC7E000FC1F0 /* XMPScanner.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0190251A0E34DC7E000FC1F0 /* XMPScanner.cpp */; };
-		019025300E34DC7E000FC1F0 /* ID3_Support.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 019025080E34DC7E000FC1F0 /* ID3_Support.cpp */; };
 		019025310E34DC7E000FC1F0 /* IPTC_Support.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 019025090E34DC7E000FC1F0 /* IPTC_Support.cpp */; };
 		019025330E34DC7E000FC1F0 /* PNG_Support.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0190250B0E34DC7E000FC1F0 /* PNG_Support.cpp */; };
 		019025340E34DC7E000FC1F0 /* PSIR_FileWriter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0190250C0E34DC7E000FC1F0 /* PSIR_FileWriter.cpp */; };
 		019025350E34DC7E000FC1F0 /* PSIR_MemoryReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0190250D0E34DC7E000FC1F0 /* PSIR_MemoryReader.cpp */; };
-		019025360E34DC7E000FC1F0 /* QuickTime_Support.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0190250E0E34DC7E000FC1F0 /* QuickTime_Support.cpp */; };
 		019025370E34DC7E000FC1F0 /* Reconcile_Impl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0190250F0E34DC7E000FC1F0 /* Reconcile_Impl.cpp */; };
 		019025380E34DC7E000FC1F0 /* ReconcileIPTC.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 019025100E34DC7E000FC1F0 /* ReconcileIPTC.cpp */; };
 		019025390E34DC7E000FC1F0 /* ReconcileLegacy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 019025110E34DC7E000FC1F0 /* ReconcileLegacy.cpp */; };
@@ -118,7 +112,6 @@
 		01C07CA50E39E43E00029382 /* compress.c in Sources */ = {isa = PBXBuildFile; fileRef = 2E1977B50E38CC9100E7002F /* compress.c */; };
 		01C07CA60E39E43E00029382 /* crc32.c in Sources */ = {isa = PBXBuildFile; fileRef = 2E1977B80E38CCC700E7002F /* crc32.c */; };
 		01C07CA70E39E43E00029382 /* deflate.c in Sources */ = {isa = PBXBuildFile; fileRef = 2E1977B90E38CCC700E7002F /* deflate.c */; };
-		01C07CA80E39E43E00029382 /* gzio.c in Sources */ = {isa = PBXBuildFile; fileRef = 2E1977BA0E38CCC700E7002F /* gzio.c */; };
 		01C07CA90E39E43E00029382 /* infback.c in Sources */ = {isa = PBXBuildFile; fileRef = 2E1977BB0E38CCC700E7002F /* infback.c */; };
 		01C07CAA0E39E43E00029382 /* inffast.c in Sources */ = {isa = PBXBuildFile; fileRef = 2E1977BC0E38CCC700E7002F /* inffast.c */; };
 		01C07CAB0E39E43E00029382 /* inflate.c in Sources */ = {isa = PBXBuildFile; fileRef = 2E1977BD0E38CCC700E7002F /* inflate.c */; };
@@ -130,7 +123,6 @@
 		01C07CB20E39E44000029382 /* compress.c in Sources */ = {isa = PBXBuildFile; fileRef = 2E1977B50E38CC9100E7002F /* compress.c */; };
 		01C07CB30E39E44000029382 /* crc32.c in Sources */ = {isa = PBXBuildFile; fileRef = 2E1977B80E38CCC700E7002F /* crc32.c */; };
 		01C07CB40E39E44000029382 /* deflate.c in Sources */ = {isa = PBXBuildFile; fileRef = 2E1977B90E38CCC700E7002F /* deflate.c */; };
-		01C07CB50E39E44000029382 /* gzio.c in Sources */ = {isa = PBXBuildFile; fileRef = 2E1977BA0E38CCC700E7002F /* gzio.c */; };
 		01C07CB60E39E44000029382 /* infback.c in Sources */ = {isa = PBXBuildFile; fileRef = 2E1977BB0E38CCC700E7002F /* infback.c */; };
 		01C07CB70E39E44000029382 /* inffast.c in Sources */ = {isa = PBXBuildFile; fileRef = 2E1977BC0E38CCC700E7002F /* inffast.c */; };
 		01C07CB80E39E44000029382 /* inflate.c in Sources */ = {isa = PBXBuildFile; fileRef = 2E1977BD0E38CCC700E7002F /* inflate.c */; };
@@ -146,6 +138,14 @@
 		01FC6D8A0B7B77DA008559A1 /* WXMPFiles.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 01FC6D840B7B77C1008559A1 /* WXMPFiles.cpp */; };
 		01FC6D8B0B7B77DA008559A1 /* XMPFiles.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 01FC6D850B7B77C1008559A1 /* XMPFiles.cpp */; };
 		01FC6D8C0B7B77DA008559A1 /* XMPFiles_Impl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 01FC6D860B7B77C1008559A1 /* XMPFiles_Impl.cpp */; };
+		0533F3960F9F886800583FA8 /* QuickTime_Support.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0533F3950F9F886800583FA8 /* QuickTime_Support.cpp */; };
+		0533F3970F9F886800583FA8 /* QuickTime_Support.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0533F3950F9F886800583FA8 /* QuickTime_Support.cpp */; };
+		05E9C38810C9562200164773 /* XMP_LibUtils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 05E9C38710C9562200164773 /* XMP_LibUtils.cpp */; };
+		05E9C38910C9562200164773 /* XMP_LibUtils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 05E9C38710C9562200164773 /* XMP_LibUtils.cpp */; };
+		05E9C38A10C9562200164773 /* XMP_LibUtils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 05E9C38710C9562200164773 /* XMP_LibUtils.cpp */; };
+		05E9C38B10C9562200164773 /* XMP_LibUtils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 05E9C38710C9562200164773 /* XMP_LibUtils.cpp */; };
+		05E9C38D10C9565600164773 /* MOOV_Support.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 05E9C38C10C9565600164773 /* MOOV_Support.cpp */; };
+		05E9C38E10C9565600164773 /* MOOV_Support.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 05E9C38C10C9565600164773 /* MOOV_Support.cpp */; };
 		2E1977270E38B99800E7002F /* XML_Node.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2E1977260E38B99800E7002F /* XML_Node.cpp */; };
 		2E1977280E38B99800E7002F /* XML_Node.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2E1977260E38B99800E7002F /* XML_Node.cpp */; };
 		2E1977290E38B99800E7002F /* XML_Node.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2E1977260E38B99800E7002F /* XML_Node.cpp */; };
@@ -158,6 +158,8 @@
 		2E19773A0E38BB5B00E7002F /* SWF_Support.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2E1977380E38BB5B00E7002F /* SWF_Support.cpp */; };
 		2E1977D80E38CD5E00E7002F /* MD5.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2E1977D70E38CD5E00E7002F /* MD5.cpp */; };
 		2E1977D90E38CD5E00E7002F /* MD5.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2E1977D70E38CD5E00E7002F /* MD5.cpp */; };
+		2EA24E9F0F9F750F00665AC4 /* ISOBaseMedia_Support.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2EA24E9C0F9F750F00665AC4 /* ISOBaseMedia_Support.cpp */; };
+		2EA24EA00F9F750F00665AC4 /* ISOBaseMedia_Support.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2EA24E9C0F9F750F00665AC4 /* ISOBaseMedia_Support.cpp */; };
 		DC493270089A94CE003ADAAF /* XMPIterator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 07601E46085F950A003FEB33 /* XMPIterator.cpp */; };
 		DC493271089A94CE003ADAAF /* XMPMeta.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 07601E47085F950A003FEB33 /* XMPMeta.cpp */; };
 		DC493272089A94CE003ADAAF /* XMPMeta-GetSet.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DC87E517089960DB000A7ADF /* XMPMeta-GetSet.cpp */; };
@@ -228,13 +230,13 @@
 		011128030E5C54A000114B41 /* ASF_Support.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ASF_Support.cpp; sourceTree = "<group>"; };
 		014796510B776899007CF8F4 /* XMPCore_Impl.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = XMPCore_Impl.cpp; sourceTree = "<group>"; };
 		014A2AA10B78FF1400A80B2A /* MD5.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = MD5.cpp; path = "../../third-party/MD5/MD5.cpp"; sourceTree = "<group>"; };
+		014AD4C5104FFA4800D3708E /* RIFF_Handler.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RIFF_Handler.cpp; sourceTree = "<group>"; };
+		014AD4CA104FFA5800D3708E /* RIFF.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RIFF.cpp; sourceTree = "<group>"; };
 		019024AC0E34DB86000FC1F0 /* AVCHD_Handler.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AVCHD_Handler.cpp; sourceTree = "<group>"; };
-		019024AD0E34DB86000FC1F0 /* AVI_Handler.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AVI_Handler.cpp; sourceTree = "<group>"; };
 		019024AE0E34DB86000FC1F0 /* Basic_Handler.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Basic_Handler.cpp; sourceTree = "<group>"; };
 		019024AF0E34DB86000FC1F0 /* FLV_Handler.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FLV_Handler.cpp; sourceTree = "<group>"; };
 		019024B10E34DB86000FC1F0 /* InDesign_Handler.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InDesign_Handler.cpp; sourceTree = "<group>"; };
 		019024B20E34DB86000FC1F0 /* JPEG_Handler.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JPEG_Handler.cpp; sourceTree = "<group>"; };
-		019024B30E34DB86000FC1F0 /* MOV_Handler.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MOV_Handler.cpp; sourceTree = "<group>"; };
 		019024B40E34DB86000FC1F0 /* MP3_Handler.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MP3_Handler.cpp; sourceTree = "<group>"; };
 		019024B50E34DB86000FC1F0 /* MPEG2_Handler.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MPEG2_Handler.cpp; sourceTree = "<group>"; };
 		019024B60E34DB86000FC1F0 /* MPEG4_Handler.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MPEG4_Handler.cpp; sourceTree = "<group>"; };
@@ -247,15 +249,12 @@
 		019024BD0E34DB86000FC1F0 /* TIFF_Handler.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TIFF_Handler.cpp; sourceTree = "<group>"; };
 		019024BE0E34DB86000FC1F0 /* Trivial_Handler.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Trivial_Handler.cpp; sourceTree = "<group>"; };
 		019024BF0E34DB86000FC1F0 /* UCF_Handler.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = UCF_Handler.cpp; sourceTree = "<group>"; };
-		019024C00E34DB86000FC1F0 /* WAV_Handler.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WAV_Handler.cpp; sourceTree = "<group>"; };
 		019024C10E34DB86000FC1F0 /* XDCAM_Handler.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = XDCAM_Handler.cpp; sourceTree = "<group>"; };
 		019024C20E34DB86000FC1F0 /* XDCAMEX_Handler.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = XDCAMEX_Handler.cpp; sourceTree = "<group>"; };
-		019025080E34DC7E000FC1F0 /* ID3_Support.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ID3_Support.cpp; sourceTree = "<group>"; };
 		019025090E34DC7E000FC1F0 /* IPTC_Support.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = IPTC_Support.cpp; sourceTree = "<group>"; };
 		0190250B0E34DC7E000FC1F0 /* PNG_Support.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PNG_Support.cpp; sourceTree = "<group>"; };
 		0190250C0E34DC7E000FC1F0 /* PSIR_FileWriter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PSIR_FileWriter.cpp; sourceTree = "<group>"; };
 		0190250D0E34DC7E000FC1F0 /* PSIR_MemoryReader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PSIR_MemoryReader.cpp; sourceTree = "<group>"; };
-		0190250E0E34DC7E000FC1F0 /* QuickTime_Support.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = QuickTime_Support.cpp; sourceTree = "<group>"; };
 		0190250F0E34DC7E000FC1F0 /* Reconcile_Impl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Reconcile_Impl.cpp; sourceTree = "<group>"; };
 		019025100E34DC7E000FC1F0 /* ReconcileIPTC.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ReconcileIPTC.cpp; sourceTree = "<group>"; };
 		019025110E34DC7E000FC1F0 /* ReconcileLegacy.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ReconcileLegacy.cpp; sourceTree = "<group>"; };
@@ -272,6 +271,10 @@
 		01FC6D840B7B77C1008559A1 /* WXMPFiles.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = WXMPFiles.cpp; path = ../../source/XMPFiles/WXMPFiles.cpp; sourceTree = "<group>"; };
 		01FC6D850B7B77C1008559A1 /* XMPFiles.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = XMPFiles.cpp; path = ../../source/XMPFiles/XMPFiles.cpp; sourceTree = "<group>"; };
 		01FC6D860B7B77C1008559A1 /* XMPFiles_Impl.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = XMPFiles_Impl.cpp; path = ../../source/XMPFiles/XMPFiles_Impl.cpp; sourceTree = "<group>"; };
+		05015CD10FA0950F00060343 /* expat_config.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = expat_config.h; sourceTree = "<group>"; };
+		0533F3950F9F886800583FA8 /* QuickTime_Support.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = QuickTime_Support.cpp; sourceTree = "<group>"; };
+		05E9C38710C9562200164773 /* XMP_LibUtils.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = XMP_LibUtils.cpp; sourceTree = "<group>"; };
+		05E9C38C10C9565600164773 /* MOOV_Support.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MOOV_Support.cpp; sourceTree = "<group>"; };
 		07601E46085F950A003FEB33 /* XMPIterator.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = XMPIterator.cpp; sourceTree = "<group>"; };
 		07601E47085F950A003FEB33 /* XMPMeta.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = XMPMeta.cpp; sourceTree = "<group>"; };
 		07601E48085F950A003FEB33 /* XMPUtils.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = XMPUtils.cpp; sourceTree = "<group>"; };
@@ -282,7 +285,6 @@
 		07601E8A085F9A39003FEB33 /* WXMPMeta.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = WXMPMeta.cpp; sourceTree = "<group>"; };
 		07601E8B085F9A39003FEB33 /* WXMPUtils.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = WXMPUtils.cpp; sourceTree = "<group>"; };
 		2E19771D0E38B74F00E7002F /* XML_Node.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; name = XML_Node.cpp; path = ../common/XML_Node.cpp; sourceTree = "<group>"; };
-		2E19771E0E38B8A400E7002F /* expat_config.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = expat_config.h; path = ../../../build/xcode2/expat_config.h; sourceTree = "<group>"; };
 		2E1977260E38B99800E7002F /* XML_Node.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = XML_Node.cpp; sourceTree = "<group>"; };
 		2E19772C0E38B9DB00E7002F /* LargeFileAccess.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = LargeFileAccess.cpp; sourceTree = "<group>"; };
 		2E19772F0E38B9ED00E7002F /* UnicodeConversions.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = UnicodeConversions.cpp; sourceTree = "<group>"; };
@@ -291,7 +293,6 @@
 		2E1977B50E38CC9100E7002F /* compress.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = compress.c; sourceTree = "<group>"; };
 		2E1977B80E38CCC700E7002F /* crc32.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = crc32.c; sourceTree = "<group>"; };
 		2E1977B90E38CCC700E7002F /* deflate.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = deflate.c; sourceTree = "<group>"; };
-		2E1977BA0E38CCC700E7002F /* gzio.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = gzio.c; sourceTree = "<group>"; };
 		2E1977BB0E38CCC700E7002F /* infback.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = infback.c; sourceTree = "<group>"; };
 		2E1977BC0E38CCC700E7002F /* inffast.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = inffast.c; sourceTree = "<group>"; };
 		2E1977BD0E38CCC700E7002F /* inflate.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = inflate.c; sourceTree = "<group>"; };
@@ -300,6 +301,7 @@
 		2E1977C00E38CCC700E7002F /* uncompr.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = uncompr.c; sourceTree = "<group>"; };
 		2E1977C10E38CCC700E7002F /* zutil.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = zutil.c; sourceTree = "<group>"; };
 		2E1977D70E38CD5E00E7002F /* MD5.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = MD5.cpp; path = MD5/MD5.cpp; sourceTree = "<group>"; };
+		2EA24E9C0F9F750F00665AC4 /* ISOBaseMedia_Support.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ISOBaseMedia_Support.cpp; sourceTree = "<group>"; };
 		DC14FDD2089A8591004D5310 /* xmlparse.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = xmlparse.c; sourceTree = "<group>"; };
 		DC14FDD3089A8591004D5310 /* xmlrole.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = xmlrole.c; sourceTree = "<group>"; };
 		DC14FDD4089A8591004D5310 /* xmltok.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = xmltok.c; sourceTree = "<group>"; };
@@ -368,15 +370,14 @@
 		01FC6CED0B7B7458008559A1 /* FileHandlers */ = {
 			isa = PBXGroup;
 			children = (
+				014AD4C5104FFA4800D3708E /* RIFF_Handler.cpp */,
 				011127FE0E5C549400114B41 /* ASF_Handler.cpp */,
 				01C07CD30E39E70200029382 /* SWF_Handler.cpp */,
 				019024AC0E34DB86000FC1F0 /* AVCHD_Handler.cpp */,
-				019024AD0E34DB86000FC1F0 /* AVI_Handler.cpp */,
 				019024AE0E34DB86000FC1F0 /* Basic_Handler.cpp */,
 				019024AF0E34DB86000FC1F0 /* FLV_Handler.cpp */,
 				019024B10E34DB86000FC1F0 /* InDesign_Handler.cpp */,
 				019024B20E34DB86000FC1F0 /* JPEG_Handler.cpp */,
-				019024B30E34DB86000FC1F0 /* MOV_Handler.cpp */,
 				019024B40E34DB86000FC1F0 /* MP3_Handler.cpp */,
 				019024B50E34DB86000FC1F0 /* MPEG2_Handler.cpp */,
 				019024B60E34DB86000FC1F0 /* MPEG4_Handler.cpp */,
@@ -389,7 +390,6 @@
 				019024BD0E34DB86000FC1F0 /* TIFF_Handler.cpp */,
 				019024BE0E34DB86000FC1F0 /* Trivial_Handler.cpp */,
 				019024BF0E34DB86000FC1F0 /* UCF_Handler.cpp */,
-				019024C00E34DB86000FC1F0 /* WAV_Handler.cpp */,
 				019024C10E34DB86000FC1F0 /* XDCAM_Handler.cpp */,
 				019024C20E34DB86000FC1F0 /* XDCAMEX_Handler.cpp */,
 			);
@@ -400,17 +400,19 @@
 		01FC6CEE0B7B7462008559A1 /* FormatSupport */ = {
 			isa = PBXGroup;
 			children = (
+				05E9C38C10C9565600164773 /* MOOV_Support.cpp */,
+				0533F3950F9F886800583FA8 /* QuickTime_Support.cpp */,
+				2EA24E9C0F9F750F00665AC4 /* ISOBaseMedia_Support.cpp */,
 				011128030E5C54A000114B41 /* ASF_Support.cpp */,
-				019025080E34DC7E000FC1F0 /* ID3_Support.cpp */,
 				019025090E34DC7E000FC1F0 /* IPTC_Support.cpp */,
 				0190250B0E34DC7E000FC1F0 /* PNG_Support.cpp */,
 				0190250C0E34DC7E000FC1F0 /* PSIR_FileWriter.cpp */,
 				0190250D0E34DC7E000FC1F0 /* PSIR_MemoryReader.cpp */,
-				0190250E0E34DC7E000FC1F0 /* QuickTime_Support.cpp */,
 				0190250F0E34DC7E000FC1F0 /* Reconcile_Impl.cpp */,
 				019025100E34DC7E000FC1F0 /* ReconcileIPTC.cpp */,
 				019025110E34DC7E000FC1F0 /* ReconcileLegacy.cpp */,
 				019025120E34DC7E000FC1F0 /* ReconcileTIFF.cpp */,
+				014AD4CA104FFA5800D3708E /* RIFF.cpp */,
 				019025130E34DC7E000FC1F0 /* RIFF_Support.cpp */,
 				2E1977380E38BB5B00E7002F /* SWF_Support.cpp */,
 				019025150E34DC7E000FC1F0 /* TIFF_FileWriter.cpp */,
@@ -426,6 +428,7 @@
 		07601E35085F945B003FEB33 /* Build Files */ = {
 			isa = PBXGroup;
 			children = (
+				05015CD10FA0950F00060343 /* expat_config.h */,
 				DCE400F70951DAA90040D71F /* XMPToolkitSDK-Common.xcconfig */,
 				DCE400F80951DAA90040D71F /* XMPToolkitSDK-Debug.xcconfig */,
 				DCE400F90951DAA90040D71F /* XMPToolkitSDK-Release.xcconfig */,
@@ -480,6 +483,7 @@
 		2E1977190E38B61B00E7002F /* common */ = {
 			isa = PBXGroup;
 			children = (
+				05E9C38710C9562200164773 /* XMP_LibUtils.cpp */,
 				2E19772C0E38B9DB00E7002F /* LargeFileAccess.cpp */,
 				2E19772F0E38B9ED00E7002F /* UnicodeConversions.cpp */,
 				01FC6D840B7B77C1008559A1 /* WXMPFiles.cpp */,
@@ -532,7 +536,6 @@
 				2E1977B50E38CC9100E7002F /* compress.c */,
 				2E1977B80E38CCC700E7002F /* crc32.c */,
 				2E1977B90E38CCC700E7002F /* deflate.c */,
-				2E1977BA0E38CCC700E7002F /* gzio.c */,
 				2E1977BB0E38CCC700E7002F /* infback.c */,
 				2E1977BC0E38CCC700E7002F /* inffast.c */,
 				2E1977BD0E38CCC700E7002F /* inflate.c */,
@@ -555,7 +558,6 @@
 		DC14FDC2089A84F0004D5310 /* Expat */ = {
 			isa = PBXGroup;
 			children = (
-				2E19771E0E38B8A400E7002F /* expat_config.h */,
 				DC14FDD2089A8591004D5310 /* xmlparse.c */,
 				DC14FDD3089A8591004D5310 /* xmlrole.c */,
 				DC14FDD4089A8591004D5310 /* xmltok.c */,
@@ -648,7 +650,7 @@
 		0867D690FE84028FC02AAC07 /* Project object */ = {
 			isa = PBXProject;
 			buildConfigurationList = 07601E2C085F9443003FEB33 /* Build configuration list for PBXProject "XMPToolkitSDK" */;
-			compatibilityVersion = "Xcode 2.4";
+			compatibilityVersion = "Xcode 3.0";
 			hasScannedForEncodings = 1;
 			mainGroup = 0867D691FE84028FC02AAC07 /* AdobeXMP */;
 			productRefGroup = 0867D691FE84028FC02AAC07 /* AdobeXMP */;
@@ -674,12 +676,10 @@
 				01FC6D890B7B77D9008559A1 /* XMPFiles_Impl.cpp in Sources */,
 				0102D1C70B7B8471001AF6F7 /* MD5.cpp in Sources */,
 				019024DA0E34DB86000FC1F0 /* AVCHD_Handler.cpp in Sources */,
-				019024DB0E34DB86000FC1F0 /* AVI_Handler.cpp in Sources */,
 				019024DC0E34DB86000FC1F0 /* Basic_Handler.cpp in Sources */,
 				019024DD0E34DB86000FC1F0 /* FLV_Handler.cpp in Sources */,
 				019024DF0E34DB86000FC1F0 /* InDesign_Handler.cpp in Sources */,
 				019024E00E34DB86000FC1F0 /* JPEG_Handler.cpp in Sources */,
-				019024E10E34DB86000FC1F0 /* MOV_Handler.cpp in Sources */,
 				019024E20E34DB86000FC1F0 /* MP3_Handler.cpp in Sources */,
 				019024E30E34DB86000FC1F0 /* MPEG2_Handler.cpp in Sources */,
 				019024E40E34DB86000FC1F0 /* MPEG4_Handler.cpp in Sources */,
@@ -692,15 +692,12 @@
 				019024EB0E34DB86000FC1F0 /* TIFF_Handler.cpp in Sources */,
 				019024EC0E34DB86000FC1F0 /* Trivial_Handler.cpp in Sources */,
 				019024ED0E34DB86000FC1F0 /* UCF_Handler.cpp in Sources */,
-				019024EE0E34DB86000FC1F0 /* WAV_Handler.cpp in Sources */,
 				019024EF0E34DB86000FC1F0 /* XDCAM_Handler.cpp in Sources */,
 				019024F00E34DB86000FC1F0 /* XDCAMEX_Handler.cpp in Sources */,
-				019025300E34DC7E000FC1F0 /* ID3_Support.cpp in Sources */,
 				019025310E34DC7E000FC1F0 /* IPTC_Support.cpp in Sources */,
 				019025330E34DC7E000FC1F0 /* PNG_Support.cpp in Sources */,
 				019025340E34DC7E000FC1F0 /* PSIR_FileWriter.cpp in Sources */,
 				019025350E34DC7E000FC1F0 /* PSIR_MemoryReader.cpp in Sources */,
-				019025360E34DC7E000FC1F0 /* QuickTime_Support.cpp in Sources */,
 				019025370E34DC7E000FC1F0 /* Reconcile_Impl.cpp in Sources */,
 				019025380E34DC7E000FC1F0 /* ReconcileIPTC.cpp in Sources */,
 				019025390E34DC7E000FC1F0 /* ReconcileLegacy.cpp in Sources */,
@@ -720,7 +717,6 @@
 				01C07CA50E39E43E00029382 /* compress.c in Sources */,
 				01C07CA60E39E43E00029382 /* crc32.c in Sources */,
 				01C07CA70E39E43E00029382 /* deflate.c in Sources */,
-				01C07CA80E39E43E00029382 /* gzio.c in Sources */,
 				01C07CA90E39E43E00029382 /* infback.c in Sources */,
 				01C07CAA0E39E43E00029382 /* inffast.c in Sources */,
 				01C07CAB0E39E43E00029382 /* inflate.c in Sources */,
@@ -731,6 +727,12 @@
 				01C07CD40E39E70200029382 /* SWF_Handler.cpp in Sources */,
 				011128000E5C549500114B41 /* ASF_Handler.cpp in Sources */,
 				011128050E5C54A000114B41 /* ASF_Support.cpp in Sources */,
+				2EA24E9F0F9F750F00665AC4 /* ISOBaseMedia_Support.cpp in Sources */,
+				0533F3960F9F886800583FA8 /* QuickTime_Support.cpp in Sources */,
+				014AD4C7104FFA4800D3708E /* RIFF_Handler.cpp in Sources */,
+				014AD4CC104FFA5800D3708E /* RIFF.cpp in Sources */,
+				05E9C38A10C9562200164773 /* XMP_LibUtils.cpp in Sources */,
+				05E9C38D10C9565600164773 /* MOOV_Support.cpp in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -743,12 +745,10 @@
 				01FC6D8C0B7B77DA008559A1 /* XMPFiles_Impl.cpp in Sources */,
 				0102D1C80B7B8472001AF6F7 /* MD5.cpp in Sources */,
 				019024C30E34DB86000FC1F0 /* AVCHD_Handler.cpp in Sources */,
-				019024C40E34DB86000FC1F0 /* AVI_Handler.cpp in Sources */,
 				019024C50E34DB86000FC1F0 /* Basic_Handler.cpp in Sources */,
 				019024C60E34DB86000FC1F0 /* FLV_Handler.cpp in Sources */,
 				019024C80E34DB86000FC1F0 /* InDesign_Handler.cpp in Sources */,
 				019024C90E34DB86000FC1F0 /* JPEG_Handler.cpp in Sources */,
-				019024CA0E34DB86000FC1F0 /* MOV_Handler.cpp in Sources */,
 				019024CB0E34DB86000FC1F0 /* MP3_Handler.cpp in Sources */,
 				019024CC0E34DB86000FC1F0 /* MPEG2_Handler.cpp in Sources */,
 				019024CD0E34DB86000FC1F0 /* MPEG4_Handler.cpp in Sources */,
@@ -761,15 +761,12 @@
 				019024D40E34DB86000FC1F0 /* TIFF_Handler.cpp in Sources */,
 				019024D50E34DB86000FC1F0 /* Trivial_Handler.cpp in Sources */,
 				019024D60E34DB86000FC1F0 /* UCF_Handler.cpp in Sources */,
-				019024D70E34DB86000FC1F0 /* WAV_Handler.cpp in Sources */,
 				019024D80E34DB86000FC1F0 /* XDCAM_Handler.cpp in Sources */,
 				019024D90E34DB86000FC1F0 /* XDCAMEX_Handler.cpp in Sources */,
-				0190251D0E34DC7E000FC1F0 /* ID3_Support.cpp in Sources */,
 				0190251E0E34DC7E000FC1F0 /* IPTC_Support.cpp in Sources */,
 				019025200E34DC7E000FC1F0 /* PNG_Support.cpp in Sources */,
 				019025210E34DC7E000FC1F0 /* PSIR_FileWriter.cpp in Sources */,
 				019025220E34DC7E000FC1F0 /* PSIR_MemoryReader.cpp in Sources */,
-				019025230E34DC7E000FC1F0 /* QuickTime_Support.cpp in Sources */,
 				019025240E34DC7E000FC1F0 /* Reconcile_Impl.cpp in Sources */,
 				019025250E34DC7E000FC1F0 /* ReconcileIPTC.cpp in Sources */,
 				019025260E34DC7E000FC1F0 /* ReconcileLegacy.cpp in Sources */,
@@ -789,7 +786,6 @@
 				01C07CB20E39E44000029382 /* compress.c in Sources */,
 				01C07CB30E39E44000029382 /* crc32.c in Sources */,
 				01C07CB40E39E44000029382 /* deflate.c in Sources */,
-				01C07CB50E39E44000029382 /* gzio.c in Sources */,
 				01C07CB60E39E44000029382 /* infback.c in Sources */,
 				01C07CB70E39E44000029382 /* inffast.c in Sources */,
 				01C07CB80E39E44000029382 /* inflate.c in Sources */,
@@ -800,6 +796,12 @@
 				01C07CD50E39E70200029382 /* SWF_Handler.cpp in Sources */,
 				011127FF0E5C549500114B41 /* ASF_Handler.cpp in Sources */,
 				011128040E5C54A000114B41 /* ASF_Support.cpp in Sources */,
+				2EA24EA00F9F750F00665AC4 /* ISOBaseMedia_Support.cpp in Sources */,
+				0533F3970F9F886800583FA8 /* QuickTime_Support.cpp in Sources */,
+				014AD4C8104FFA4800D3708E /* RIFF_Handler.cpp in Sources */,
+				014AD4CD104FFA5800D3708E /* RIFF.cpp in Sources */,
+				05E9C38B10C9562200164773 /* XMP_LibUtils.cpp in Sources */,
+				05E9C38E10C9565600164773 /* MOOV_Support.cpp in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -826,8 +828,9 @@
 				014796520B776899007CF8F4 /* XMPCore_Impl.cpp in Sources */,
 				014A2AA20B78FF2C00A80B2A /* MD5.cpp in Sources */,
 				2E1977280E38B99800E7002F /* XML_Node.cpp in Sources */,
-				011128020E5C549500114B41 /* ASF_Handler.cpp in Sources */,
-				011128070E5C54A000114B41 /* ASF_Support.cpp in Sources */,
+				014AD4C6104FFA4800D3708E /* RIFF_Handler.cpp in Sources */,
+				014AD4CB104FFA5800D3708E /* RIFF.cpp in Sources */,
+				05E9C38810C9562200164773 /* XMP_LibUtils.cpp in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -854,8 +857,9 @@
 				014796530B776899007CF8F4 /* XMPCore_Impl.cpp in Sources */,
 				014A2AA30B78FF2C00A80B2A /* MD5.cpp in Sources */,
 				2E1977270E38B99800E7002F /* XML_Node.cpp in Sources */,
-				011128010E5C549500114B41 /* ASF_Handler.cpp in Sources */,
-				011128060E5C54A000114B41 /* ASF_Support.cpp in Sources */,
+				014AD4C9104FFA4800D3708E /* RIFF_Handler.cpp in Sources */,
+				014AD4CE104FFA5800D3708E /* RIFF.cpp in Sources */,
+				05E9C38910C9562200164773 /* XMP_LibUtils.cpp in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
diff --git a/build/xcode2/expat_config.h b/build/xcode3/expat_config.h
index a21de6e..a21de6e 100644
--- a/build/xcode2/expat_config.h
+++ b/build/xcode3/expat_config.h