[PD-cvs] pd/src desire.c, 1.1.2.217, 1.1.2.217.2.1 makefile.in, 1.4.4.2.2.21.2.1, 1.4.4.2.2.21.2.2 s_entry.c, 1.2.4.2.2.2, NONE

Mathieu Bouchard matju at users.sourceforge.net
Thu Nov 30 17:23:00 CET 2006


Update of /cvsroot/pure-data/pd/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13121

Modified Files:
      Tag: desiredata
	desire.c makefile.in 
Removed Files:
      Tag: desiredata
	s_entry.c 
Log Message:
merging s_entry.c into desire.c


Index: makefile.in
===================================================================
RCS file: /cvsroot/pure-data/pd/src/makefile.in,v
retrieving revision 1.4.4.2.2.21.2.1
retrieving revision 1.4.4.2.2.21.2.2
diff -C2 -d -r1.4.4.2.2.21.2.1 -r1.4.4.2.2.21.2.2
*** makefile.in	30 Nov 2006 05:39:58 -0000	1.4.4.2.2.21.2.1
--- makefile.in	30 Nov 2006 16:22:58 -0000	1.4.4.2.2.21.2.2
***************
*** 18,23 ****
  # from pd miller
  SRC += m_pd.c m_class.c m_obj.c m_atom.c m_memory.c m_binbuf.c \
!        m_glob.c m_sched.c s_main.c s_inter.c s_file.c s_loader.c s_path.c \
!        s_entry.c s_audio.c s_midi.c \
         d_ugen.c d_ctl.c d_arithmetic.c d_osc.c d_filter.c d_dac.c d_misc.c \
         d_math.c d_fft.c d_mayer_fft.c d_fftroutine.c d_array.c d_global.c \
--- 18,22 ----
  # from pd miller
  SRC += m_pd.c m_class.c m_obj.c m_atom.c m_memory.c m_binbuf.c \
!        m_glob.c m_sched.c s_main.c s_inter.c s_file.c s_loader.c s_path.c s_audio.c s_midi.c \
         d_ugen.c d_ctl.c d_arithmetic.c d_osc.c d_filter.c d_dac.c d_misc.c \
         d_math.c d_fft.c d_mayer_fft.c d_fftroutine.c d_array.c d_global.c \

--- s_entry.c DELETED ---

Index: desire.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/Attic/desire.c,v
retrieving revision 1.1.2.217
retrieving revision 1.1.2.217.2.1
diff -C2 -d -r1.1.2.217 -r1.1.2.217.2.1
*** desire.c	28 Nov 2006 21:23:58 -0000	1.1.2.217
--- desire.c	30 Nov 2006 16:22:55 -0000	1.1.2.217.2.1
***************
*** 7863,7867 ****
  
  /* ---------------------------------------------------------------- */
! /* formerly m_conf.c */
  
  #define S(name) void name##_setup(void); name##_setup();
--- 7863,7867 ----
  
  /* ---------------------------------------------------------------- */
! /* formerly m_conf.c and s_entry.c */
  
  #define S(name) void name##_setup(void); name##_setup();
***************
*** 7876,7877 ****
--- 7876,7896 ----
  }
  };
+ 
+ /* In MSW, this is all there is to pd; the rest sits in a "pdlib" dll so
+ that externs can link back to functions defined in pd. */
+ 
+ int sys_main(int argc, char **argv);
+ #if defined(_WIN32) && !defined(_CONSOLE)
+ #include <windows.h>
+ #include <stdio.h>
+ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nCmdShow) {
+     __try {
+         sys_main(__argc,__argv);
+     } __finally {
+         printf("caught an exception; stopping\n");
+     }
+ }
+ #else /* not MSVC */
+ int main(int argc, char **argv) {return sys_main(argc, argv);}
+ #endif
+ 





More information about the Pd-cvs mailing list