- added pentium3 optimization flags on Intel Macs, since it highly unlikely to

  run on older hardware, and Apple only supports Pentium4 and above

- added /Applications link to dmg

svn path=/trunk/; revision=6777

2 files changed, 18 insertions, 31 deletions

diff --git a/packages/darwin_app/Makefile b/packages/darwin_app/Makefile
index 0142c110..6962f15e 100644
--- a/packages/darwin_app/Makefile
+++ b/packages/darwin_app/Makefile
@@ -22,13 +22,24 @@ WISH_NAME := $(shell ( test -d $(WISH_SOURCE)/Wish.app && echo Wish) \
 WISH = "$(WISH_SOURCE)/$(WISH_NAME).app"
 WISH_CONTENTS = "$(WISH)/Contents"
 
+# which CPU to compile for
+TARGET_PLATFORM := $(shell uname -p)
+
 # base level optimizations
 OPT_CFLAGS = -Os -funroll-loops -fomit-frame-pointer
 
-# which CPU to compile for
-TARGET_PLATFORM := $(shell uname -p)
+# auto-vectorization in GCC 4.x (too buggy in 4.0, wait for 4.1)
+#OPT_CFLAGS += -ftree-vectorize -ftree-vectorizer-verbose=3
+
+ifeq ($(TARGET_PLATFORM),i386)
+OPT_CFLAGS += -march=pentium3 -msse -msse2 -mfpmath=sse
+endif
+
+ifeq ($(TARGET_PLATFORM),powerpc)
+# Package default, support older PowerPCs, but G4 (7450) is the most common
+OPT_CFLAGS += -mcpu=powerpc -mtune=7450 -mpowerpc-gfxopt
 
-# CPU-specific gleaned from http://developer.apple.com/releasenotes/DeveloperTools/GCC3.html
+# CPU-specific gleaned from http://developer.apple.com/releasenotes/DeveloperTools/RN-GCC4/
 # check this too: http://hpc.sourceforge.net/
 # Generic PowerPC
 #OPT_CFLAGS += -mcpu=powerpc -mpowerpc
@@ -37,16 +48,9 @@ TARGET_PLATFORM := $(shell uname -p)
 # PowerPC 7400 (G4 <= 700Mhz) 
 #OPT_CFLAGS += -mcpu=7400 -faltivec -mpowerpc-gfxopt
 # PowerPC 7450 (G4 >= 533MHz) 
-#OPT_CFLAGS += -fast -fPIC -mcpu=7450 -mtune=7450 -faltivec -ffast-math -mpowerpc-gfxopt
+#OPT_CFLAGS += -fPIC -mcpu=7450 -mtune=7450 -fast -faltivec -ffast-math -mpowerpc-gfxopt
 # PowerPC G5 (gcc-3.3)
 #OPT_CFLAGS += -fast -fPIC -faltivec -mpowerpc-gpopt -mpowerpc-gfxopt
-
-# auto-vectorization would be nice:
-# http://gcc.gnu.org/projects/tree-ssa/vectorization.html
-
-ifeq ($(TARGET_PLATFORM),powerpc)
-  # Package default, support older PowerPCs, but G4 (7450) is the most common
-  OPT_CFLAGS += -mcpu=powerpc -mtune=7450 -mpowerpc-gfxopt
 endif
 
 
@@ -254,6 +258,8 @@ dmg:
 	install -p $(manualsdir)/Pd/ReadMe.html "/Volumes/$(PACKAGE_NAME)"
 	install -p -m0644 org.puredata.pd.plist "/Volumes/$(PACKAGE_NAME)"
 	install -d "/Volumes/$(PACKAGE_NAME)/.imagefolder"
+# add link to /Applications for easy install
+	cd "/Volumes/$(PACKAGE_NAME)/" && ln -s /Applications
 # background image will only show when the disk image is called "Pd-extended
 # the background image needs to be added to the .DS_Store to work
 #	install -p background.png "/Volumes/$(PACKAGE_NAME)/.imagefolder/"
@@ -277,7 +283,7 @@ dmg:
 #==============================================================================#
 
 
-distclean: clean
+distclean: package_clean
 	$(MAKE) -C $(packages_src) $(DEST_PATHS) distclean
 
 
diff --git a/packages/darwin_app/TODO b/packages/darwin_app/TODO
index 04cfb367..46378e7a 100644
--- a/packages/darwin_app/TODO
+++ b/packages/darwin_app/TODO
@@ -22,16 +22,6 @@
 
 	  - according to tigital, not all of the gui/ix deps are ported to Aqua...
 
-
-- from Carmen Rocco about [fiddle~] crash: 
-  "is fiddle~: 
-  		 * compiled with the same header 
-		 * linked with the same binary of (lib)pd 
-		 * compiled with the same compiler? 
-  i had very similar issues with bonk on windows (Virtually same stacktrace
-  but s/fiddle/bonk) until fixing the above 3 things..."
-
-
 - review permissions so that you can build on top on existing builds (its the
   Frameworks, just chmod -R +w after installingx)
 
@@ -66,12 +56,3 @@ http://developer.apple.com/documentation/MacOSX/Conceptual/BPFileSystem/Articles
 
   http://developer.apple.com/documentation/mac/runtimehtml/RTArch-43.html
 
-
-------------------------------------------------------------------------------
-semi-abandoned TODOs
-
-- instead of shipping Pd.app with a org.puredata.pd.plist, make a script that
-  uses the "defaults" command to add the desired prefs to any existing
-  file. (its a good idea, but unforunately, the key names prevent that from
-  working, i.e. loadlib1, loadlib2, etc)
-