X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=win32%2FMakefile.mak;h=c47b8be7c630275c5a426c9263d7e6f782b9445f;hb=ed5681ddd7d9db1482c4fd14dbfb60b1cb259b49;hp=962363975842b7c9780c1a5f0688e942b625c600;hpb=b1c1b5b75f7d651873af1eddcb2cd6e58fc72479;p=asdcplib.git

diff --git a/win32/Makefile.mak b/win32/Makefile.mak
index 9623639..c47b8be 100755
--- a/win32/Makefile.mak
+++ b/win32/Makefile.mak
@@ -1,5 +1,5 @@
 # $Id$
-# Copyright (c) 2007-2009 John Hurst. All rights reserved.
+# Copyright (c) 2007-2012 John Hurst. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -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.9.45\" \
+	/D_CRT_SECURE_NO_WARNINGS /D_CRT_NONSTDC_NO_WARNINGS /DPACKAGE_VERSION=\"2.5.11rc1\" \
 	/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.9.45\" \
+	/D_CRT_SECURE_NO_WARNINGS /D_CRT_NONSTDC_NO_WARNINGS /DPACKAGE_VERSION=\"2.5.11rc1\" \
 	/I"$(WITH_OPENSSL)"\inc32
 !endif
 LIB_EXE = lib.exe
@@ -83,18 +83,46 @@ ASDCP_OBJS = MPEG2_Parser.obj MPEG.obj JP2K_Codestream_Parser.obj \
 	Index.obj Metadata.obj AS_DCP.obj AS_DCP_MXF.obj AS_DCP_AES.obj \
 	h__Reader.obj h__Writer.obj AS_DCP_MPEG2.obj AS_DCP_JP2K.obj \
 	AS_DCP_PCM.obj AS_DCP_TimedText.obj PCMParserList.obj \
-	MDD.obj
+	MDD.obj AS_DCP_ATMOS.obj AS_DCP_DCData.obj \
+	DCData_ByteStream_Parser.obj DCData_Sequence_Parser.obj \
+	AtmosSyncChannel_Generator.obj AtmosSyncChannel_Mixer.obj \
+	PCMDataProviders.obj SyncEncoder.obj CRC16.obj \
+	UUIDInformation.obj ST2095_PinkNoise.obj
+AS02_OBJS = h__02_Reader.obj h__02_Writer.obj AS_02_JP2K.obj \
+	AS_02_PCM.obj AS_02_TimedText.obj ST2052_TextParser.obj
+PHDR_OBJS = AS_02_PHDR.obj
 
 {$(SRCDIR)\}.cpp{}.obj:
 	$(CXX) $(CXXFLAGS) -Fd$(OBJDIR)\ /c $<
 
-all: kmfilegen.exe kmrandgen.exe kmuuidgen.exe asdcp-test.exe \
-     asdcp-wrap.exe asdcp-unwrap.exe asdcp-info.exe \
-     blackwave.exe klvwalk.exe j2c-test.exe wavesplit.exe 
+{$(SRCDIR)\}.c{}.obj:
+	$(CXX) $(CXXFLAGS) -Fd$(OBJDIR)\ /c $<
 
+all: \
+	kmfilegen.exe \
+	kmrandgen.exe \
+	kmuuidgen.exe \
+	asdcp-test.exe \
+	asdcp-wrap.exe \
+	asdcp-unwrap.exe \
+	asdcp-info.exe \
+	blackwave.exe \
+	pinkwave.exe \
+	wavesplit.exe
+	j2c-test.exe \
+	klvwalk.exe \
+	klvsplit.exe
+!IFDEF USE_AS_02
+all +=	as-02-wrap.exe \
+	as-02-unwrap.exe
+!ENDIF
+!IFDEF USE_PHDR
+all +=	phdr-wrap.exe \
+	phdr-unwrap.exe
+!ENDIF
 
 clean:
-	erase *.exe *.lib *.obj *.ilk *.pdb *.idb
+	erase *.exe *.lib *.obj *.ilk *.pdb *.idb *.manifest
 
 libkumu.lib : $(KUMU_OBJS)
 !IFDEF WITH_XERCES
@@ -112,37 +140,70 @@ libkumu.lib : $(KUMU_OBJS)
 libasdcp.lib: libkumu.lib $(ASDCP_OBJS)
 	$(LIB_EXE) $(LIBFLAGS) /OUT:libasdcp.lib $**
 
+!IFDEF USE_AS_02
+libas02.lib: libasdcp.lib libkumu.lib $(AS02_OBJS)
+	$(LIB_EXE) $(LIBFLAGS) /OUT:libas02.lib $**
+!ENDIF
+
+!IFDEF USE_PHDR
+libas02-phdr.lib: libas02.lib libasdcp.lib libkumu.lib $(PHDR_OBJS)
+	$(LIB_EXE) $(LIBFLAGS) /OUT:libas02-phdr.lib $**
+!ENDIF
+
 blackwave.exe: libasdcp.lib blackwave.obj
-	$(LINK) $(LINKFLAGS) /OUT:blackwave.exe $** Advapi32.lib
+	$(LINK) $(LINKFLAGS) /OUT:blackwave.exe $** Advapi32.lib user32.lib
+
+pinkwave.exe: libasdcp.lib pinkwave.obj
+	$(LINK) $(LINKFLAGS) /OUT:pinkwave.exe $** Advapi32.lib user32.lib
 
 wavesplit.exe: libasdcp.lib wavesplit.obj
-	$(LINK) $(LINKFLAGS) /OUT:wavesplit.exe $** Advapi32.lib
+	$(LINK) $(LINKFLAGS) /OUT:wavesplit.exe $** Advapi32.lib user32.lib
 
 kmuuidgen.exe: libkumu.lib kmuuidgen.obj
-	$(LINK) $(LINKFLAGS) /OUT:kmuuidgen.exe $** Advapi32.lib
+	$(LINK) $(LINKFLAGS) /OUT:kmuuidgen.exe $** Advapi32.lib user32.lib
 
 kmrandgen.exe: libkumu.lib kmrandgen.obj
-	$(LINK) $(LINKFLAGS) /OUT:kmrandgen.exe $** Advapi32.lib
+	$(LINK) $(LINKFLAGS) /OUT:kmrandgen.exe $** Advapi32.lib user32.lib
 
 kmfilegen.exe: libkumu.lib kmfilegen.obj
-	$(LINK) $(LINKFLAGS) /OUT:kmfilegen.exe $** Advapi32.lib
+	$(LINK) $(LINKFLAGS) /OUT:kmfilegen.exe $** Advapi32.lib user32.lib
 
 klvwalk.exe: libasdcp.lib klvwalk.obj
-	$(LINK) $(LINKFLAGS) /OUT:klvwalk.exe $** Advapi32.lib
+	$(LINK) $(LINKFLAGS) /OUT:klvwalk.exe $** Advapi32.lib user32.lib
 
 asdcp-test.exe: libasdcp.lib asdcp-test.obj
-	$(LINK) $(LINKFLAGS) /OUT:asdcp-test.exe $** Advapi32.lib
+	$(LINK) $(LINKFLAGS) /OUT:asdcp-test.exe $** Advapi32.lib user32.lib
 
 asdcp-wrap.exe: libasdcp.lib asdcp-wrap.obj
-	$(LINK) $(LINKFLAGS) /OUT:asdcp-wrap.exe $** Advapi32.lib
+	$(LINK) $(LINKFLAGS) /OUT:asdcp-wrap.exe $** Advapi32.lib user32.lib
 
 asdcp-unwrap.exe: libasdcp.lib asdcp-unwrap.obj
-	$(LINK) $(LINKFLAGS) /OUT:asdcp-unwrap.exe $** Advapi32.lib
+	$(LINK) $(LINKFLAGS) /OUT:asdcp-unwrap.exe $** Advapi32.lib user32.lib
 
 asdcp-info.exe: libasdcp.lib asdcp-info.obj
-	$(LINK) $(LINKFLAGS) /OUT:asdcp-info.exe $** Advapi32.lib
+	$(LINK) $(LINKFLAGS) /OUT:asdcp-info.exe $** Advapi32.lib user32.lib
+
+asdcp-util.exe: libasdcp.lib asdcp-util.obj
+	$(LINK) $(LINKFLAGS) /OUT:asdcp-util.exe $** Advapi32.lib user32.lib
 
 j2c-test.exe: libasdcp.lib j2c-test.obj
-	$(LINK) $(LINKFLAGS) /OUT:j2c-test.exe $** Advapi32.lib
+	$(LINK) $(LINKFLAGS) /OUT:j2c-test.exe $** Advapi32.lib user32.lib
+
+!IFDEF USE_AS_02
+as-02-wrap.exe: libas02.lib as-02-wrap.obj
+	$(LINK) $(LINKFLAGS) /OUT:as-02-wrap.exe $** Advapi32.lib user32.lib
+
+as-02-unwrap.exe: libas02.lib as-02-unwrap.obj
+	$(LINK) $(LINKFLAGS) /OUT:as-02-unwrap.exe $** Advapi32.lib user32.lib
+!ENDIF
+
+!IFDEF USE_PHDR
+phdr-wrap.exe: libas02-phdr.lib phdr-wrap.obj
+	$(LINK) $(LINKFLAGS) /OUT:phdr-wrap.exe $** Advapi32.lib user32.lib
+
+phdr-unwrap.exe: libas02-phdr.lib phdr-unwrap.obj
+	$(LINK) $(LINKFLAGS) /OUT:phdr-unwrap.exe $** Advapi32.lib user32.lib
+!ENDIF
+
 
-@ end 
\ No newline at end of file
+# END Makefile