updates for new binaries, new Timestamp impl on windows.

diff --git a/src/KM_tai.cpp b/src/KM_tai.cpp
index 4cc6c32b0a1e3ba2bbd20d422a226f53f709d27a..7cf363af123e5fa774989a3aa8369dbdc1f0202c 100644 (file)
--- a/src/KM_tai.cpp
+++ b/src/KM_tai.cpp
@@ -49,7 +49,11 @@ The libtai source code is in the public domain.
   */
 
 #include <KM_tai.h>
+#ifdef KM_WIN32
+#include <time.h>
+#else
 #include <sys/time.h>
+#endif
 
 //
 void

diff --git a/win32/Makefile.mak b/win32/Makefile.mak
index ecdc2a984c048439c554fb46a2adc131e911d971..962363975842b7c9780c1a5f0688e942b625c600 100755 (executable)
--- a/win32/Makefile.mak
+++ b/win32/Makefile.mak
@@ -76,7 +76,7 @@ LIBFLAGS = $(LIBFLAGS1)
 \r
 CPPFLAGS = $(CXXFLAGS)\r
 \r
-KUMU_OBJS = KM_fileio.obj KM_log.obj KM_prng.obj KM_util.obj KM_xml.obj\r
+KUMU_OBJS = KM_fileio.obj KM_log.obj KM_prng.obj KM_util.obj KM_xml.obj KM_tai.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
@@ -88,7 +88,10 @@ ASDCP_OBJS = MPEG2_Parser.obj MPEG.obj JP2K_Codestream_Parser.obj \
 {$(SRCDIR)\}.cpp{}.obj:\r
        $(CXX) $(CXXFLAGS) -Fd$(OBJDIR)\ /c $<\r
 \r
-all: kmfilegen.exe kmrandgen.exe kmuuidgen.exe asdcp-test.exe blackwave.exe klvwalk.exe wavesplit.exe\r
+all: kmfilegen.exe kmrandgen.exe kmuuidgen.exe asdcp-test.exe \\r
+     asdcp-wrap.exe asdcp-unwrap.exe asdcp-info.exe \\r
+     blackwave.exe klvwalk.exe j2c-test.exe wavesplit.exe \r
+\r
 \r
 clean:\r
        erase *.exe *.lib *.obj *.ilk *.pdb *.idb\r
@@ -129,3 +132,17 @@ klvwalk.exe: libasdcp.lib klvwalk.obj
 \r
 asdcp-test.exe: libasdcp.lib asdcp-test.obj\r
        $(LINK) $(LINKFLAGS) /OUT:asdcp-test.exe $** Advapi32.lib\r
+\r
+asdcp-wrap.exe: libasdcp.lib asdcp-wrap.obj\r
+       $(LINK) $(LINKFLAGS) /OUT:asdcp-wrap.exe $** Advapi32.lib\r
+\r
+asdcp-unwrap.exe: libasdcp.lib asdcp-unwrap.obj\r
+       $(LINK) $(LINKFLAGS) /OUT:asdcp-unwrap.exe $** Advapi32.lib\r
+\r
+asdcp-info.exe: libasdcp.lib asdcp-info.obj\r
+       $(LINK) $(LINKFLAGS) /OUT:asdcp-info.exe $** Advapi32.lib\r
+\r
+j2c-test.exe: libasdcp.lib j2c-test.obj\r
+       $(LINK) $(LINKFLAGS) /OUT:j2c-test.exe $** Advapi32.lib\r
+\r
+@ end 
\ No newline at end of file

diff --git a/win32/Makefile.wmk b/win32/Makefile.wmk
index c7466f2e26a64058cb62244d7a3d240764afef03..5674b8d1d6536087d4d4fe92bb2df24cf758dbe7 100755 (executable)
--- a/win32/Makefile.wmk
+++ b/win32/Makefile.wmk
@@ -1,5 +1,5 @@
 # $Id$\r
-# Copyright (c) 2007-2009 John Hurst. All rights reserved.\r
+# Copyright (c) 2007-2012 John Hurst. All rights reserved.\r
 #\r
 # Redistribution and use in source and binary forms, with or without\r
 # modification, are permitted provided that the following conditions\r
@@ -76,7 +76,7 @@ LIBFLAGS = $(LIBFLAGS1)
 \r
 CPPFLAGS = $(CXXFLAGS)\r
 \r
-KUMU_OBJS = KM_fileio.obj KM_log.obj KM_prng.obj KM_util.obj KM_xml.obj\r
+KUMU_OBJS = KM_fileio.obj KM_log.obj KM_prng.obj KM_util.obj KM_xml.obj KM_tai.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
@@ -88,7 +88,9 @@ ASDCP_OBJS = MPEG2_Parser.obj MPEG.obj JP2K_Codestream_Parser.obj \
 {$(SRCDIR)\}.cpp{}.obj:\r
        $(CXX) $(CXXFLAGS) -Fd$(OBJDIR)\ /c $<\r
 \r
-all: kmfilegen.exe kmrandgen.exe kmuuidgen.exe asdcp-test.exe blackwave.exe klvwalk.exe wavesplit.exe\r
+all: kmfilegen.exe kmrandgen.exe kmuuidgen.exe asdcp-test.exe \\r
+     asdcp-wrap.exe asdcp-unwrap.exe asdcp-info.exe \\r
+     blackwave.exe klvwalk.exe j2c-test.exe wavesplit.exe \r
 \r
 clean:\r
        erase *.exe *.lib *.obj *.ilk *.pdb *.idb\r
@@ -129,3 +131,17 @@ klvwalk.exe: libasdcp.lib klvwalk.obj
 \r
 asdcp-test.exe: libasdcp.lib asdcp-test.obj\r
        $(LINK) $(LINKFLAGS) /OUT:asdcp-test.exe $** Advapi32.lib\r
+\r
+asdcp-wrap.exe: libasdcp.lib asdcp-wrap.obj\r
+       $(LINK) $(LINKFLAGS) /OUT:asdcp-wrap.exe $** Advapi32.lib\r
+\r
+asdcp-unwrap.exe: libasdcp.lib asdcp-unwrap.obj\r
+       $(LINK) $(LINKFLAGS) /OUT:asdcp-unwrap.exe $** Advapi32.lib\r
+\r
+asdcp-info.exe: libasdcp.lib asdcp-info.obj\r
+       $(LINK) $(LINKFLAGS) /OUT:asdcp-info.exe $** Advapi32.lib\r
+\r
+j2c-test.exe: libasdcp.lib j2c-test.obj\r
+       $(LINK) $(LINKFLAGS) /OUT:j2c-test.exe $** Advapi32.lib\r
+\r
+# end 
\ No newline at end of file