From aba4470b7fddd18f3215ca0dd11402ad1cb8be4e Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <eighthave@users.sourceforge.net>
Date: Sun, 18 Dec 2005 21:40:53 +0000
Subject: fixed linux package bug that left out pd-gui; tweaked optimization
 setup

svn path=/trunk/; revision=4251
---
 packages/Makefile.buildlayout |  2 +-
 packages/linux_make/Makefile  | 26 ++++++++++++++++++++++++++
 packages/win32_inno/Makefile  |  2 +-
 3 files changed, 28 insertions(+), 2 deletions(-)

(limited to 'packages')

diff --git a/packages/Makefile.buildlayout b/packages/Makefile.buildlayout
index d485cfec..07742128 100644
--- a/packages/Makefile.buildlayout
+++ b/packages/Makefile.buildlayout
@@ -89,7 +89,7 @@ ifeq ($(OS_NAME),darwin)
       libpdbindir = $(bindir)
     else
       libpddir = $(libdir)/pd
-      libpdbindir = $(libpdbindir)/bin
+      libpdbindir = $(libpddir)/bin
     endif
 endif
 
diff --git a/packages/linux_make/Makefile b/packages/linux_make/Makefile
index 22c36b8c..734b9389 100755
--- a/packages/linux_make/Makefile
+++ b/packages/linux_make/Makefile
@@ -18,12 +18,38 @@ prefix = /usr/local
 include $(BUILDLAYOUT_DIR)/Makefile.buildlayout
 
 
+# base level optimizations
+OPT_CFLAGS = -O3 -funroll-loops -fomit-frame-pointer
+
+# Generic x86 (tune for Pentium III, since that's more common these days)
+#OPT_CFLAGS += -mcpu=i386 -mtune=pentium3
+OPT_CFLAGS += -mcpu=pentium
+
+# INTEL
+#
+# Pentium MMX
+#OPT_CFLAGS += -mcpu=pentium-mmx -mmmx
+# Pentium Pro
+#OPT_CFLAGS += -mcpu=pentiumpro -mmmx
+# Pentium II/Celeron
+#OPT_CFLAGS += -mfpmath=sse -mmmx -msse -mcpu=pentium2
+# Pentium III/Celeron2
+#OPT_CFLAGS += -mfpmath=sse -mmmx -msse -mcpu=pentium3
+# Pentium 4
+#OPT_CFLAGS += -mfpmath=sse -mmmx -msse -msse2 -mcpu=pentium4
+
+# AMD
+#
+# Athlon XP K7
+#OPT_CFLAGS = -O3 -mcpu=athlon-xp -m3dnow -msse -mfpmath=sse
+
 # 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) \
 				cvs_root_dir=$(cvs_root_dir) \
 				DESTDIR=$(DESTDIR) \
 				prefix=$(prefix) \
+				OPT_CFLAGS="$(OPT_CFLAGS)" \
 				UNAME=$(UNAME)
 
 
diff --git a/packages/win32_inno/Makefile b/packages/win32_inno/Makefile
index ce1f7a78..204b83a7 100755
--- a/packages/win32_inno/Makefile
+++ b/packages/win32_inno/Makefile
@@ -13,7 +13,7 @@ BUILDLAYOUT_DIR = $(CWD)/..
 include $(BUILDLAYOUT_DIR)/Makefile.buildlayout
 
 # base level optimizations
-OPT_CFLAGS = -O3 -funroll-loops -fomit-frame-pointer -fstrict-aliasing
+OPT_CFLAGS = -O3 -funroll-loops -fomit-frame-pointer
 
 # Generic x86 (tune for Pentium III, since that's most common these days)
 OPT_CFLAGS += -march=pentium-mmx -mtune=pentium3 -mmmx
-- 
cgit v1.2.1