2 files changed, 16 insertions, 7 deletions
diff --git a/win32/Makefile.mak b/win32/Makefile.mak
index 22e95cd..3a4fed5 100755
--- a/win32/Makefile.mak
+++ b/win32/Makefile.mak
@@ -1,5 +1,5 @@
 # $Id$
-# Copyright (c) 2007-2008 John Hurst. All rights reserved.
+# Copyright (c) 2007-2009 John Hurst. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -31,10 +31,15 @@ OBJDIR = .
 !error "OpenSSL is needed! Specify it with WITH_OPENSSL=<OpenSSL directory>"
 !endif
 
+!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.4.21\" \
+	/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.4.21\" \
 	/I"$(WITH_OPENSSL)"\inc32
-
+!endif
 LIB_EXE = lib.exe
 LIBFLAGS1 = /NOLOGO /LIBPATH:"$(WITH_OPENSSL)"\out32dll
 
diff --git a/win32/README.txt b/win32/README.txt
index d9b5a66..850624c 100755
--- a/win32/README.txt
+++ b/win32/README.txt
@@ -25,18 +25,22 @@ directory of your choice.
 III. BUILDING
 =============
 
+There's a build option that changes the behavior of UUID generation. If ENABLE_RANDOM_UUID is
+set at build, then mixed-case UUID generation will be enabled if (and only if) the environment
+variable KM_USE_RANDOM_UUID is set during runtime.
+
 Open a command prompt in which the VS build tools are available on the command line (e.g., the
 "Visual Studio command prompt"). The nmake invocation follows this form:
-C:\>nmake WITH_OPENSSL=<OpenSSL directory> [[WITH_XERCES=<Xerces directory>]|
-	[WITH_XML_PARSER=<Expat directory>]] /f Makefile.mak
+C:\>nmake WITH_OPENSSL=<OpenSSL directory> [WITH_XERCES=<Xerces directory>|
+	WITH_XML_PARSER=<Expat directory>] [ENABLE_RANDOM_UUID=1] /f Makefile.mak
 
 On our Windows development machine, the invocation with XML parsing by Xerces-C++ is as such:
 C:\Program Files\asdcplib\win32>nmake WITH_OPENSSL="c:\Program Files\openssl-0.9.8j"
 	WITH_XERCES="C:\Program Files\xerces-c_2_8_0-x86-windows-vc_8_0" /f Makefile.mak
 
-With XML parsing by Expat:
+With XML parsing by Expat and random UUID generation enabled:
 C:\Program Files\asdcplib\win32>nmake WITH_OPENSSL="c:\Program Files\openssl-0.9.8j"
-	WITH_XML_PARSER="C:\Program Files\Expat 2.0.1" /f Makefile.mak
+	WITH_XML_PARSER="C:\Program Files\Expat 2.0.1" ENABLE_RANDOM_UUID=1 /f Makefile.mak
 
 Without XML parsing:
 C:\Program Files\asdcplib\win32>nmake WITH_OPENSSL="c:\Program Files\openssl-0.9.8j"
@@ -46,4 +50,4 @@ C:\Program Files\asdcplib\win32>nmake WITH_OPENSSL="c:\Program Files\openssl-0.9
 IV. CONCLUSION
 ==============
 
-For answers to questions, please send a message to asdcplib@cinecert.com.
+For answers to questions, please send a message to <asdcplib@cinecert.com>.