Enable randomly cased UUID generation.

diff --git a/win32/Makefile.mak b/win32/Makefile.mak
index 22e95cd911798a2c94f79fd2f725c6397cca1c8c..3a4fed551780c8756d06c80c8ab19129698eb9bf 100755 (executable)
--- a/win32/Makefile.mak
+++ b/win32/Makefile.mak
@@ -1,5 +1,5 @@
 # $Id$\r
-# Copyright (c) 2007-2008 John Hurst. All rights reserved.\r
+# Copyright (c) 2007-2009 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
@@ -31,10 +31,15 @@ OBJDIR = .
 !error "OpenSSL is needed! Specify it with WITH_OPENSSL=<OpenSSL directory>"\r
 !endif\r
 \r
+!ifdef ENABLE_RANDOM_UUID\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.4.21\" \\r
+       /I"$(WITH_OPENSSL)"\inc32 /DCONFIG_RANDOM_UUID=1\r
+!else\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.4.21\" \\r
        /I"$(WITH_OPENSSL)"\inc32\r
-\r
+!endif\r
 LIB_EXE = lib.exe\r
 LIBFLAGS1 = /NOLOGO /LIBPATH:"$(WITH_OPENSSL)"\out32dll\r
 \r

diff --git a/win32/README.txt b/win32/README.txt
index d9b5a663691d7d89231325dc31da956f31508d42..850624c8e273e731c0f0f33d3f721690a46099a5 100755 (executable)
--- a/win32/README.txt
+++ b/win32/README.txt
@@ -25,18 +25,22 @@ directory of your choice.
 III. BUILDING\r
 =============\r
 \r
+There's a build option that changes the behavior of UUID generation. If ENABLE_RANDOM_UUID is\r
+set at build, then mixed-case UUID generation will be enabled if (and only if) the environment\r
+variable KM_USE_RANDOM_UUID is set during runtime.\r
+\r
 Open a command prompt in which the VS build tools are available on the command line (e.g., the\r
 "Visual Studio command prompt"). The nmake invocation follows this form:\r
-C:\>nmake WITH_OPENSSL=<OpenSSL directory> [[WITH_XERCES=<Xerces directory>]|\r
-       [WITH_XML_PARSER=<Expat directory>]] /f Makefile.mak\r
+C:\>nmake WITH_OPENSSL=<OpenSSL directory> [WITH_XERCES=<Xerces directory>|\r
+       WITH_XML_PARSER=<Expat directory>] [ENABLE_RANDOM_UUID=1] /f Makefile.mak\r
 \r
 On our Windows development machine, the invocation with XML parsing by Xerces-C++ is as such:\r
 C:\Program Files\asdcplib\win32>nmake WITH_OPENSSL="c:\Program Files\openssl-0.9.8j"\r
        WITH_XERCES="C:\Program Files\xerces-c_2_8_0-x86-windows-vc_8_0" /f Makefile.mak\r
 \r
-With XML parsing by Expat:\r
+With XML parsing by Expat and random UUID generation enabled:\r
 C:\Program Files\asdcplib\win32>nmake WITH_OPENSSL="c:\Program Files\openssl-0.9.8j"\r
-       WITH_XML_PARSER="C:\Program Files\Expat 2.0.1" /f Makefile.mak\r
+       WITH_XML_PARSER="C:\Program Files\Expat 2.0.1" ENABLE_RANDOM_UUID=1 /f Makefile.mak\r
 \r
 Without XML parsing:\r
 C:\Program Files\asdcplib\win32>nmake WITH_OPENSSL="c:\Program Files\openssl-0.9.8j"\r
@@ -46,4 +50,4 @@ C:\Program Files\asdcplib\win32>nmake WITH_OPENSSL="c:\Program Files\openssl-0.9
 IV. CONCLUSION\r
 ==============\r
 \r
-For answers to questions, please send a message to asdcplib@cinecert.com.\r
+For answers to questions, please send a message to <asdcplib@cinecert.com>.\r