o Added VideoLineMap property to picture essence descriptors

[asdcplib.git] / win32 / Makefile.mak

diff --git a/win32/Makefile.mak b/win32/Makefile.mak
index f6e9a1b668f84dfeaf11eb5c03430abb3a0f8735..444e78fff645f5752affa54a495a566b37750540 100755 (executable)
--- a/win32/Makefile.mak
+++ b/win32/Makefile.mak
@@ -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
@@ -33,11 +33,11 @@ OBJDIR = .
 \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.6.37\" \\r
+       /D_CRT_SECURE_NO_WARNINGS /D_CRT_NONSTDC_NO_WARNINGS /DPACKAGE_VERSION=\"2.5.13\" \\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.6.37\" \\r
+       /D_CRT_SECURE_NO_WARNINGS /D_CRT_NONSTDC_NO_WARNINGS /DPACKAGE_VERSION=\"2.5.13\" \\r
        /I"$(WITH_OPENSSL)"\inc32\r
 !endif\r
 LIB_EXE = lib.exe\r
@@ -76,19 +76,33 @@ 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
        Index.obj Metadata.obj AS_DCP.obj AS_DCP_MXF.obj AS_DCP_AES.obj \\r
        h__Reader.obj h__Writer.obj AS_DCP_MPEG2.obj AS_DCP_JP2K.obj \\r
        AS_DCP_PCM.obj AS_DCP_TimedText.obj PCMParserList.obj \\r
-       MDD.obj\r
+       MDD.obj AS_DCP_ATMOS.obj AS_DCP_DCData.obj \\r
+       DCData_ByteStream_Parser.obj DCData_Sequence_Parser.obj \\r
+       AtmosSyncChannel_Generator.obj AtmosSyncChannel_Mixer.obj \\r
+       PCMDataProviders.obj SyncEncoder.obj CRC16.obj \\r
+       UUIDInformation.obj\r
+AS02_OBJS = h__02_Reader.obj h__02_Writer.obj AS_02_JP2K.obj \\r
+       AS_02_PCM.obj\r
 \r
 {$(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
+{$(SRCDIR)\}.c{}.obj:\r
+       $(CXX) $(CXXFLAGS) -Fd$(OBJDIR)\ /c $<\r
+\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
+!IFDEF USE_AS_02\r
+       as-02-wrap.exe as-02-unwrap.exe \\r
+!ENDIF\r
 \r
 clean:\r
        erase *.exe *.lib *.obj *.ilk *.pdb *.idb\r
@@ -109,6 +123,11 @@ libkumu.lib : $(KUMU_OBJS)
 libasdcp.lib: libkumu.lib $(ASDCP_OBJS)\r
        $(LIB_EXE) $(LIBFLAGS) /OUT:libasdcp.lib $**\r
 \r
+!IFDEF USE_AS_02\r
+libas02.lib: libasdcp.lib libkumu.lib $(AS02_OBJS)\r
+       $(LIB_EXE) $(LIBFLAGS) /OUT:libas02.lib $**\r
+!ENDIF\r
+\r
 blackwave.exe: libasdcp.lib blackwave.obj\r
        $(LINK) $(LINKFLAGS) /OUT:blackwave.exe $** Advapi32.lib\r
 \r
@@ -129,3 +148,29 @@ 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
+asdcp-util.exe: libasdcp.lib asdcp-util.obj\r
+       $(LINK) $(LINKFLAGS) /OUT:asdcp-util.exe $** Advapi32.lib\r
+\r
+j2c-test.exe: libasdcp.lib j2c-test.obj\r
+       $(LINK) $(LINKFLAGS) /OUT:j2c-test.exe $** Advapi32.lib\r
+\r
+!IFDEF USE_AS_02\r
+as-02-wrap.exe: libas02.lib as-02-wrap.obj\r
+       $(LINK) $(LINKFLAGS) /OUT:as-02-wrap.exe $** Advapi32.lib\r
+\r
+as-02-unwrap.exe: libas02.lib as-02-unwrap.obj\r
+       $(LINK) $(LINKFLAGS) /OUT:as-02-unwrap.exe $** Advapi32.lib\r
+!ENDIF\r
+\r
+\r
+# END Makefile\r