diff options
author | Hans-Christoph Steiner <eighthave@users.sourceforge.net> | 2005-06-03 20:28:25 +0000 |
---|---|---|
committer | Hans-Christoph Steiner <eighthave@users.sourceforge.net> | 2005-06-03 20:28:25 +0000 |
commit | ee4b6fc5eacb14be2a2ce5cf15e06ff1d377a891 (patch) | |
tree | 64b11b92c437e377136bb5bade97acf94f4d499a /packages/darwin_app/patches | |
parent | fee3dda9c6fd4e107747dcc14f29e60160837e06 (diff) |
removed jack compilation; added lots of abstractions and objects writen in Pd
svn path=/trunk/; revision=3110
Diffstat (limited to 'packages/darwin_app/patches')
-rw-r--r-- | packages/darwin_app/patches/darwin_linking_fixes.patch | 99 | ||||
-rw-r--r-- | packages/darwin_app/patches/extended-help-menu.patch | 42 |
2 files changed, 141 insertions, 0 deletions
diff --git a/packages/darwin_app/patches/darwin_linking_fixes.patch b/packages/darwin_app/patches/darwin_linking_fixes.patch new file mode 100644 index 00000000..b10edb20 --- /dev/null +++ b/packages/darwin_app/patches/darwin_linking_fixes.patch @@ -0,0 +1,99 @@ +Index: configure.in +=================================================================== +RCS file: /cvsroot/pure-data/pd/src/configure.in,v +retrieving revision 1.8 +diff -r1.8 configure.in +14a15 +> AC_SUBST(TCLTK_FRAMEWORKS_PATH) +175a177,178 +> +> +212a216,233 +> +> if test x$jack == "xyes"; +> then +> LDFLAGS=$LDFLAGS" -lrt -ljack" +> fi +> if test x$jack == "xrun"; +> then +> LDFLAGS=$LDFLAGS" -lrt -ljack" +> fi +> fi +> +> if test x$jack == "xyes"; +> then +> LDFLAGS=$LDFLAGS" -lrt -ljack" +> fi +> if test x$jack == "xrun"; +> then +> LDFLAGS=$LDFLAGS" -lrt -ljack" +242,246c263,281 +< GUINAME="pdtcl" +< GUIFLAGS="-F../../Frameworks -framework Tcl -framework Tk \ +< -I../../Frameworks/Tk.framework/Versions/Current/Headers \ +< -I../../Frameworks/Tcl.framework/Versions/Current/Headers \ +< -I../../Frameworks/Tcl.framework/Versions/8.4/PrivateHeaders" +--- +> GUINAME="libPdTcl.dylib" +> +> # find the Tcl/Tk Frameworks +> if test -d "../../Frameworks"; +> then +> # Miller's location +> TCLTK_FRAMEWORKS_PATH="../../Frameworks" +> elif test -d "/Library/Frameworks"; +> then +> # get it from the default install location +> TCLTK_FRAMEWORKS_PATH="/Library/Frameworks" +> else +> # Panther has Tcl here; Tiger has Tcl and Tk here +> TCLTK_FRAMEWORKS_PATH="/System/Library/Frameworks" +> fi +> GUIFLAGS="-F$TCLTK_FRAMEWORKS_PATH -framework Tcl -framework Tk \ +> -I$TCLTK_FRAMEWORKS_PATH/Tk.framework/Versions/Current/Headers \ +> -I$TCLTK_FRAMEWORKS_PATH/Tcl.framework/Versions/Current/Headers \ +> -I$TCLTK_FRAMEWORKS_PATH/Tcl.framework/Versions/8.4/PrivateHeaders" +258,259c294,297 +< MORECFLAGS=$MORECFLAGS" -DUSEAPI_JACK" +< SYSSRC=$SYSSRC" s_audio_jack.c" +--- +> fi +> if test x$jack == "xrun"; +> then +> LDFLAGS=$LDFLAGS" -framework Jack" +269d306 +< LDFLAGS=$LDFLAGS" -lrt -ljack" +275d311 +< LDFLAGS=$LDFLAGS" -lrt -ljack" +Index: makefile.in +=================================================================== +RCS file: /cvsroot/pure-data/pd/src/makefile.in,v +retrieving revision 1.6 +diff -r1.6 makefile.in +100,104c100,110 +< $(BIN_DIR)/pdtcl: $(GOBJ) $(GSRC) +< cd ../obj; libtool -dynamic -o $(BIN_DIR)/pdtcl $(GOBJ) \ +< ../../Frameworks/Tk.framework/Versions/Current/Tk \ +< ../../Frameworks/Tcl.framework/Versions/Current/Tcl \ +< /usr/lib/libSystem.B.dylib +--- +> $(BIN_DIR)/libPdTcl.dylib: $(GOBJ) $(GSRC) +> cd ../obj && $(CC) -dynamiclib -read_only_relocs warning \ +> -o $(BIN_DIR)/libPdTcl.dylib $(GOBJ) \ +> -F@TCLTK_FRAMEWORKS_PATH@ \ +> -framework Tcl -framework Tk -framework System \ +> -Wl,-install_name,@executable_path/../Resources/bin/libPdTcl.dylib +> install_name_tool -change @TCLTK_FRAMEWORKS_PATH@/Tcl.framework/Versions/8.4/Tcl\ +> @executable_path/../Frameworks/Tcl.framework/Versions/8.4/Tcl \ +> -change @TCLTK_FRAMEWORKS_PATH@/Tk.framework/Versions/8.4/Tk \ +> @executable_path/../Frameworks/Tk.framework/Versions/8.4/Tk \ +> ../bin/libPdTcl.dylib +Index: u_main.tk +=================================================================== +RCS file: /cvsroot/pure-data/pd/src/u_main.tk,v +retrieving revision 1.9 +diff -r1.9 u_main.tk +51c51 +< load $pd_guidir/bin/pdtcl +--- +> load $pd_guidir/bin/libPdTcl.dylib diff --git a/packages/darwin_app/patches/extended-help-menu.patch b/packages/darwin_app/patches/extended-help-menu.patch new file mode 100644 index 00000000..47de8260 --- /dev/null +++ b/packages/darwin_app/patches/extended-help-menu.patch @@ -0,0 +1,42 @@ +Index: u_main.tk +=================================================================== +RCS file: /cvsroot/pure-data/pd/src/u_main.tk,v +retrieving revision 1.9 +diff -u -w -r1.9 u_main.tk +--- u_main.tk 18 May 2005 04:28:51 -0000 1.9 ++++ u_main.tk 23 May 2005 17:18:36 -0000 +@@ -531,6 +531,34 @@ + doc_submenu $mbar.$helpmenuname 4.fft.examples + doc_submenu $mbar.$helpmenuname 5.reference + doc_submenu $mbar.$helpmenuname 6.externs ++ $mbar.$helpmenuname add separator ++ doc_submenu $mbar.$helpmenuname 7.stuff/audio-playpen ++ doc_submenu $mbar.$helpmenuname 7.stuff/data-structures ++ doc_submenu $mbar.$helpmenuname 7.stuff/pd-msg ++ doc_submenu $mbar.$helpmenuname 7.stuff/soundfile-tools ++ doc_submenu $mbar.$helpmenuname 7.stuff/synth ++ doc_submenu $mbar.$helpmenuname 7.stuff/tools ++ $mbar.$helpmenuname add separator ++ $mbar.$helpmenuname add command -label {Gem manual...} \ ++ -command {menu_doc_open doc/Gem/00.manual index.html} ++ $mbar.$helpmenuname add separator ++ $mbar.$helpmenuname add command -label {RRADical manual...} \ ++ -command {menu_doc_open doc/rradical rradicalpd.html} ++ doc_submenu $mbar.$helpmenuname rradical ++ $mbar.$helpmenuname add separator ++ $mbar.$helpmenuname add command -label {Building Drums in Pd...} \ ++ -command {menu_doc_open doc/tutorials/footils/pddrums pddrums.html} ++ doc_submenu $mbar.$helpmenuname tutorials/footils/pddrums ++ doc_submenu $mbar.$helpmenuname abstractions/footils/angriff ++ $mbar.$helpmenuname add separator ++ $mbar.$helpmenuname add command -label {serendiPd info...} \ ++ -command {menu_doc_open doc/serendipd home.html} ++ $mbar.$helpmenuname add command -label {serendiPd client} \ ++ -command {menu_doc_open doc/serendipd serendiPd-gui.pd} ++ $mbar.$helpmenuname add command -label {serendiPd server} \ ++ -command {menu_doc_open doc/serendipd serendiPd-server.pd} ++ $mbar.$helpmenuname add separator ++ doc_submenu $mbar.$helpmenuname tutorials/playnow + } + + #################### the "File" menu for the Pd window ############## |