Merge pull request #43 from DolbyLaboratories/dolby/win_makefile_update

Update Windows Makefiles for latest libs.

4 files changed, 74 insertions, 23 deletions

diff --git a/win32/Makefile.wmk b/win32/Makefile.common
index 1a0956d..5f90bc7 100755
--- a/win32/Makefile.wmk
+++ b/win32/Makefile.common
@@ -1,5 +1,5 @@
 # $Id$

-# Copyright (c) 2007-2012 John Hurst. All rights reserved.

+# Copyright (c) 2007-2020 John Hurst. All rights reserved.

 #

 # Redistribution and use in source and binary forms, with or without

 # modification, are permitted provided that the following conditions

@@ -34,17 +34,16 @@ 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=\"@PACKAGE_VERSION@\" \

-	/I"$(WITH_OPENSSL)"\inc32 /DCONFIG_RANDOM_UUID=1

+	/I"$(WITH_OPENSSL)"\include /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=\"@PACKAGE_VERSION@\" \

-	/I"$(WITH_OPENSSL)"\inc32

+	/I"$(WITH_OPENSSL)"\include

 !endif

 LIB_EXE = lib.exe

-LIBFLAGS1 = /NOLOGO /LIBPATH:"$(WITH_OPENSSL)"\out32dll

+LIBFLAGS1 = /NOLOGO /LIBPATH:"$(WITH_OPENSSL)"\lib

 

 LINK = link.exe

-LINKFLAGS1 = /NOLOGO /SUBSYSTEM:console /MACHINE:I386 /LIBPATH:. /DEBUG

 

 

 !ifdef DEBUG

@@ -110,14 +109,14 @@ clean:
 libkumu.lib : $(KUMU_OBJS)

 !IFDEF WITH_XERCES

 !IFDEF DEBUG

-	$(LIB_EXE) $(LIBFLAGS) /OUT:libkumu.lib $** libeay32.lib xerces-c_2D.lib

+	$(LIB_EXE) $(LIBFLAGS) /OUT:libkumu.lib $** libcrypto.lib xerces-c_3D.lib

 !ELSE

-	$(LIB_EXE) $(LIBFLAGS) /OUT:libkumu.lib $** libeay32.lib xerces-c_2.lib

+	$(LIB_EXE) $(LIBFLAGS) /OUT:libkumu.lib $** libcrypto.lib xerces-c_3.lib

 !ENDIF

 !ELSEIFDEF WITH_XML_PARSER

-	$(LIB_EXE) $(LIBFLAGS) /OUT:libkumu.lib $** libeay32.lib libexpatMT.lib

+	$(LIB_EXE) $(LIBFLAGS) /OUT:libkumu.lib $** libcrypto.lib libexpatMT.lib

 !ELSE

-	$(LIB_EXE) $(LIBFLAGS) /OUT:libkumu.lib $** libeay32.lib

+	$(LIB_EXE) $(LIBFLAGS) /OUT:libkumu.lib $** libcrypto.lib

 !ENDIF 

 

 libasdcp.lib: libkumu.lib $(ASDCP_OBJS)

diff --git a/win32/Makefile32.wmk b/win32/Makefile32.wmk
new file mode 100644
index 0000000..5fc0887
--- /dev/null
+++ b/win32/Makefile32.wmk
@@ -0,0 +1,28 @@
+# $Id$
+# Copyright (c) 2007-2020 John Hurst. All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+# 3. The name of the author may not be used to endorse or promote products
+#    derived from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+LINKFLAGS1 = /NOLOGO /SUBSYSTEM:console /MACHINE:I386 /LIBPATH:. /DEBUG
+
+include Makefile.common
diff --git a/win32/Makefile64.wmk b/win32/Makefile64.wmk
new file mode 100644
index 0000000..c1ad4a5
--- /dev/null
+++ b/win32/Makefile64.wmk
@@ -0,0 +1,28 @@
+# $Id$
+# Copyright (c) 2007-2020 John Hurst. All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+# 3. The name of the author may not be used to endorse or promote products
+#    derived from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+LINKFLAGS1 = /NOLOGO /SUBSYSTEM:console /MACHINE:X64 /LIBPATH:. /DEBUG
+
+include Makefile.common
diff --git a/win32/README.txt b/win32/README.txt
index 76e76c7..4dbdd14 100755
--- a/win32/README.txt
+++ b/win32/README.txt
@@ -35,29 +35,25 @@ 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>] [ENABLE_RANDOM_UUID=1] /f Makefile.mak

+	WITH_XML_PARSER=<Expat directory>] [ENABLE_RANDOM_UUID=1] /f Makefile32.wmk

 

 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

+C:\Program Files (x86)\asdcplib\win32>nmake WITH_OPENSSL="C:\Program Files (x86)\openssl"

+	WITH_XERCES="C:\Program Files (x86)\xerces-c" /f Makefile32.wmk

 

 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" ENABLE_RANDOM_UUID=1 /f Makefile.mak

+C:\Program Files (x86)\asdcplib\win32>nmake WITH_OPENSSL="C:\Program Files (x86)\openssl"

+	WITH_XML_PARSER="C:\Program Files (x86)\Expat 2.0.1" ENABLE_RANDOM_UUID=1 /f Makefile32.wmk

 

 Without XML parsing:

-C:\Program Files\asdcplib\win32>nmake WITH_OPENSSL="c:\Program Files\openssl-0.9.8j"

-	/f Makefile.mak

+C:\Program Files (x86)\asdcplib\win32>nmake WITH_OPENSSL="C:\Program Files (x86)\openssl"

+	/f Makefile32.wmk

 

 Without XML parsing but with the AS-02 library and executables:

-C:\Program Files\asdcplib\win32>nmake WITH_OPENSSL="c:\Program Files\openssl-0.9.8j"

-	USE_AS_02=1 /f Makefile.mak

-

-Want a 64-bit build? Change the following line in Makefile.mak:

-    LINKFLAGS1 = /NOLOGO /SUBSYSTEM:console /MACHINE:I386 /LIBPATH:. /DEBUG

-to

-    LINKFLAGS1 = /NOLOGO /SUBSYSTEM:console /MACHINE:X64 /LIBPATH:. /DEBUG

+C:\Program Files (x86)\asdcplib\win32>nmake WITH_OPENSSL="C:\Program Files (x86)\openssl"

+	USE_AS_02=1 /f Makefile32.wmk

 

+Want a 64-bit build? Use Makefile64.wmk and specify 64-bit library locations.

 

 IV. CONCLUSION

 ==============