diff options
| author | msheby <msheby@cinecert.com> | 2013-06-26 19:34:18 +0000 |
|---|---|---|
| committer | msheby <> | 2013-06-26 19:34:18 +0000 |
| commit | 4c79dd9e68c9f58660343524506712bc32ced077 (patch) | |
| tree | 75267f4a48393083717fd13dafa88a6d042d0e12 | |
| parent | 66944298af1e72b4e517787a3cc644628511b1c1 (diff) | |
allow the building of AS-02 stuff in Windows
| -rwxr-xr-x | win32/Makefile.mak | 20 | ||||
| -rwxr-xr-x | win32/Makefile.wmk | 18 | ||||
| -rwxr-xr-x | win32/README.txt | 4 |
3 files changed, 41 insertions, 1 deletions
diff --git a/win32/Makefile.mak b/win32/Makefile.mak index e15fc38..b1c4b08 100755 --- a/win32/Makefile.mak +++ b/win32/Makefile.mak @@ -88,6 +88,8 @@ ASDCP_OBJS = MPEG2_Parser.obj MPEG.obj JP2K_Codestream_Parser.obj \ AtmosSyncChannel_Generator.obj AtmosSyncChannel_Mixer.obj \
PCMDataProviders.obj SyncEncoder.obj CRC16.obj \
UUIDInformation.obj
+AS02_OBJS = h__02_Reader.obj h__02_Writer.obj AS_02_JP2K.obj \
+ AS_02_PCM.obj
{$(SRCDIR)\}.cpp{}.obj:
$(CXX) $(CXXFLAGS) -Fd$(OBJDIR)\ /c $<
@@ -97,7 +99,10 @@ ASDCP_OBJS = MPEG2_Parser.obj MPEG.obj JP2K_Codestream_Parser.obj \ 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
+ blackwave.exe klvwalk.exe j2c-test.exe wavesplit.exe \
+!IFDEF USE_AS_02
+ as-02-wrap.exe as-02-unwrap.exe \
+!ENDIF
clean:
erase *.exe *.lib *.obj *.ilk *.pdb *.idb
@@ -118,6 +123,11 @@ 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
+
blackwave.exe: libasdcp.lib blackwave.obj
$(LINK) $(LINKFLAGS) /OUT:blackwave.exe $** Advapi32.lib
@@ -154,5 +164,13 @@ asdcp-util.exe: libasdcp.lib asdcp-util.obj j2c-test.exe: libasdcp.lib j2c-test.obj
$(LINK) $(LINKFLAGS) /OUT:j2c-test.exe $** Advapi32.lib
+!IFDEF USE_AS_02
+as-02-wrap.exe: libas02.lib as-02-wrap.obj
+ $(LINK) $(LINKFLAGS) /OUT:as-02-wrap.exe $** Advapi32.lib
+
+as-02-unwrap.exe: libas02.lib as-02-unwrap.obj
+ $(LINK) $(LINKFLAGS) /OUT:as-02-unwrap.exe $** Advapi32.lib
+!ENDIF
+
# END Makefile
diff --git a/win32/Makefile.wmk b/win32/Makefile.wmk index 3dddf91..1a0956d 100755 --- a/win32/Makefile.wmk +++ b/win32/Makefile.wmk @@ -88,6 +88,8 @@ ASDCP_OBJS = MPEG2_Parser.obj MPEG.obj JP2K_Codestream_Parser.obj \ AtmosSyncChannel_Generator.obj AtmosSyncChannel_Mixer.obj \
PCMDataProviders.obj SyncEncoder.obj CRC16.obj \
UUIDInformation.obj
+AS02_OBJS = h__02_Reader.obj h__02_Writer.obj AS_02_JP2K.obj \
+ AS_02_PCM.obj
{$(SRCDIR)\}.cpp{}.obj:
$(CXX) $(CXXFLAGS) -Fd$(OBJDIR)\ /c $<
@@ -98,6 +100,9 @@ ASDCP_OBJS = MPEG2_Parser.obj MPEG.obj JP2K_Codestream_Parser.obj \ 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
+!IFDEF USE_AS_02
+ as-02-wrap.exe as-02-unwrap.exe \
+!ENDIF
clean:
erase *.exe *.lib *.obj *.ilk *.pdb *.idb
@@ -118,6 +123,11 @@ 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
+
blackwave.exe: libasdcp.lib blackwave.obj
$(LINK) $(LINKFLAGS) /OUT:blackwave.exe $** Advapi32.lib
@@ -154,5 +164,13 @@ asdcp-util.exe: libasdcp.lib asdcp-util.obj j2c-test.exe: libasdcp.lib j2c-test.obj
$(LINK) $(LINKFLAGS) /OUT:j2c-test.exe $** Advapi32.lib
+!IFDEF USE_AS_02
+as-02-wrap.exe: libas02.lib as-02-wrap.obj
+ $(LINK) $(LINKFLAGS) /OUT:as-02-wrap.exe $** Advapi32.lib
+
+as-02-unwrap.exe: libas02.lib as-02-unwrap.obj
+ $(LINK) $(LINKFLAGS) /OUT:as-02-unwrap.exe $** Advapi32.lib
+!ENDIF
+
# END Makefile
diff --git a/win32/README.txt b/win32/README.txt index ca3d9fd..76e76c7 100755 --- a/win32/README.txt +++ b/win32/README.txt @@ -49,6 +49,10 @@ Without XML parsing: C:\Program Files\asdcplib\win32>nmake WITH_OPENSSL="c:\Program Files\openssl-0.9.8j"
/f Makefile.mak
+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
|