[PD-cvs] packages/win32_inno Makefile, 1.6, 1.7 TODO, 1.8, 1.9 pd-inno.iss.in, 1.3, 1.4 pd-settings.reg, 1.2, 1.3

[Hans-Christoph Steiner]

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

Modified Files:
	Makefile TODO pd-inno.iss.in pd-settings.reg 
Log Message:
working towards RC6... soon

Index: pd-settings.reg
===================================================================
RCS file: /cvsroot/pure-data/packages/win32_inno/pd-settings.reg,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** pd-settings.reg	28 Nov 2005 23:49:25 -0000	1.2
--- pd-settings.reg	14 Dec 2005 00:35:12 -0000	1.3
***************
*** 8,17 ****
  "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"
  "loadlib1"="dyn~"
  "loadlib2"="gem"
--- 8,20 ----
  "path5"="c:/progra~1/pd/extra/ix"
  "path6"="c:/progra~1/pd/extra/memento"
! "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"

Index: Makefile
===================================================================
RCS file: /cvsroot/pure-data/packages/win32_inno/Makefile,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Makefile	12 Dec 2005 02:17:04 -0000	1.6
--- Makefile	14 Dec 2005 00:35:12 -0000	1.7
***************
*** 13,16 ****
--- 13,40 ----
  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
***************
*** 20,23 ****
--- 44,48 ----
  				DESTDIR=$(DESTDIR) \
  				prefix=$(prefix) \
+ 				OPT_CFLAGS="$(OPT_CFLAGS)" \
  				UNAME=$(UNAME)
  
***************
*** 62,68 ****
  #==============================================================================#
  
  clean: 	
! 	rm $(PD_INNO_SETUP)
! 	cd $(packages_src) && make $(DEST_PATHS) clean
  
  
--- 87,97 ----
  #==============================================================================#
  
+ distclean: clean
+ 	cd $(packages_src) && make $(DEST_PATHS) distclean
+ 
+ 
  clean: 	
! 	-rm $(PD_INNO_SETUP)
! 	-cd $(packages_src) && make $(DEST_PATHS) clean
  
  

Index: TODO
===================================================================
RCS file: /cvsroot/pure-data/packages/win32_inno/TODO,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** TODO	12 Dec 2005 01:58:39 -0000	1.8
--- TODO	14 Dec 2005 00:35:12 -0000	1.9
***************
*** 1,9 ****
  
- - 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
--- 1,5 ----

Index: pd-inno.iss.in
===================================================================
RCS file: /cvsroot/pure-data/packages/win32_inno/pd-inno.iss.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** pd-inno.iss.in	27 Nov 2005 05:04:02 -0000	1.3
--- pd-inno.iss.in	14 Dec 2005 00:35:12 -0000	1.4
***************
*** 41,46 ****
  ;-----------------------------------------------------------------------------
  ; GRIPD
! #ifexist "build\bin\gripd.exe"
! Name: {group}\GrIPD; Filename: {app}\bin\gripd.exe
  #endif
  
--- 41,46 ----
  ;-----------------------------------------------------------------------------
  ; GRIPD
! #ifexist "build\gripd\gripd.exe"
! Name: {group}\GrIPD; Filename: {app}\gripd\gripd.exe
  #endif
  
***************
*** 48,52 ****
  [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
  
  [UninstallDelete]
--- 48,52 ----
  [Run]
  ; NOTE: The following entry contains an English phrase ("Launch"). You are free to translate it into another language if required.
! Filename: {app}\bin\pd.exe; Description: Launch Pure Data; Flags: nowait postinstall skipifsilent
  
  [UninstallDelete]