summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormikey <mikey@cinecert.com>2010-01-06 21:06:14 +0000
committermikey <>2010-01-06 21:06:14 +0000
commit1de0c0ace0a270b7883c3e9232863e7756103b9d (patch)
tree8e7968e299cc0ed3b9ed08f816ad9d279a9f1932
parent5975dff0adbe4feb120fe18e5bee6641f40d2559 (diff)
version bump
-rwxr-xr-xsrc/KM_util.cpp2
-rwxr-xr-xwin32/Makefile.mak4
-rwxr-xr-xwin32/README.txt4
3 files changed, 7 insertions, 3 deletions
diff --git a/src/KM_util.cpp b/src/KM_util.cpp
index b5dfce6..2624f07 100755
--- a/src/KM_util.cpp
+++ b/src/KM_util.cpp
@@ -793,7 +793,7 @@ Kumu::Timestamp::AddSeconds(i32_t seconds)
FILETIME current_ft;
ULARGE_INTEGER current_ul;
- if ( minutes != 0 )
+ if ( seconds != 0 )
{
TIMESTAMP_TO_SYSTIME(*this, &current_st);
SystemTimeToFileTime(&current_st, &current_ft);
diff --git a/win32/Makefile.mak b/win32/Makefile.mak
index 1999a41..00249a0 100755
--- a/win32/Makefile.mak
+++ b/win32/Makefile.mak
@@ -33,11 +33,11 @@ OBJDIR = .
!ifdef ENABLE_RANDOM_UUID
CXXFLAGS1 = /nologo /W3 /GR /EHsc /DWIN32 /DKM_WIN32 /D_CONSOLE /I. /I$(SRCDIR) /DASDCP_PLATFORM=\"win32\" \
- /D_CRT_SECURE_NO_WARNINGS /D_CRT_NONSTDC_NO_WARNINGS /DPACKAGE_VERSION=\"1.5.31\" \
+ /D_CRT_SECURE_NO_WARNINGS /D_CRT_NONSTDC_NO_WARNINGS /DPACKAGE_VERSION=\"1.5.32\" \
/I"$(WITH_OPENSSL)"\inc32 /DCONFIG_RANDOM_UUID=1
!else
CXXFLAGS1 = /nologo /W3 /GR /EHsc /DWIN32 /DKM_WIN32 /D_CONSOLE /I. /I$(SRCDIR) /DASDCP_PLATFORM=\"win32\" \
- /D_CRT_SECURE_NO_WARNINGS /D_CRT_NONSTDC_NO_WARNINGS /DPACKAGE_VERSION=\"1.5.31\" \
+ /D_CRT_SECURE_NO_WARNINGS /D_CRT_NONSTDC_NO_WARNINGS /DPACKAGE_VERSION=\"1.5.32\" \
/I"$(WITH_OPENSSL)"\inc32
!endif
LIB_EXE = lib.exe
diff --git a/win32/README.txt b/win32/README.txt
index 850624c..dcc2241 100755
--- a/win32/README.txt
+++ b/win32/README.txt
@@ -21,6 +21,10 @@ software in conjuction with CineCert's other software, the use of Xerces-C++ is
with OpenSSL above, if you need/desire XML parsing, extract the source package and build in a
directory of your choice.
+Header files and libraries from the OpenSSL and XML packages must be available to the compiler
+and linker. You may need to modify the makefile to make include files (/I...) and library files
+(/LIBPATH...) available.
+
III. BUILDING
=============