working towards RC6... soon

svn path=/trunk/; revision=4205

5 files changed, 43 insertions, 17 deletions

diff --git a/packages/darwin_app/org.puredata.pd.plist b/packages/darwin_app/org.puredata.pd.plist
index 9ca5f84f..4d5b7583 100644
--- a/packages/darwin_app/org.puredata.pd.plist
+++ b/packages/darwin_app/org.puredata.pd.plist
@@ -39,8 +39,6 @@
 	<key>loadlib17</key>
 	<string>loaders</string>
 	<key>loadlib18</key>
-	<string>zexy</string>
-	<key>loadlib19</key>
 	<string>markex</string>
 </dict>
 </plist>
diff --git a/packages/win32_inno/Makefile b/packages/win32_inno/Makefile
index d2736187..ce1f7a78 100755
--- a/packages/win32_inno/Makefile
+++ b/packages/win32_inno/Makefile
@@ -12,6 +12,30 @@ BUILDLAYOUT_DIR = $(CWD)/..
 
 include $(BUILDLAYOUT_DIR)/Makefile.buildlayout
 
+# base level optimizations
+OPT_CFLAGS = -O3 -funroll-loops -fomit-frame-pointer -fstrict-aliasing
+
+# Generic x86 (tune for Pentium III, since that's most common these days)
+OPT_CFLAGS += -march=pentium-mmx -mtune=pentium3 -mmmx
+
+# INTEL
+#
+# Pentium MMX
+#OPT_CFLAGS += -march=pentium-mmx -mmmx
+# Pentium Pro
+#OPT_CFLAGS += -march=pentiumpro -mmmx
+# Pentium II/Celeron
+#OPT_CFLAGS += -mfpmath=sse -mmmx -msse -march=pentium2
+# Pentium III/Celeron2
+#OPT_CFLAGS += -mfpmath=sse -mmmx -msse -march=pentium3
+# Pentium 4
+#OPT_CFLAGS += -mfpmath=sse -mmmx -msse -msse2 -march=pentium4
+
+# AMD
+#
+# Athlon XP K7
+#OPT_CFLAGS = -O3 -march=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
@@ -19,6 +43,7 @@ DEST_PATHS = BUILDLAYOUT_DIR=$(BUILDLAYOUT_DIR) \
 				cvs_root_dir=$(cvs_root_dir) \
 				DESTDIR=$(DESTDIR) \
 				prefix=$(prefix) \
+				OPT_CFLAGS="$(OPT_CFLAGS)" \
 				UNAME=$(UNAME)
 
 PD_INNO_SETUP = pd-inno.iss
@@ -61,9 +86,13 @@ $(PD_INNO_SETUP): $(PD_INNO_SETUP).in
 #
 #==============================================================================#
 
+distclean: clean
+	cd $(packages_src) && make $(DEST_PATHS) distclean
+
+
 clean: 	
-	rm $(PD_INNO_SETUP)
-	cd $(packages_src) && make $(DEST_PATHS) clean
+	-rm $(PD_INNO_SETUP)
+	-cd $(packages_src) && make $(DEST_PATHS) clean
 
 
 
diff --git a/packages/win32_inno/TODO b/packages/win32_inno/TODO
index f22cf77e..9b2541ee 100644
--- a/packages/win32_inno/TODO
+++ b/packages/win32_inno/TODO
@@ -1,10 +1,6 @@
 
-- update pd-settings.reg with libs from org.puredata.pd.plist
-
 - check out using env vars in Path settings in registry, or make relative paths
 
-- move gripd files to pd\gripd
-
 - Another detail is that the menu item "help/1 manual" results in no action -
   possibly some link pointing to the wrong place?  It turns out that the
   rundll "open" thingy isn't working...
diff --git a/packages/win32_inno/pd-inno.iss.in b/packages/win32_inno/pd-inno.iss.in
index dc956c23..b0fad843 100755
--- a/packages/win32_inno/pd-inno.iss.in
+++ b/packages/win32_inno/pd-inno.iss.in
@@ -40,14 +40,14 @@ Name: {group}\Documentation\Gem Manual; Filename: {app}\doc\gem\00.manual\index.
 Name: {group}\Documentation\Gem Primer; Filename: {app}\doc\gem\GemPrimer.pdf

 ;-----------------------------------------------------------------------------

 ; GRIPD

-#ifexist "build\bin\gripd.exe"

-Name: {group}\GrIPD; Filename: {app}\bin\gripd.exe

+#ifexist "build\gripd\gripd.exe"

+Name: {group}\GrIPD; Filename: {app}\gripd\gripd.exe

 #endif

 

 

 [Run]

 ; NOTE: The following entry contains an English phrase ("Launch"). You are free to translate it into another language if required.

-Filename: {app}\pd.bat; Description: Launch Pure Data; Flags: nowait postinstall skipifsilent

+Filename: {app}\bin\pd.exe; Description: Launch Pure Data; Flags: nowait postinstall skipifsilent

 

 [UninstallDelete]

 Type: files; Name: {app}\pd.url

diff --git a/packages/win32_inno/pd-settings.reg b/packages/win32_inno/pd-settings.reg
index 1e88bb18..27fdab77 100755
--- a/packages/win32_inno/pd-settings.reg
+++ b/packages/win32_inno/pd-settings.reg
@@ -7,12 +7,15 @@ Windows Registry Editor Version 5.00
 "path4"="c:/progra~1/pd/extra/iemmatrix"

 "path5"="c:/progra~1/pd/extra/ix"

 "path6"="c:/progra~1/pd/extra/memento"

-"path7"="c:/progra~1/pd/extra/rradical"

-"path8"="c:/progra~1/pd/extra/pixelTANGO"

-"path9"="c:/progra~1/pd/extra/smlib"

-"path10"="c:/progra~1/pd/extra/toxy"

-"path11"="c:/progra~1/pd/extra/unauthorized"

-"path12"="c:/progra~1/pd/extra/zexy"

+"path7"="c:/progra~1/pd/extra/markex"

+"path8"="c:/progra~1/pd/extra/mjlib"

+"path9"="c:/progra~1/pd/extra/motex"

+"path10"="c:/progra~1/pd/extra/rradical"

+"path11"="c:/progra~1/pd/extra/pixelTANGO"

+"path12"="c:/progra~1/pd/extra/smlib"

+"path13"="c:/progra~1/pd/extra/toxy"

+"path14"="c:/progra~1/pd/extra/unauthorized"

+"path15"="c:/progra~1/pd/extra/zexy"

 "loadlib1"="dyn~"

 "loadlib2"="gem"

 "loadlib3"="gripd"