[aaf-commits] AAF/DevUtils/MXFDump GNUmakefile, 1.3, 1.4 MXFDump.cpp, 1.781, 1.782

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

Update of /cvsroot/aaf/AAF/DevUtils/MXFDump
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv8518

Modified Files:
	GNUmakefile MXFDump.cpp 
Log Message:
Add support for building on i386Darwin and SparcSolaris platforms.


Index: GNUmakefile
===================================================================
RCS file: /cvsroot/aaf/AAF/DevUtils/MXFDump/GNUmakefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** GNUmakefile	21 Sep 2005 16:48:05 -0000	1.3
--- GNUmakefile	17 Apr 2007 14:37:12 -0000	1.4
***************
*** 30,34 ****
  include $(AAFBASE)/build/common.mk
  
! ifeq ($(AAFPLATFORM),PPCDarwin)
  PLATFORMLIBS += -framework CoreServices
  endif
--- 30,35 ----
  include $(AAFBASE)/build/common.mk
  
! # Add -framework linker arg for all Darwin platforms (intel, ppc, universal)
! ifneq (,$(findstring Darwin,$(AAFPLATFORM)))
  PLATFORMLIBS += -framework CoreServices
  endif
***************
*** 41,45 ****
  
  $(AAFSDKBINDIR)/MXFDump$(EXE) : $(CXXOBJS)
! 	$(LD) $(PLATFORMLIBS) $(CXXOBJS) $(RPATH_OPT) $(LIBCIO) -o $@
  
  .PHONY : clean
--- 42,46 ----
  
  $(AAFSDKBINDIR)/MXFDump$(EXE) : $(CXXOBJS)
! 	$(LD) $(PLATFORMLIBS) $(CXXOBJS) $(LIBCIO) -o $@
  
  .PHONY : clean

Index: MXFDump.cpp
===================================================================
RCS file: /cvsroot/aaf/AAF/DevUtils/MXFDump/MXFDump.cpp,v
retrieving revision 1.781
retrieving revision 1.782
diff -C2 -d -r1.781 -r1.782
*** MXFDump.cpp	11 Apr 2007 19:54:15 -0000	1.781
--- MXFDump.cpp	17 Apr 2007 14:37:13 -0000	1.782
***************
*** 58,61 ****
--- 58,64 ----
  #define MXF_COMPILER_GCC_PPC_MACOSX
  #define MXF_OS_MACOSX
+ #elif defined(__GNUC__) && defined(__i386__) && defined(__APPLE__)
+ #define MXF_COMPILER_GCC_INTEL_MACOSX
+ #define MXF_OS_MACOSX
  #elif defined(__GNUC__) && defined(__powerpc__) && defined(__linux__)
  #define MXF_COMPILER_GCC_PPC_LINUX
***************
*** 70,73 ****
--- 73,79 ----
  #define MXF_COMPILER_GCC_INTEL_CYGWIN
  #define MXF_OS_UNIX
+ #elif defined(__GNUC__) && defined(__sparc__) && defined(__sun__)
+ #define MXF_COMPILER_GCC_SPARC_SUNOS
+ #define MXF_OS_UNIX
  #else
  #error "Unknown compiler"
***************
*** 180,183 ****
--- 186,203 ----
  #define MXFPRIx32 "lx"
  #define MXFPRIx64 "llx"
+ #elif defined(MXF_COMPILER_GCC_INTEL_MACOSX)
+ typedef unsigned char          mxfUInt08;
+ typedef unsigned short int     mxfUInt16;
+ typedef unsigned long int      mxfUInt32;
+ typedef unsigned long long int mxfUInt64;
+ 
+ #define MXFPRIu08 "u"
+ #define MXFPRIu16 "hu"
+ #define MXFPRIu32 "lu"
+ #define MXFPRIu64 "llu"
+ #define MXFPRIx08 "x"
+ #define MXFPRIx16 "hx"
+ #define MXFPRIx32 "lx"
+ #define MXFPRIx64 "llx"
  #elif defined(MXF_COMPILER_GCC_PPC_LINUX)
  typedef unsigned char          mxfUInt08;
***************
*** 208,212 ****
  #define MXFPRIx32 "lx"
  #define MXFPRIx64 "llx"
! #elif defined (MXF_COMPILER_GCC_INTEL_FREEBSD)
  typedef unsigned char          mxfUInt08;
  typedef unsigned short int     mxfUInt16;
--- 228,232 ----
  #define MXFPRIx32 "lx"
  #define MXFPRIx64 "llx"
! #elif defined(MXF_COMPILER_GCC_INTEL_FREEBSD)
  typedef unsigned char          mxfUInt08;
  typedef unsigned short int     mxfUInt16;
***************
*** 236,239 ****
--- 256,273 ----
  #define MXFPRIx32 "lx"
  #define MXFPRIx64 "llx"
+ #elif defined(MXF_COMPILER_GCC_SPARC_SUNOS)
+ typedef unsigned char          mxfUInt08;
+ typedef unsigned short int     mxfUInt16;
+ typedef unsigned long int      mxfUInt32;
+ typedef unsigned long long int mxfUInt64;
+ 
+ #define MXFPRIu08 "u"
+ #define MXFPRIu16 "hu"
+ #define MXFPRIu32 "lu"
+ #define MXFPRIu64 "llu"
+ #define MXFPRIx08 "x"
+ #define MXFPRIx16 "hx"
+ #define MXFPRIx32 "lx"
+ #define MXFPRIx64 "llx"
  #endif