Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2938
Modified Files: Tag: impd_0_37 makefile.mingw.vst makefile.nt makefile.nt.vst u_main.tk u_object.tk Log Message: space bar escape
Index: makefile.nt.vst =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/makefile.nt.vst,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** makefile.nt.vst 21 Apr 2004 03:02:46 -0000 1.1.2.1 --- makefile.nt.vst 27 Apr 2004 11:03:31 -0000 1.1.2.2 *************** *** 22,26 **** g_scalar.c g_traversal.c g_guiconnect.c g_readwrite.c g_editor.c \ g_all_guis.c g_bang.c g_hdial.c g_hslider.c g_mycanvas.c g_numbox.c \ ! g_toggle.c g_vumeter.c \ m_pd.c m_class.c m_obj.c m_atom.c m_memory.c m_binbuf.c \ m_conf.c m_glob.c m_sched.c \ --- 22,26 ---- g_scalar.c g_traversal.c g_guiconnect.c g_readwrite.c g_editor.c \ g_all_guis.c g_bang.c g_hdial.c g_hslider.c g_mycanvas.c g_numbox.c \ ! g_toggle.c g_vumeter.c g_dropper.obj \ m_pd.c m_class.c m_obj.c m_atom.c m_memory.c m_binbuf.c \ m_conf.c m_glob.c m_sched.c \
Index: makefile.nt =================================================================== RCS file: /cvsroot/pure-data/pd/src/makefile.nt,v retrieving revision 1.1.1.3.2.2.2.1 retrieving revision 1.1.1.3.2.2.2.2 diff -C2 -d -r1.1.1.3.2.2.2.1 -r1.1.1.3.2.2.2.2 *** makefile.nt 27 Mar 2004 16:32:48 -0000 1.1.1.3.2.2.2.1 --- makefile.nt 27 Apr 2004 11:03:31 -0000 1.1.1.3.2.2.2.2 *************** *** 3,18 **** all: pd gui ..\bin\pd.tk ..\bin\u_object.tk ..\bin\pdsend.exe ..\bin\pdreceive.exe
! VC = "$(VCINSTALLDIR)\Vc7" ! INCLUDE = -I.\ -I..\Tcl\include -I$(VC)\include -I$(VC)\PlatformSDK\include
LDIR = $(VC)\lib - LDIR2 = $(VC)\PlatformSDK\lib
LIB = /NODEFAULTLIB:libc /NODEFAULTLIB:oldnames /NODEFAULTLIB:kernel \ /NODEFAULTLIB:uuid \ ! $(LDIR)\libc.lib $(LDIR)\oldnames.lib $(LDIR2)\kernel32.lib \ ! $(LDIR2)\wsock32.lib $(LDIR2)\winmm.lib ..\bin\pthreadVC.lib
! GLIB = $(LIB) ..\bin\tcl85.lib ..\bin\tk85.lib CFLAGS = /nologo /W3 /DMSW /DNT /DPD /DPD_INTERNAL /DWIN32 /DWINDOWS /Ox \ -DPA_LITTLE_ENDIAN -DUSEAPI_MMIO -DUSEAPI_PORTAUDIO -DDONTUSESIMD --- 3,17 ---- all: pd gui ..\bin\pd.tk ..\bin\u_object.tk ..\bin\pdsend.exe ..\bin\pdreceive.exe
! VC = c:\program\vc2003 ! INCLUDE = -I.\ -I$(VC)\include
LDIR = $(VC)\lib
LIB = /NODEFAULTLIB:libc /NODEFAULTLIB:oldnames /NODEFAULTLIB:kernel \ /NODEFAULTLIB:uuid \ ! $(LDIR)\libc.lib $(LDIR)\oldnames.lib $(LDIR)\kernel32.lib \ ! $(LDIR)\wsock32.lib $(LDIR)\winmm.lib $(LDIR)\pthreadVC.lib
! GLIB = $(LIB) $(LDIR)\tcl85.lib $(LDIR)\tk85.lib CFLAGS = /nologo /W3 /DMSW /DNT /DPD /DPD_INTERNAL /DWIN32 /DWINDOWS /Ox \ -DPA_LITTLE_ENDIAN -DUSEAPI_MMIO -DUSEAPI_PORTAUDIO -DDONTUSESIMD *************** *** 24,28 **** g_scalar.c g_traversal.c g_guiconnect.c g_readwrite.c g_editor.c \ g_all_guis.c g_bang.c g_hdial.c g_hslider.c g_mycanvas.c g_numbox.c \ ! g_toggle.c g_vumeter.c \ m_pd.c m_class.c m_obj.c m_atom.c m_memory.c m_binbuf.c \ m_conf.c m_glob.c m_sched.c \ --- 23,27 ---- g_scalar.c g_traversal.c g_guiconnect.c g_readwrite.c g_editor.c \ g_all_guis.c g_bang.c g_hdial.c g_hslider.c g_mycanvas.c g_numbox.c \ ! g_toggle.c g_vumeter.c g_dropper.c \ m_pd.c m_class.c m_obj.c m_atom.c m_memory.c m_binbuf.c \ m_conf.c m_glob.c m_sched.c \ *************** *** 42,48 **** SRCASIO = $(PADIR)/pa_asio/pa_asio.cpp
! ASIOLIB = $(LDIR2)\user32.lib $(LDIR2)\gdi32.lib $(LDIR2)\winspool.lib $(LDIR2)\comdlg32.lib \ ! $(LDIR2)\advapi32.lib $(LDIR2)\shell32.lib $(LDIR2)\ole32.lib $(LDIR2)\oleaut32.lib $(LDIR2)\uuid.lib \ ! $(LDIR2)\odbc32.lib $(LDIR2)\odbccp32.lib ..\lib\asio\asiolib.lib
--- 41,47 ---- SRCASIO = $(PADIR)/pa_asio/pa_asio.cpp
! ASIOLIB = $(LDIR)\user32.lib $(LDIR)\gdi32.lib $(LDIR)\winspool.lib $(LDIR)\comdlg32.lib \ ! $(LDIR)\advapi32.lib $(LDIR)\shell32.lib $(LDIR)\ole32.lib $(LDIR)\oleaut32.lib $(LDIR)\uuid.lib \ ! $(LDIR)\odbc32.lib $(LDIR)\odbccp32.lib $(LDIR)\asiolib.lib
Index: u_object.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/u_object.tk,v retrieving revision 1.1.2.22 retrieving revision 1.1.2.23 diff -C2 -d -r1.1.2.22 -r1.1.2.23 *** u_object.tk 26 Apr 2004 14:21:15 -0000 1.1.2.22 --- u_object.tk 27 Apr 2004 11:03:31 -0000 1.1.2.23 *************** *** 823,827 **** canvas $canvas.${self}DROP -width 20 -height 20 -bg purple place $canvas.${self}DROP -x [expr $x1 + 10] -y $y1 ! dnd bindtarget $canvas.${self}DROP text/uri-list <Drop> "pd "d[list ${self}] symbol [pdtk_enquote %D] ;"" } { place $canvas.${self}DROP -x [expr $x1 + 10] -y $y1 --- 823,827 ---- canvas $canvas.${self}DROP -width 20 -height 20 -bg purple place $canvas.${self}DROP -x [expr $x1 + 10] -y $y1 ! dnd bindtarget $canvas.${self}DROP text/uri-list <Drop> "pd "d[list ${self}] symbol [ pdtk_enquote %D ] ;"" } { place $canvas.${self}DROP -x [expr $x1 + 10] -y $y1
Index: makefile.mingw.vst =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/makefile.mingw.vst,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** makefile.mingw.vst 21 Apr 2004 03:02:46 -0000 1.1.2.1 --- makefile.mingw.vst 27 Apr 2004 11:03:31 -0000 1.1.2.2 *************** *** 10,14 **** GFLAGS = -DINSTALL_PREFIX="$(INSTDIR)"
! MORECFLAGS =
INCLUDE = --- 10,14 ---- GFLAGS = -DINSTALL_PREFIX="$(INSTDIR)"
! MORECFLAGS = -g
INCLUDE = *************** *** 33,37 **** SRC = g_canvas.c g_graph.c g_text.c g_rtext.c g_array.c g_template.c g_io.c \ g_scalar.c g_traversal.c g_guiconnect.c g_readwrite.c g_editor.c \ ! g_all_guis.c g_bang.c g_hdial.c g_hslider.c g_mycanvas.c g_numbox.c \ g_toggle.c g_vumeter.c m_pd.c m_class.c m_obj.c m_atom.c m_memory.c \ m_binbuf.c m_conf.c m_glob.c m_sched.c s_main.c s_inter.c s_file.c \ --- 33,37 ---- SRC = g_canvas.c g_graph.c g_text.c g_rtext.c g_array.c g_template.c g_io.c \ g_scalar.c g_traversal.c g_guiconnect.c g_readwrite.c g_editor.c \ ! g_all_guis.c g_bang.c g_hdial.c g_hslider.c g_mycanvas.c g_dropper.c g_numbox.c \ g_toggle.c g_vumeter.c m_pd.c m_class.c m_obj.c m_atom.c m_memory.c \ m_binbuf.c m_conf.c m_glob.c m_sched.c s_main.c s_inter.c s_file.c \ *************** *** 79,83 ****
$(OBJ_DIR)/$(PDEXEC): s_entry.o ! cd $(OBJ_DIR); $(CC) -o $(PDEXEC) s_entry.o $(LIB) pd.a $(LDFLAGS) -mwindows
$(OBJ_DIR)/$(PDDLL): $(OBJC) --- 79,83 ----
$(OBJ_DIR)/$(PDEXEC): s_entry.o ! cd $(OBJ_DIR); $(CC) -o $(PDEXEC) s_entry.o $(LIB) pd.a $(LDFLAGS)
$(OBJ_DIR)/$(PDDLL): $(OBJC)
Index: u_main.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/u_main.tk,v retrieving revision 1.1.1.4.2.7.4.47 retrieving revision 1.1.1.4.2.7.4.48 diff -C2 -d -r1.1.1.4.2.7.4.47 -r1.1.1.4.2.7.4.48 *** u_main.tk 26 Apr 2004 11:37:43 -0000 1.1.1.4.2.7.4.47 --- u_main.tk 27 Apr 2004 11:03:31 -0000 1.1.1.4.2.7.4.48 *************** *** 190,194 **** proc pdtk_enquote {x} { set foo [string map {"," "" ";" "" """ ""} $x] ! return [string map {" " "\ "} $foo] }
--- 190,194 ---- proc pdtk_enquote {x} { set foo [string map {"," "" ";" "" """ ""} $x] ! return [string map {" " "\ " "{" "" "}" ""} $foo] }