tweaked things to allow for setting CPU-specific build flags

svn path=/trunk/; revision=6937

5 files changed, 20 insertions, 21 deletions

diff --git a/packages/Makefile b/packages/Makefile
index 6045ea6f..91e95b54 100644
--- a/packages/Makefile
+++ b/packages/Makefile
@@ -263,9 +263,10 @@ $(pd_src)/src/configure: $(pd_src)/src/configure.in
 #$(pd_src)/src/makefile: $(pd_src)/src/makefile.in
 #	cd $(pd_src)/src/ && ./configure $(PD_CONFIGURE_FLAGS)
 
+# this line has the "-" to support the current makefile.mingw hack
 pd: $(pd_src)/src/configure
-	echo $$MACOSX_DEPLOYMENT_TARGET
 	-cd $(pd_src)/src && ./configure $(PD_CONFIGURE_FLAGS) && \
+		make OPT_CFLAGS="" depend  && \
 		make $(DEST_PATHS) $(PD_BUILD_FLAGS)
 
 pd++:
diff --git a/packages/Makefile.buildlayout b/packages/Makefile.buildlayout
index cf50700b..ea892421 100644
--- a/packages/Makefile.buildlayout
+++ b/packages/Makefile.buildlayout
@@ -61,7 +61,7 @@ endif
 #==============================================================================#
 
 # base level optimizations
-OPT_CFLAGS = -O3 -funroll-loops -fomit-frame-pointer
+OPT_CFLAGS = -O2
 
 DEBUG_CFLAGS = -ggdb
 
diff --git a/packages/TODO b/packages/TODO
index 9d20e6ea..e59e4a1f 100644
--- a/packages/TODO
+++ b/packages/TODO
@@ -1,11 +1,12 @@
 
+- output the compilation flags to the resulting package so that different
+  builds with the same name can be distinguished
+
 - for release branch, remove class_sethelpsymbol() from iemlib and zexy
 
 - make a web page that has stuff that can't be included due to license and patent issues:
   (percolate, mp3, mpeg2, mpeg4, etc)
 
-- reintroduce patch for making Pd window font not bold
-
 - make all of pd/src/x_*.c into a standalone library that is optionally loaded
   by Pd.  Then these objects can be placed into the namespace.
 
diff --git a/packages/darwin_app/BUGS b/packages/darwin_app/BUGS
deleted file mode 100644
index 6fccfdc5..00000000
--- a/packages/darwin_app/BUGS
+++ /dev/null
@@ -1,4 +0,0 @@
-
-- help menu seems to cause long pauses on some machine (the cause of the
-  problem is conjecture, and I haven't seen the problem in action -Hans)
-
diff --git a/packages/darwin_app/Makefile b/packages/darwin_app/Makefile
index 6962f15e..295f87ff 100644
--- a/packages/darwin_app/Makefile
+++ b/packages/darwin_app/Makefile
@@ -26,34 +26,34 @@ WISH_CONTENTS = "$(WISH)/Contents"
 TARGET_PLATFORM := $(shell uname -p)
 
 # base level optimizations
-OPT_CFLAGS = -Os -funroll-loops -fomit-frame-pointer
+#OPT_CFLAGS = -Os -funroll-loops -fomit-frame-pointer
 
-# auto-vectorization in GCC 4.x (too buggy in 4.0, wait for 4.1)
-#OPT_CFLAGS += -ftree-vectorize -ftree-vectorizer-verbose=3
+# 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=pentium3 -msse -msse2 -mfpmath=sse
+OPT_CFLAGS += -march=pentium4 -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
+# Package default, support older PowerPCs, but G3 is the most common
+#OPT_CFLAGS += -mcpu=powerpc -mtune=G3
 
-# CPU-specific gleaned from http://developer.apple.com/releasenotes/DeveloperTools/RN-GCC4/
-# check this too: http://hpc.sourceforge.net/
+# CPU-specific gleaned from:
+# http://developer.apple.com/releasenotes/DeveloperTools/RN-GCC4/
+# http://hpc.sourceforge.net/
 # Generic PowerPC
 #OPT_CFLAGS += -mcpu=powerpc -mpowerpc
 # PowerPC 750 (G3)
 #OPT_CFLAGS += -mcpu=750 -mpowerpc-gfxopt
 # PowerPC 7400 (G4 <= 700Mhz) 
-#OPT_CFLAGS += -mcpu=7400 -faltivec -mpowerpc-gfxopt
+#OPT_CFLAGS += -fast -fPIC -mcpu=G4 -mtune=G4
 # PowerPC 7450 (G4 >= 533MHz) 
-#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
+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
 # output to the same directory tree
 DEST_PATHS = BUILDLAYOUT_DIR=$(BUILDLAYOUT_DIR) \
@@ -339,6 +339,7 @@ test_package:
 
 test_locations:
 	@echo --------------------------------------------------
+	@echo "OPT_CFLAGS: $(OPT_CFLAGS)"
 	@echo "PD_VERSION: $(PD_VERSION)"
 	@echo "PACKAGE_NAME: $(PACKAGE_NAME)"
 	@echo "PD-EXTENDED_VERSION: $(PD-EXTENDED_VERSION)"