[ingex-commits] ingex/studio/capture Makefile,1.20,1.21

[John F. <jo...@us...>]

Update of /cvsroot/ingex/ingex/studio/capture
In directory vz-cvs-4.sog:/tmp/cvs-serv26452

Modified Files:
	Makefile 
Log Message:
Build bmd_sdi if appropriate environment variable set.


Index: Makefile
===================================================================
RCS file: /cvsroot/ingex/ingex/studio/capture/Makefile,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** Makefile	26 Oct 2011 17:18:20 -0000	1.20
--- Makefile	24 Jan 2012 15:17:05 -0000	1.21
***************
*** 27,43 ****
  include ../../common/dvs_sdk_paths.mk
  
  ifdef DVS_HARDWARE_INCLUDE
!   SDI_PROGS=dvs_sdi dvs_dummy testgen
  else
    $(warning dvs_sdi will not be built)
-   SDI_PROGS=dvs_dummy testgen
  endif
  
! # Set environment variable BMD_HARDWARE_INCLUDE if building bmd_sdi
! # e.g. export BMD_HARDWARE_INCLUDE='/home/ingex/DeckLink/Blackmagic DeckLink SDK 8.6/Linux/include'
! 
  CPPFLAGS = -DDEBUG -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -DUSE_FFMPEG -I../../common -I../common -I../database/src
! CXXFLAGS = -Wall -g -O3
! TARGET_ARCH = -mmmx -msse2
  
  LIBS = -lstudiocommon -lcommon -lYUVlib
--- 27,47 ----
  include ../../common/dvs_sdk_paths.mk
  
+ # Set environment variable BMD_HARDWARE_INCLUDE if building bmd_sdi
+ # e.g. export BMD_HARDWARE_INCLUDE='/home/ingex/DeckLink/Blackmagic DeckLink SDK 8.6/Linux/include'
+ 
+ SDI_PROGS = dvs_dummy testgen
  ifdef DVS_HARDWARE_INCLUDE
!   SDI_PROGS += dvs_sdi
  else
    $(warning dvs_sdi will not be built)
  endif
+ ifdef BMD_HARDWARE_INCLUDE
+   SDI_PROGS += bmd_sdi
+ endif
+ #$(warning Building $(SDI_PROGS))
  
! CC = gcc
  CPPFLAGS = -DDEBUG -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -DUSE_FFMPEG -I../../common -I../common -I../database/src
! CXXFLAGS = -Wall -Wextra -g -O3 -mmmx -msse2
  
  LIBS = -lstudiocommon -lcommon -lYUVlib
***************
*** 55,59 ****
  
  dvs_sdi: dvs_sdi.cpp
! 	$(CXX) $(CXXFLAGS) $(CPPFLAGS) $(TARGET_ARCH) $(DVS_HARDWARE_INCLUDE) $< $(DVS_HARDWARE_LIB) $(LIBS) $(LIBPATHS) -lpthread $(FFMPEG_LIBS) -o $@
  
  dvs_dummy.o: dvs_sdi.cpp
--- 59,63 ----
  
  dvs_sdi: dvs_sdi.cpp
! 	$(LINK.cpp) $(DVS_HARDWARE_INCLUDE) $< $(DVS_HARDWARE_LIB) $(LIBS) $(LIBPATHS) -lpthread $(FFMPEG_LIBS) -o $@
  
  dvs_dummy.o: dvs_sdi.cpp
***************
*** 61,74 ****
  
  dvs_dummy: dvs_dummy.o $(DVS_DUMMY_LIB)
! 	$(CXX) $(LDFLAGS) $(TARGET_ARCH) $^ $(LIBPATHS) $(LIBS) -lpthread  $(FFMPEG_LIBS) -o $@
  
  bmd_sdi: bmd_sdi.cpp
! 	$(LINK.cpp) -I "$(BMD_HARDWARE_INCLUDE)" $<  $(LIBS) $(LIBPATHS) -lpthread $(FFMPEG_LIBS) -lDeckLinkAPI -o bmd_sdi
  
  testgen: testgen.o
! 	$(CXX) $(LDFLAGS) $(TARGET_ARCH) $< $(LIBPATHS) $(LIBS) -lpthread -o $@
  
  nexus_stats: nexus_stats.o
! 	$(CXX) $(LDFLAGS) $(TARGET_ARCH) $< $(LIBPATHS) $(LIBS) -lpthread -o $@
  
  nexus_web: nexus_web.cpp
--- 65,78 ----
  
  dvs_dummy: dvs_dummy.o $(DVS_DUMMY_LIB)
! 	$(LINK.o) $^ -lstdc++ $(LIBPATHS) $(LIBS) -lpthread $(FFMPEG_LIBS) -o $@
  
  bmd_sdi: bmd_sdi.cpp
! 	$(LINK.cpp) -I "$(BMD_HARDWARE_INCLUDE)" $< $(LIBS) $(LIBPATHS) -lpthread $(FFMPEG_LIBS) -lDeckLinkAPI -o $@
  
  testgen: testgen.o
! 	$(LINK.o) $< -lstdc++ $(LIBPATHS) $(LIBS) -lpthread -o $@
  
  nexus_stats: nexus_stats.o
! 	$(LINK.o) $< -lstdc++ $(LIBPATHS) $(LIBS) -lpthread -o $@
  
  nexus_web: nexus_web.cpp
***************
*** 76,92 ****
  
  system_info_web: system_info_web.cpp
! 	@if [ -r /usr/include/shttpd.h -o -r /usr/local/include/shttpd.h ] ; then set -x ; g++ $(CPPFLAGS) system_info_web.cpp -o system_info_web -lshttpd -ldl -lpthread ; else echo "shttpd.h not found - system_info_web will not be built"; echo ; fi
  
  nexus_set_source: nexus_set_source.o
! 	$(CXX) $(TARGET_ARCH) $< $(LIBPATHS) $(LIBS) -lpthread -o $@
  
  nexus_save: nexus_save.o
! 	$(CXX) $(TARGET_ARCH) $< $(LIBPATHS) $(LIBS) $(FFMPEG_LIBS) -lpthread -o $@
  
  nexus_multicast: nexus_multicast.o multicast_compressed.o
! 	$(CXX) $(TARGET_ARCH) nexus_multicast.o multicast_compressed.o -o $@ $(LIBPATHS) $(LIBS) $(FFMPEG_LIBS)
  
  nexus_xv: nexus_xv.o
! 	$(CXX) $(TARGET_ARCH) $< -o nexus_xv $(LIBPATHS) $(LIBS) -L/usr/X11R6/lib -L/usr/X11R6/lib64 -lXv
  
  clean:
--- 80,96 ----
  
  system_info_web: system_info_web.cpp
! 	@if [ -r /usr/include/shttpd.h -o -r /usr/local/include/shttpd.h ] ; then set -x ; $(LINK.cpp) system_info_web.cpp -o system_info_web -lshttpd -ldl -lpthread ; else echo "shttpd.h not found - system_info_web will not be built"; echo ; fi
  
  nexus_set_source: nexus_set_source.o
! 	$(LINK.o) $< -lstdc++ $(LIBPATHS) $(LIBS) -lpthread -o $@
  
  nexus_save: nexus_save.o
! 	$(LINK.o) $< -lstdc++ $(LIBPATHS) $(LIBS) $(FFMPEG_LIBS) -lpthread -o $@
  
  nexus_multicast: nexus_multicast.o multicast_compressed.o
! 	$(LINK.o) $^ -lstdc++ $(LIBPATHS) $(LIBS) $(FFMPEG_LIBS) -o $@
  
  nexus_xv: nexus_xv.o
! 	$(LINK.o) $< -o nexus_xv -lstdc++ $(LIBPATHS) $(LIBS) -L/usr/X11R6/lib -L/usr/X11R6/lib64 -lXv
  
  clean: