[PD-cvs] packages/darwin_app Makefile,1.65.2.1,1.65.2.2

[Hans-Christoph Steiner]

Update of /cvsroot/pure-data/packages/darwin_app
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26096

Modified Files:
      Tag: branch-v0-39-2-extended
	Makefile 
Log Message:
added some detection for OPT_FLAGS; made find statement compatible with older versions

Index: Makefile
===================================================================
RCS file: /cvsroot/pure-data/packages/darwin_app/Makefile,v
retrieving revision 1.65.2.1
retrieving revision 1.65.2.2
diff -C2 -d -r1.65.2.1 -r1.65.2.2
*** Makefile	18 Dec 2006 06:21:19 -0000	1.65.2.1
--- Makefile	6 Jan 2007 21:54:20 -0000	1.65.2.2
***************
*** 29,40 ****
  #OPT_CFLAGS = -Os -funroll-loops -fomit-frame-pointer
  
  # auto-vectorization in GCC 4.x for CPUs with SIMD
! OPT_CFLAGS += -ftree-vectorize -ftree-vectorizer-verbose=3
  
  ifeq ($(TARGET_PLATFORM),i386)
! OPT_CFLAGS += -march=pentium4 -msse -msse2 -mfpmath=sse
  endif
  
! ifeq ($(TARGET_PLATFORM),powerpc)
  # Package default, support older PowerPCs, but G3 is the most common
  #OPT_CFLAGS += -mcpu=powerpc -mtune=G3
--- 29,49 ----
  #OPT_CFLAGS = -Os -funroll-loops -fomit-frame-pointer
  
+ # 10.3 uses gcc 3.3, and 10.3 only runs on PowerPC
+ GCC_VERSION := $(shell gcc -dumpversion)
+ ifeq ($(GCC_VERSION),3.3)
+ OPT_CFLAGS += -O3 -funroll-loops -fomit-frame-pointer -mcpu=powerpc -mtune=G3
+ else
  # auto-vectorization in GCC 4.x for CPUs with SIMD
! OPT_CFLAGS = -ftree-vectorize -ftree-vectorizer-verbose=2 \
! 	-fast -fPIC -mcpu=7450 -mtune=7450
! endif
  
+ # Mac/Intels only run 10.4, so always gcc 4.x
  ifeq ($(TARGET_PLATFORM),i386)
! OPT_CFLAGS = -march=pentium4 -msse2 -mfpmath=sse \
! 	-ftree-vectorize -ftree-vectorizer-verbose=2
  endif
  
! #ifeq ($(TARGET_PLATFORM),powerpc)
  # Package default, support older PowerPCs, but G3 is the most common
  #OPT_CFLAGS += -mcpu=powerpc -mtune=G3
***************
*** 50,57 ****
  #OPT_CFLAGS += -fast -fPIC -mcpu=G4 -mtune=G4
  # PowerPC 7450 (G4 >= 533MHz) 
! OPT_CFLAGS += -fast -fPIC -mcpu=7450 -mtune=7450
  # PowerPC G5 (gcc-4.x)
  #OPT_CFLAGS += -fast -fPIC
! endif
  
  # these are sent to all of the various Makefiles so that they all copy their
--- 59,66 ----
  #OPT_CFLAGS += -fast -fPIC -mcpu=G4 -mtune=G4
  # PowerPC 7450 (G4 >= 533MHz) 
! #OPT_CFLAGS += -fast -fPIC -mcpu=7450 -mtune=7450
  # PowerPC G5 (gcc-4.x)
  #OPT_CFLAGS += -fast -fPIC
! #endif
  
  # these are sent to all of the various Makefiles so that they all copy their
***************
*** 215,219 ****
  	find $(pddocdir) -name '*.pd' -exec \
  		sed -i.b 's/^\(\#N canvas [0-9]* [0-9]* [0-9]* [0-9]*\) 12/\1 10/' '{}' \;
! 	find $(DESTDIR) -name '*.pd.b' -delete
  
  
--- 224,228 ----
  	find $(pddocdir) -name '*.pd' -exec \
  		sed -i.b 's/^\(\#N canvas [0-9]* [0-9]* [0-9]* [0-9]*\) 12/\1 10/' '{}' \;
! 	find $(DESTDIR) -name '*.pd.b' -print0 | xargs -0 rm -f --