Add batch file

diff --git a/win32/Makefile.am b/win32/Makefile.am
index d466de74f557df62221ce8986b01f0b091b9da63..201a1fb0e6192700c7ad0ca9e32a1e18300d7cb2 100755 (executable)
--- a/win32/Makefile.am
+++ b/win32/Makefile.am
@@ -1,3 +1,3 @@
 ## Makefile.am -- Process this file with automake to produce Makefile.in
 
-EXTRA_DIST = Makefile.mak
+EXTRA_DIST = Makefile.mak build.bat

diff --git a/win32/Makefile.mak b/win32/Makefile.mak
index cafc4155429ecd864f7c3d3fc893760a65ded395..3da43aa7f500d4abf94d736879b7287e23804fc1 100755 (executable)
--- a/win32/Makefile.mak
+++ b/win32/Makefile.mak
@@ -1,55 +1,54 @@
-ARCH = win32
-
-SRCDIR=..\src
-
-OPENSSL_DIR = ..\..\openssl
-
-KUMU_OBJS = KM_fileio.obj KM_log.obj KM_prng.obj KM_util.obj KM_xml.obj
-ASDCP_OBJS = MPEG2_Parser.obj MPEG.obj JP2K_Codestream_Parser.obj \
-       JP2K_Sequence_Parser.obj JP2K.obj PCM_Parser.obj Wav.obj \
-       TimedText_Parser.obj KLV.obj Dict.obj MXFTypes.obj MXF.obj \
-       Index.obj Metadata.obj AS_DCP.obj AS_DCP_MXF.obj AS_DCP_AES.obj \
-       h__Reader.obj h__Writer.obj AS_DCP_MPEG2.obj AS_DCP_JP2K.obj \
-       AS_DCP_PCM.obj AS_DCP_TimedText.obj PCMParserList.obj \
-       MDD.obj
-
-
-CXXFLAGS = /nologo /W3 /GR /EHsc /DWIN32 /DKM_WIN32 /D_CONSOLE /I. /DASDCP_PLATFORM=\"win32\" \
-       /D_CRT_SECURE_NO_WARNINGS /D_CRT_NONSTDC_NO_WARNINGS /RTC1 /DPACKAGE_VERSION=\"1.3.19a\" \
-       /MTd /Od /ZI /DDEBUG /D_DEBUG /I$(OPENSSL_DIR)\inc32
-CPPFLAGS = $(CXXFLAGS)
-
-LIB_EXE = lib.exe
-LIBFLAGS = /NOLOGO /LIBPATH:$(OPENSSL_DIR)\out32dll
-
-LINK = link.exe
-LINKFLAGS = /NOLOGO /SUBSYSTEM:console /MACHINE:I386 /LIBPATH:. /DEBUG
-
-all: kmfilegen.exe kmrandgen.exe kmuuidgen.exe asdcp-test.exe blackwave.exe klvwalk.exe wavesplit.exe
-
-libkumu.lib : $(KUMU_OBJS)
-       $(LIB_EXE) $(LIBFLAGS) /OUT:libkumu.lib $(KUMU_OBJS) libeay32.lib
-
-libasdcp.lib: libkumu.lib $(ASDCP_OBJS)
-       $(LIB_EXE) $(LIBFLAGS) /OUT:libasdcp.lib libkumu.lib $(ASDCP_OBJS)
-
-blackwave.exe: libasdcp.lib blackwave.obj
-       $(LINK) $(LINKFLAGS) /OUT:blackwave.exe blackwave.obj libasdcp.lib Advapi32.lib
-
-wavesplit.exe: libasdcp.lib wavesplit.obj
-       $(LINK) $(LINKFLAGS) /OUT:wavesplit.exe wavesplit.obj libasdcp.lib Advapi32.lib
-
-kmuuidgen.exe: libkumu.lib kmuuidgen.obj
-       $(LINK) $(LINKFLAGS) /OUT:kmuuidgen.exe kmuuidgen.obj libkumu.lib Advapi32.lib
-
-kmrandgen.exe: libkumu.lib kmrandgen.obj
-       $(LINK) $(LINKFLAGS) /OUT:kmrandgen.exe kmrandgen.obj libkumu.lib Advapi32.lib
-
-kmfilegen.exe: libkumu.lib kmfilegen.obj
-       $(LINK) $(LINKFLAGS) /OUT:kmfilegen.exe kmfilegen.obj libkumu.lib Advapi32.lib
-
-klvwalk.exe: libasdcp.lib klvwalk.obj
-       $(LINK) $(LINKFLAGS) /OUT:klvwalk.exe klvwalk.obj libasdcp.lib Advapi32.lib
-
-asdcp-test.exe: libasdcp.lib asdcp-test.obj
-       $(LINK) $(LINKFLAGS) /OUT:asdcp-test.exe asdcp-test.obj libasdcp.lib Advapi32.lib
+ARCH = win32\r
+\r
+SRCDIR=..\src\r
+\r
+OPENSSL_DIR = ..\..\openssl\r
+\r
+KUMU_OBJS = KM_fileio.obj KM_log.obj KM_prng.obj KM_util.obj KM_xml.obj\r
+ASDCP_OBJS = MPEG2_Parser.obj MPEG.obj JP2K_Codestream_Parser.obj \\r
+       JP2K_Sequence_Parser.obj JP2K.obj PCM_Parser.obj Wav.obj \\r
+       TimedText_Parser.obj KLV.obj Dict.obj MXFTypes.obj MXF.obj \\r
+       Index.obj Metadata.obj AS_DCP.obj AS_DCP_MXF.obj AS_DCP_AES.obj \\r
+       h__Reader.obj h__Writer.obj AS_DCP_MPEG2.obj AS_DCP_JP2K.obj \\r
+       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
+\r
+LIB_EXE = lib.exe\r
+LIBFLAGS = /NOLOGO /LIBPATH:$(OPENSSL_DIR)\out32dll\r
+\r
+LINK = link.exe\r
+LINKFLAGS = /NOLOGO /SUBSYSTEM:console /MACHINE:I386 /LIBPATH:. /DEBUG\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
+       $(LIB_EXE) $(LIBFLAGS) /OUT:libkumu.lib $(KUMU_OBJS) libeay32.lib\r
+\r
+libasdcp.lib: libkumu.lib $(ASDCP_OBJS)\r
+       $(LIB_EXE) $(LIBFLAGS) /OUT:libasdcp.lib libkumu.lib $(ASDCP_OBJS)\r
+\r
+blackwave.exe: libasdcp.lib blackwave.obj\r
+       $(LINK) $(LINKFLAGS) /OUT:blackwave.exe blackwave.obj libasdcp.lib Advapi32.lib\r
+\r
+wavesplit.exe: libasdcp.lib wavesplit.obj\r
+       $(LINK) $(LINKFLAGS) /OUT:wavesplit.exe wavesplit.obj libasdcp.lib Advapi32.lib\r
+\r
+kmuuidgen.exe: libkumu.lib kmuuidgen.obj\r
+       $(LINK) $(LINKFLAGS) /OUT:kmuuidgen.exe kmuuidgen.obj libkumu.lib Advapi32.lib\r
+\r
+kmrandgen.exe: libkumu.lib kmrandgen.obj\r
+       $(LINK) $(LINKFLAGS) /OUT:kmrandgen.exe kmrandgen.obj libkumu.lib Advapi32.lib\r
+\r
+kmfilegen.exe: libkumu.lib kmfilegen.obj\r
+       $(LINK) $(LINKFLAGS) /OUT:kmfilegen.exe kmfilegen.obj libkumu.lib Advapi32.lib\r
+\r
+klvwalk.exe: libasdcp.lib klvwalk.obj\r
+       $(LINK) $(LINKFLAGS) /OUT:klvwalk.exe klvwalk.obj libasdcp.lib Advapi32.lib\r
+\r
+asdcp-test.exe: libasdcp.lib asdcp-test.obj\r
+       $(LINK) $(LINKFLAGS) /OUT:asdcp-test.exe asdcp-test.obj libasdcp.lib Advapi32.lib\r

diff --git a/win32/build.bat b/win32/build.bat
new file mode 100755 (executable)
index 0000000..b47211e
--- /dev/null
+++ b/win32/build.bat
@@ -0,0 +1,2 @@
+cd ..\src\r
+nmake /f ..\win32\Makefile.mak\r