[aaf-commits] AAF/Utilities/eli2aaf GNUmakefile, 1.4, 1.5 eli2aaf.cpp, 1.20, 1.21

[Stuart C. <stu...@us...>]

Update of /cvsroot/aaf/AAF/Utilities/eli2aaf
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv23823

Modified Files:
	GNUmakefile eli2aaf.cpp 
Log Message:
Fix MSVC compiler warning.


Index: eli2aaf.cpp
===================================================================
RCS file: /cvsroot/aaf/AAF/Utilities/eli2aaf/eli2aaf.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** eli2aaf.cpp	30 Aug 2005 15:10:48 -0000	1.20
--- eli2aaf.cpp	15 May 2007 16:30:25 -0000	1.21
***************
*** 551,555 ****
  	SET_PROPERTY_VALUE( DIDFrameIndexByteOrder, aafUInt16, 0x4949 );
  	SET_PROPERTY_VALUE( DIDFirstFrameOffset, aafInt32, 0x0 );
! 	SET_PROPERTY_VALUE( DIDImageSize, aafInt32, eslength );
  	if (formatPAL)
  	{
--- 551,555 ----
  	SET_PROPERTY_VALUE( DIDFrameIndexByteOrder, aafUInt16, 0x4949 );
  	SET_PROPERTY_VALUE( DIDFirstFrameOffset, aafInt32, 0x0 );
! 	SET_PROPERTY_VALUE( DIDImageSize, aafInt32, static_cast<aafInt32>(eslength) );
  	if (formatPAL)
  	{

Index: GNUmakefile
===================================================================
RCS file: /cvsroot/aaf/AAF/Utilities/eli2aaf/GNUmakefile,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** GNUmakefile	7 Mar 2005 16:56:00 -0000	1.4
--- GNUmakefile	15 May 2007 16:30:25 -0000	1.5
***************
*** 50,64 ****
  BINTARGET = $(AAFSDKBINDIR)/$(PROGNAME)$(EXE)
  
  .PHONY : all
  all : $(OBJDIR) $(BINTARGET)
  
- ifeq ($(AAFTARGET),Debug-static)
  $(BINTARGET) : $(CXXOBJS)
! 	$(LD) $(CXXOBJS) -L$(AXLIBDIR) -laxLib $(STATIC_LINK_LINE) -o $@
! else
! $(BINTARGET) : $(CXXOBJS)
! 	$(LD) $(CXXOBJS) $(RPATH_OPT) \
! 	-L$(AAFSDKLIBDIR) -L$(OBJDIR) -L$(AXLIBDIR) -laxLib -laaflib -laafiid $(LIBCIO) -o $@
! endif
  
  .PHONY : clean
--- 50,63 ----
  BINTARGET = $(AAFSDKBINDIR)/$(PROGNAME)$(EXE)
  
+ LINK_AXLIB_APP = -L$(AXLIBDIR) -laxLib
+ ifeq ($(COMPILER),cl)
+   LINK_AXLIB_APP = $(AXLIBDIR)/libaxLib$(LIBEXT)
+ endif
+ 
  .PHONY : all
  all : $(OBJDIR) $(BINTARGET)
  
  $(BINTARGET) : $(CXXOBJS)
! 	$(LD) $(CXXOBJS) $(LINK_AXLIB_APP) $(LINK_AAF_APP)
  
  .PHONY : clean