Hey, include Xerces!

diff --git a/win32/Makefile.mak b/win32/Makefile.mak
index 3da43aa7f500d4abf94d736879b7287e23804fc1..339e395b783b31a8498f126e99a25f05adc68922 100755 (executable)
--- a/win32/Makefile.mak
+++ b/win32/Makefile.mak
@@ -1,3 +1,10 @@
+#\r
+#\r
+#\r
+#\r
+#\r
+#\r
+\r
 ARCH = win32\r
 \r
 SRCDIR=..\src\r
@@ -13,21 +20,51 @@ ASDCP_OBJS = MPEG2_Parser.obj MPEG.obj JP2K_Codestream_Parser.obj \
        AS_DCP_PCM.obj AS_DCP_TimedText.obj PCMParserList.obj \\r
        MDD.obj\r
 \r
-CXXFLAGS = /nologo /W3 /GR /EHsc /DWIN32 /DKM_WIN32 /D_CONSOLE /I. /I$(SRCDIR) /DASDCP_PLATFORM=\"win32\" \\r
-       /D_CRT_SECURE_NO_WARNINGS /D_CRT_NONSTDC_NO_WARNINGS /RTC1 /DPACKAGE_VERSION=\"1.3.19a\" \\r
-       /MTd /Od /ZI /DDEBUG /D_DEBUG /I$(OPENSSL_DIR)\inc32\r
-CPPFLAGS = $(CXXFLAGS)\r
+CXXFLAGS1 = /nologo /W3 /GR /EHsc /DWIN32 /DKM_WIN32 /D_CONSOLE /I. /I$(SRCDIR) /DASDCP_PLATFORM=\"win32\" \\r
+       /D_CRT_SECURE_NO_WARNINGS /D_CRT_NONSTDC_NO_WARNINGS /DPACKAGE_VERSION=\"1.3.19a\" \\r
+       /I$(OPENSSL_DIR)\inc32\r
 \r
 LIB_EXE = lib.exe\r
-LIBFLAGS = /NOLOGO /LIBPATH:$(OPENSSL_DIR)\out32dll\r
+LIBFLAGS1 = /NOLOGO /LIBPATH:$(OPENSSL_DIR)\out32dll\r
 \r
 LINK = link.exe\r
-LINKFLAGS = /NOLOGO /SUBSYSTEM:console /MACHINE:I386 /LIBPATH:. /DEBUG\r
+LINKFLAGS1 = /NOLOGO /SUBSYSTEM:console /MACHINE:I386 /LIBPATH:. /DEBUG\r
+\r
+\r
+!ifdef DEBUG\r
+CXXFLAGS2 = $(CXXFLAGS1) /MTd /DDEBUG /D_DEBUG /Od /RTC1 /ZI\r
+LINKFLAGS = $(LINKFLAGS1) /DEBUG\r
+!else\r
+CXXFLAGS2 = $(CXXFLAGS1) /MT /DNDEBUG /D_NDEBUG /O2\r
+LINKFLAGS = $(LINKFLAGS1)\r
+!endif\r
+\r
+!IFDEF WITH_XERCES\r
+!ifdef WITH_XML_PARSER\r
+!ERROR "Cannot include both Expat and Xerces!"\r
+!endif\r
+\r
+XERCES_DIR = $(WITH_XERCES)\r
+CPPFLAGS = $(CXXFLAGS2) /DHAVE_XERCES_C=1 /I"$(XERCES_DIR)"\include\r
+LIBFLAGS = $(LIBFLAGS1) /LIBPATH:"$(XERCES_DIR)"\lib\r
+!ELSE\r
+CPPFLAGS = $(CXXFLAGS2)\r
+LIBFLAGS = $(LIBFLAGS1)\r
+!ENDIF\r
+\r
 \r
 all: libkumu.lib kmfilegen.exe kmrandgen.exe kmuuidgen.exe asdcp-test.exe blackwave.exe klvwalk.exe wavesplit.exe\r
 \r
 libkumu.lib : $(KUMU_OBJS)\r
+!IFDEF WITH_XERCES\r
+!IFDEF DEBUG\r
+       $(LIB_EXE) $(LIBFLAGS) /OUT:libkumu.lib $(KUMU_OBJS) libeay32.lib xerces-c_2D.lib\r
+!ELSE\r
+       $(LIB_EXE) $(LIBFLAGS) /OUT:libkumu.lib $(KUMU_OBJS) libeay32.lib xerces-c_2.lib\r
+!ENDIF\r
+!ELSE\r
        $(LIB_EXE) $(LIBFLAGS) /OUT:libkumu.lib $(KUMU_OBJS) libeay32.lib\r
+!ENDIF \r
 \r
 libasdcp.lib: libkumu.lib $(ASDCP_OBJS)\r
        $(LIB_EXE) $(LIBFLAGS) /OUT:libasdcp.lib libkumu.lib $(ASDCP_OBJS)\r