From 2e46b0b7c15f827cf7e4068172a9dc0b2d1e1816 Mon Sep 17 00:00:00 2001 From: Keishi Suenaga Date: Sat, 23 Dec 2006 02:52:43 +0000 Subject: [PATCH] * windrv/Makefile.am windrv/timiditydrv.c: free from idl * windrv/timiditydrv.idl: removed * windrv/oemsetup.inf: removed * doc/ja_JP.eucJP/README.w32, doc/C/README.w32: updated --- ChangeLog | 45 ++++++++++------- doc/C/README.w32 | 120 ++++++++++++++++----------------------------- doc/ja_JP.eucJP/README.w32 | 120 +++++++++++++++++---------------------------- windrv/Makefile.am | 60 +---------------------- windrv/oemsetup.inf | 9 ---- windrv/timiditydrv.c | 87 +------------------------------- windrv/timiditydrv.idl | 62 ----------------------- 7 files changed, 117 insertions(+), 386 deletions(-) delete mode 100755 windrv/oemsetup.inf delete mode 100755 windrv/timiditydrv.idl diff --git a/ChangeLog b/ChangeLog index 50bc4a9e..498489d7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,23 +1,32 @@ 2006-12-23 Keishi Suenaga - * configure.in doc/C/README.w32 doc/ja_JP.eucJP/README.w32 - interface/Makefile.am interface/ncurs_c.c - interface/rtsyn_common.c interface/rtsyn_winmm.c - interface/w32g_syn.c interface/winsyn_c.c - interface/wrdt_w32g.c libarc/Makefile.am libarc/url_file.c - libarc/url_ftp.c libarc/url_http.c libarc/url_mem.c - libarc/url_news.c libarc/url_newsgroup.c libunimod/Makefile.am - libunimod/unimod.h timidity/Makefile.am timidity/aiff_a.c - timidity/aq.c timidity/au_a.c timidity/controls.c - timidity/flac_a.c timidity/gogo_a.c timidity/list_a.c - timidity/midi_a.c timidity/miditrace.c timidity/mod2midi.c - timidity/playmidi.c timidity/playmidi.h timidity/portaudio_a.c - timidity/raw_a.c timidity/readmidi.c timidity/recache.c - timidity/sndfont.c timidity/sysdep.h timidity/timidity.c - timidity/w32_a.c timidity/w32_gogo.c - timidity/w32_libFLAC_dll.c timidity/w32_libOggFLAC_dll.c - timidity/wave_a.c utils/Makefile.am utils/mblock.c - utils/readdir.h utils/readdir_win.c utils/support.c + * windrv/Makefile.am + windrv/timiditydrv.c: free from idl + * windrv/timiditydrv.idl: removed + * windrv/oemsetup.inf: removed + * doc/ja_JP.eucJP/README.w32, + doc/C/README.w32: updated + +2006-12-23 Keishi Suenaga + + * configure.in doc/C/README.w32 doc/ja_JP.eucJP/README.w32 + interface/Makefile.am interface/ncurs_c.c + interface/rtsyn_common.c interface/rtsyn_winmm.c + interface/w32g_syn.c interface/winsyn_c.c + interface/wrdt_w32g.c libarc/Makefile.am libarc/url_file.c + libarc/url_ftp.c libarc/url_http.c libarc/url_mem.c + libarc/url_news.c libarc/url_newsgroup.c libunimod/Makefile.am + libunimod/unimod.h timidity/Makefile.am timidity/aiff_a.c + timidity/aq.c timidity/au_a.c timidity/controls.c + timidity/flac_a.c timidity/gogo_a.c timidity/list_a.c + timidity/midi_a.c timidity/miditrace.c timidity/mod2midi.c + timidity/playmidi.c timidity/playmidi.h timidity/portaudio_a.c + timidity/raw_a.c timidity/readmidi.c timidity/recache.c + timidity/sndfont.c timidity/sysdep.h timidity/timidity.c + timidity/w32_a.c timidity/w32_gogo.c + timidity/w32_libFLAC_dll.c timidity/w32_libOggFLAC_dll.c + timidity/wave_a.c utils/Makefile.am utils/mblock.c + utils/readdir.h utils/readdir_win.c utils/support.c utils/tmdy_getopt.h windrv/Makefile.am ChangeLog: Pelles C Compiler support diff --git a/doc/C/README.w32 b/doc/C/README.w32 index d802365a..a37488fc 100644 --- a/doc/C/README.w32 +++ b/doc/C/README.w32 @@ -72,14 +72,8 @@ This file contains fllowing instructions. 2-6)portmidi(http://www-2.cs.cmu.edu/~music/portmusic/) Download portmidi18jun03.zip, extract it and compile it. Copy porttime.h libporttime.a portmidi.h libportmidi.a to appropriate directories. -(3)Preparations for compiling timiditydrv.dll - 3-1)install Microsoft Platform SDK - 3-2)Get midl.exe form Platform SDK and move it to the PATH included PATH environment variable. - 3-3)Rename cpp.exe from Free Pascal Compiler(http://www.freepascal.org/) to fpcpp.exe. - And move it to the PATH included PATH environment variable. - (cpp.exe of Mingw is not suitable for preprocessor of mild.exe) -(4)Make TiMidity++ binaries - 4-1)timw32g.exe +(3)Make TiMidity++ binaries + 3-1)timw32g.exe (configure) CFLAGS="-O2" ./configure --enable-network --enable-w32gui --enable-spline=gauss \ --enable-audio=w32,vorbis,gogo,ogg,flac,portaudio @@ -87,7 +81,7 @@ This file contains fllowing instructions. make strip timidity.exe mv timidity.exe timw32g.exe - 4-2)twsyng.exe + 3-2)twsyng.exe (configure) CFLAGS="-O2" ./configure --enable-network --enable-winsyng --enable-spline=linear \ --enable-audio=w32,vorbis,gogo,ogg,flac,portaudio @@ -96,7 +90,7 @@ This file contains fllowing instructions. strip timidity.exe mv timidity.exe twsyng.exe - 4-3)twsynsrv.exe + 3-3)twsynsrv.exe (configure) CFLAGS="-O2" ./configure --enable-network --enable-winsyng --enable-spline=linear \ --enable-audio=w32,vorbis,gogo,ogg,flac,portaudio @@ -107,14 +101,14 @@ This file contains fllowing instructions. strip timidity.exe mv timidity.exe twsynsrv.exe - 4-4)timidity.exe + 3-4)timidity.exe (configure) CFLAGS="-O2" ./configure --enable-interface=ncurses,vt100,winsyn --enable-network --enable-spline=linear \ --enable-audio=w32,vorbis,gogo,ogg,flac,portaudio (make) make strip timidity.exe - 4-5)timiditydrv.dll + 3-5)timiditydrv.dll (configure) CFLAGS="-O2" ./configure --enable-winsyn --enable-windrv --enable-spline=linear \ --enable-audio=w32,portaudio @@ -199,17 +193,10 @@ This file contains fllowing instructions. 2-7)portmidi(http://www-2.cs.cmu.edu/~music/portmusic/) I don't know how to comple portaudio with bcc commandline tools. -(3)Preparations for compiling timiditydrv.dll - 3-1)install Microsoft Platform SDK - 3-2)Get midl.exe form Platform SDK and move it to the PATH included PATH environment variable. - 3-3)Rename cpp.exe from Free Pascal Compiler(http://www.freepascal.org/) to fpcpp.exe. - And move it to the PATH included PATH environment variable. - (cpp32.exe of BorlandC is not suitable for preprocessor of mild.exe) - -(4)Make TiMidity++ binaries - 4-0-1) perl -pe 's/CC\s-o\s\S\S*\s/CC /g' configure >configure_bc +(3)Make TiMidity++ binaries + 3-0-1) perl -pe 's/CC\s-o\s\S\S*\s/CC /g' configure >configure_bc ( -o xxxx options are not work correctly with BCC) - 4-0-2)Invoke sh rm_float.sh in timidity/timidity directory. + 3-0-2)Invoke sh rm_float.sh in timidity/timidity directory. This removes f , F, l and L after sonst float valude( ex. 123.45f ) -------------------- from here ----------------------- @@ -221,14 +208,14 @@ mv $foo.rm $foo done -------------------- to here ------------------------- - 4-1)timw32g.exe + 3-1)timw32g.exe (configure) CC="bcc32" CXX="bcc32" CPP="cpp32" CFLAGS="" ./configure_bc --enable-w32gui --enable-spline=gauss \ --enable-audio=w32,vorbis,gogo,ogg,flac,portaudio (make) make mv timidity.exe timw32g.exe - 4-2)twsyng.exe + 3-2)twsyng.exe (configure) CC="bcc32" CXX="bcc32" CPP="cpp32" CFLAGS="" \ ./configure_bc --enable-network --enable-winsyng --enable-spline=linear \ @@ -236,7 +223,7 @@ done (make) make mv timidity.exe twsyng.exe - 4-3)twsynsrv.exe + 3-3)twsynsrv.exe (configure) CC="bcc32" CXX="bcc32" CPP="cpp32" CFLAGS=""\ ./configure_bc --enable-network --enable-winsyng --enable-spline=linear \ @@ -246,14 +233,14 @@ done (make) make mv timidity.exe twsynsrv.exe - 4-4)timidity.exe + 3-4)timidity.exe (configure) CC="bcc32" CXX="bcc32" CPP="cpp32" CFLAGS="" \ ./configure_bc --enable-interface=vt100,winsyn,ncurses --enable-network --enable-spline=linear \ --enable-audio=w32,vorbis,gogo,ogg,flac,portaudio (make) make - 4-5)timiditydrv.dll + 3-5)timiditydrv.dll (configure) CC="bcc32" CXX="bcc32" CPP="cpp32" CFLAGS="" \ ./configure_bc --enable-winsyn --enable-windrv --enable-spline=linear \ @@ -338,18 +325,11 @@ done 2-7)portmidi(http://www-2.cs.cmu.edu/~music/portmusic/) I don't know how to comple portmidi with OpenWatcom commandline tools.. -(3)Preparations for compiling timiditydrv.dll - 3-1)install Microsoft Platform SDK - 3-2)Get midl.exe form Platform SDK and move it to the PATH included PATH environment variable. - 3-3)Rename cpp.exe from Free Pascal Compiler(http://www.freepascal.org/) to fpcpp.exe. - And move it to the PATH included PATH environment variable. - ('wcc386 -p' is not suitable for preprocessor of mild.exe) - -(4)Make TiMidity++ binaries - 4-0-1)wcc386_w.sh & wpp386_w.sh( They are in scripts/directory ) +(3)Make TiMidity++ binaries + 3-0-1)wcc386_w.sh & wpp386_w.sh( They are in scripts/directory ) Wcc386 is not familier to GNU autoconf tools, Use my wrapper wcc386_w.sh, instead of wcc386.exe - 4-1)timw32g.exe + 3-1)timw32g.exe (configure) CC="wcc386_w.sh" CXX="wpp386_w.sh" CPP="wcc386_w.sh -p" CFLAGS="-d0 -obll+riemcht" \ ./configure --enable-network --enable-w32gui --enable-spline=gauss \ @@ -358,7 +338,7 @@ done (make) make mv timidity.exe timw32g.exe - 4-2)twsyng.exe + 3-2)twsyng.exe (configure) CC="wcc386_w.sh" CXX="wpp386_w.sh" CPP="wcc386_w.sh -p" CFLAGS="-d0 -obll+riemcht" \ ./configure --enable-network --enable-winsyng --enable-spline=linear \ @@ -367,7 +347,7 @@ done (make) make mv timidity.exe twsyng.exe - 4-3)twsynsrv.exe + 3-3)twsynsrv.exe (configure) CC="wcc386_w.sh" CXX="wpp386_w.sh" CPP="wcc386_w.sh -p" CFLAGS="-d0 -obll+riemcht" \ ./configure --enable-network --enable-winsyng --enable-spline=linear \ @@ -378,7 +358,7 @@ done (make) make mv timidity.exe twsynsrv.exe - 4-4)timidity.exe + 3-4)timidity.exe (configure) CC="wcc386_w.sh" CXX="wpp386_w.sh" CPP="wcc386_w.sh -p" CFLAGS="-d0 -obll+riemcht" \ ./configure --enable-interface=ncurses,vt100,winsyn --enable-network --enable-spline=linear \ @@ -386,7 +366,7 @@ done --disable-oggtest --disable-vorbistest --disable-libFLACtest --disable-libOggFLACtest (make) make - 4-5)timiditydrv.dll + 3-5)timiditydrv.dll (configure) CC="wcc386_w.sh" CXX="wpp386_w.sh" CPP="wcc386_w.sh -p" CFLAGS="-d0 -obll+riemcht" \ ./configure --enable-winsyn --enable-windrv --enable-spline=linear \ @@ -460,10 +440,8 @@ Use -MD option insted of -MT and link msvcrt.lib instead of libcmt.lib. But for compling TiMidity++ only portaudio.h is needed. 2-7)portmidi(http://www-2.cs.cmu.edu/~music/portmusic/) I don't know how to comple portmidi with vc commandline tools.. -(3)Preparations for compiling timiditydrv.dll - 3-1)install Microsoft Platform SDK -(4)Make TiMidity++ binaries - 4-1)timw32g.exe +(3)Make TiMidity++ binaries + 3-1)timw32g.exe (configure) CC="cl" CPP="cl.exe -EP" CFLAGS="-O2" \ ./configure --enable-network --enable-w32gui --enable-spline=gauss \ @@ -471,7 +449,7 @@ Use -MD option insted of -MT and link msvcrt.lib instead of libcmt.lib. (make) make mv timidity.exe timw32g.exe - 4-2)twsyng.exe + 3-2)twsyng.exe (configure) CC="cl" CPP="cl.exe -EP" CFLAGS="-O2" \ ./configure --enable-network --enable-winsyng --enable-spline=linear \ @@ -479,7 +457,7 @@ Use -MD option insted of -MT and link msvcrt.lib instead of libcmt.lib. (make) make mv timidity.exe twsyng.exe - 4-3)twsynsrv.exe + 3-3)twsynsrv.exe (configure) CC="cl" CPP="cl.exe -EP" CFLAGS="-O2"\ ./configure --enable-network --enable-winsyng --enable-spline=linear \ @@ -489,14 +467,14 @@ Use -MD option insted of -MT and link msvcrt.lib instead of libcmt.lib. (make) make mv timidity.exe twsynsrv.exe - 4-4)timidity.exe + 3-4)timidity.exe (configure) CC="cl" CPP="cl.exe -EP" CFLAGS="-O2" \ ./configure --enable-interface=ncurses,vt100,winsyn --enable-network --enable-spline=linear \ --enable-audio=w32,vorbis,gogo,ogg,flac,portaudio (make) make - 4-5)timiditydrv.dll + 3-5)timiditydrv.dll (configure) CC="cl" CXX="cl" CPP="cl.exe -EP" CFLAGS="-O2" \ ./configure --enable-winsyn --enable-windrv --enable-spline=linear \ @@ -574,21 +552,16 @@ Use -MD option insted of -MT and link msvcrt.lib instead of libcmt.lib. 2-6) portmidi(http://www-2.cs.cmu.edu/~music/portmusic/) iNot used herej -(3) If you plan to complile timiditydrv.dll, adittional process requied. - 3-1) Insltall "Microsoft Platform SDK". - 3-2)Place midl.exe from "Platform SDK" in the directory included PATH environment valiable. - 3-3)Get cpp.exe from Free Pascal Compiler(http://www.freepascal.org/), - and rename it to fpcpp.exe. -(4) Compiling TiMIdity++ - 4-0-1) "LF -> CRLF" conversion +(3) Compiling TiMIdity++ + 3-0-1) "LF -> CRLF" conversion $sh script/unix2dos.sh - 4-0-1) perl -pe 's/CC\s-o\s\S\S*\s/CC /g' configure |perl -pe 's/CXX\s-o\s\S\S*\s/CXX /g' - >configure_dm + 3-0-1) perl -pe 's/CC\s-o\s\S\S*\s/CC /g' configure |perl -pe 's/CXX\s-o\s\S\S*\s/CXX /g' - >configure_dm (because "-o xxxx" is not suitbable dmc.exe ) - 4-0-2) Get cpp.exe from Free Pascal Compiler(http://www.freepascal.org/), + 3-0-2) Get cpp.exe from Free Pascal Compiler(http://www.freepascal.org/), and rename it as fpcpp.exe. ipreprocessor of dmc.exe is not compatible "gnu autotools"j - 4-1)timw32g.exe + 3-1)timw32g.exe (configure) CC="dmc -Jm -w -mn -5 -o" CXX="dmc -Jm -w -mn -cpp -5 -o" CPP="fpcpp -D__NT__ -I/i/dm/include" \ ./configure_dm --enable-network --enable-w32gui --enable-spline=gauss \ @@ -596,7 +569,7 @@ Use -MD option insted of -MT and link msvcrt.lib instead of libcmt.lib. (make) make mv timidity.exe timw32g.exe - 4-2)twsyng.exe + 3-2)twsyng.exe (configure) CC="dmc -Jm -w -mn -5 -o" CXX="dmc -Jm -w -mn -cpp -5 -o" CPP="fpcpp -D__NT__ -I/i/dm/include" \ ./configure_dm --enable-network --enable-winsyng --enable-spline=linear \ @@ -604,7 +577,7 @@ Use -MD option insted of -MT and link msvcrt.lib instead of libcmt.lib. (make) make mv timidity.exe twsyng.exe - 4-3)twsynsrv.exe + 3-3)twsynsrv.exe (configure) CC="dmc -Jm -w -mn -5 -o" CXX="dmc -Jm -w -mn -cpp -5 -o" CPP="fpcpp -D__NT__ -I/i/dm/include" \ ./configure_dm --enable-network --enable-winsyng --enable-spline=linear \ @@ -614,14 +587,14 @@ Use -MD option insted of -MT and link msvcrt.lib instead of libcmt.lib. (make) make mv timidity.exe twsynsrv.exe - 4-4)timidity.exe + 3-4)timidity.exe (configure) CC="dmc -Jm -w -mn -5 -o" CXX="dmc -Jm -w -mn -cpp -5 -o" CPP="fpcpp -D__NT__ -I/i/dm/include" \ ./configure_dm --enable-interface=ncurses,vt100,winsyn --enable-network --enable-spline=linear \ --enable-audio=w32,vorbis,gogo,ogg,flac,portaudio (make) make - 4-5)timiditydrv.dll + 3-5)timiditydrv.dll (configure) CC="dmc -Jm -w -mn -5 -o" CXX="dmc -Jm -w -mn -cpp -5 -o" CPP="fpcpp -D__NT__ -I/i/dm/include" \ ./configure_dm --enable-interface=windrv,winsyn --enable-network --enable-spline=linear \ @@ -682,17 +655,10 @@ Use -MD option insted of -MT and link msvcrt.lib instead of libcmt.lib. 2-6) portmidi(http://www-2.cs.cmu.edu/~music/portmusic/) inot used herej -(3)If you want to compile timiditydrv.dll - 3-1)Install Microsoft Platform SDK. - 3-2)Get midl.exe from Platform SDK. - 3-3)Get cpp.exe from Free Pascal Compiler(http://www.freepascal.org/), - and rename cpp.exe tofpcpp.exe. - ("cc.exe -E" si not suitable midl.exej - -(4)Compiling TiMIdity++ - 4-0) perl -pe 's/CC\s-o\s\S\S*\s/CC /g' configure >configure_pocc +(3)Compiling TiMIdity++ + 3-0) perl -pe 's/CC\s-o\s\S\S*\s/CC /g' configure >configure_pocc (configure’†‚Ì -o xxxx ‚Í Pelles C ‚ªŽó‚¯•t‚¯‚È‚¢‚½‚ß) - 4-1)timw32g.exe + 3-1)timw32g.exe (configure) CC="cc" CPP="pocc.exe -E" CFLAGS="-MT" ./configure_pocc \ --enable-network --enable-w32gui --enable-spline=gauss \ @@ -700,7 +666,7 @@ Use -MD option insted of -MT and link msvcrt.lib instead of libcmt.lib. (make) make mv timidity.exe timw32g.exe - 4-2)twsyng.exe + 3-2)twsyng.exe (configure) CC="cc" CPP="pocc.exe -E" CFLAGS="-MT" ./configure_pocc \ --enable-network --enable-winsyng --enable-spline=linear \ @@ -708,7 +674,7 @@ Use -MD option insted of -MT and link msvcrt.lib instead of libcmt.lib. (make) make mv timidity.exe twsyng.exe - 4-3)twsynsrv.exe + 3-3)twsynsrv.exe (configure) CC="cc" CPP="pocc.exe -E" CFLAGS="-MT" ./configure_pocc \ --enable-network --enable-winsyng --enable-spline=linear \ @@ -718,14 +684,14 @@ Use -MD option insted of -MT and link msvcrt.lib instead of libcmt.lib. (make) make mv timidity.exe twsynsrv.exe - 4-4)timidity.exe + 3-4)timidity.exe (configure) CC="cc" CPP="pocc.exe -E" CFLAGS="-MT" ./configure_pocc \ --enable-interface=ncurses,vt100,winsyn --enable-network --enable-spline=linear \ --enable-audio=w32,vorbis,gogo,ogg,flac,portaudio (make) make - 4-5)timiditydrv.dll + 3-5)timiditydrv.dll (configure) CC="cc" CPP="pocc.exe -E" CFLAGS="-MT" ./configure_pocc \ --enable-winsyn --enable-windrv --enable-spline=linear \ diff --git a/doc/ja_JP.eucJP/README.w32 b/doc/ja_JP.eucJP/README.w32 index 0c8765a8..f8207421 100644 --- a/doc/ja_JP.eucJP/README.w32 +++ b/doc/ja_JP.eucJP/README.w32 @@ -59,14 +59,8 @@ TiMidity++ portaudio.h¤µ¤¨¤¢¤ì¤ÐTiMidity++¤Ï¥³¥ó¥Ñ¥¤¥ë¤Ç¤­¤ë¡£ £²¡Ý£¶¡Ëportmidi(http://www-2.cs.cmu.edu/~music/portmusic/) ¡Ê¤³¤³¤Ç¤Ï»È¤ï¤Ê¤¤¡Ë -¡Ê£³¡Ëtimiditydrv.dll¤ò¥³¥ó¥Ñ¥¤¥ë¤¹¤ë¾ì¹ç¤Î½àÈ÷ - 3-1)Microsoft Platform SDK¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¡£ - 3-2)Platform SDK¤«¤émidl.exe¤ò¼è¤ê½Ð¤·¥Ñ¥¹¤ÎÄ̤俥ǥ£¥ì¥¯¥È¥ê¤Ë¤ª¤¯¡£ - 3-3)Free Pascal Compiler(http://www.freepascal.org/)¤«¤é - cpp.exe¤ò¼è¤ê½Ð¤·fpcpp.exe¤È̾Á°¤òÊѤ¨¤Æ¥Ñ¥¹¤ÎÄ̤俥ǥ£¥ì¥¯¥È¥ê¤Ë¤ª¤¯¡£ - ¡Êmingw¤Îcpp.exe¤Ïmidl.exeÍѤΥץê¥×¥í¥»¥Ã¥µ¤Ë¤ÏÉÔ¸þ¤­¡Ë -¡Ê£´¡ËTiMIdity++¤Î¥³¥ó¥Ñ¥¤¥ë - 4-1)timw32g.exe +¡Ê£³¡ËTiMIdity++¤Î¥³¥ó¥Ñ¥¤¥ë + 3-1)timw32g.exe (configure) CFLAGS="-O2" ./configure --enable-network --enable-w32gui --enable-spline=gauss \ --enable-audio=w32,vorbis,gogo,ogg,flac,portaudio @@ -74,7 +68,7 @@ TiMidity++ make strip timidity.exe mv timidity.exe timw32g.exe - 4-2)twsyng.exe + 3-2)twsyng.exe (configure) CFLAGS="-O2" ./configure --enable-network --enable-winsyng --enable-spline=linear \ --enable-audio=w32,vorbis,gogo,ogg,flac,portaudio @@ -83,7 +77,7 @@ TiMidity++ strip timidity.exe mv timidity.exe twsyng.exe - 4-3)twsynsrv.exe + 3-3)twsynsrv.exe (configure) CFLAGS="-O2" ./configure --enable-network --enable-winsyng --enable-spline=linear \ --enable-audio=w32,vorbis,gogo,ogg,flac,portaudio @@ -94,7 +88,7 @@ TiMidity++ strip timidity.exe mv timidity.exe twsynsrv.exe - 4-4)timidity.exe + 3-4)timidity.exe (configure) CFLAGS="-O2" ./configure --enable-interface=ncurses,vt100,winsyn --enable-network --enable-spline=linear \ --enable-audio=w32,vorbis,gogo,ogg,flac,portaudio @@ -102,7 +96,7 @@ TiMidity++ make strip timidity.exe - 4-5)timiditydrv.dll + 3-5)timiditydrv.dll (configure) CFLAGS="-O2" ./configure --enable-winsyn --enable-windrv --enable-spline=linear \ --enable-audio=w32,portaudio @@ -171,16 +165,11 @@ TiMidity++ portaudio.h¤µ¤¨¤¢¤ì¤ÐTiMidity++¤Ï¥³¥ó¥Ñ¥¤¥ë¤Ç¤­¤ë¡£ £²¡Ý£¶¡Ëportmidi(http://www-2.cs.cmu.edu/~music/portmusic/) ¡Ê¤³¤³¤Ç¤Ï»È¤ï¤Ê¤¤¡Ë -¡Ê£³¡Ëtimiditydrv.dll¤ò¥³¥ó¥Ñ¥¤¥ë¤¹¤ë¾ì¹ç¤Î½àÈ÷ - 3-1)Microsoft Platform SDK¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¡£ - 3-2)Platform SDK¤«¤émidl.exe¤ò¼è¤ê½Ð¤·¥Ñ¥¹¤ÎÄ̤俥ǥ£¥ì¥¯¥È¥ê¤Ë¤ª¤¯¡£ - 3-3)Free Pascal Compiler(http://www.freepascal.org/)¤«¤é - cpp.exe¤ò¼è¤ê½Ð¤·fpcpp.exe¤È̾Á°¤òÊѤ¨¤Æ¥Ñ¥¹¤ÎÄ̤俥ǥ£¥ì¥¯¥È¥ê¤Ë¤ª¤¯¡£ - ¡ÊBorlandc¤Îcpp32.exe¤Ïmidl.exeÍѤΥץê¥×¥í¥»¥Ã¥µ¤Ë¤ÏÉÔ¸þ¤­¡Ë -¡Ê£´¡ËTiMIdity++¤Î¥³¥ó¥Ñ¥¤¥ë - 4-0-1) perl -pe 's/CC\s-o\s\S\S*\s/CC /g' configure >configure_bc + +¡Ê£³¡ËTiMIdity++¤Î¥³¥ó¥Ñ¥¤¥ë + 3-0-1) perl -pe 's/CC\s-o\s\S\S*\s/CC /g' configure >configure_bc (configureÃæ¤Î -o xxxx ¤Ï£Â£Ã£Ã¤¬¼õ¤±ÉÕ¤±¤Ê¤¤¤¿¤á) - 4-0-2)rm_float.sh ¤ò timidity/timidity ¥Ç¥£¥ì¥¯¥È¥ê¤ÎÃæ¤Çµ¯Æ°¤¹¤ë¡£ + 3-0-2)rm_float.sh ¤ò timidity/timidity ¥Ç¥£¥ì¥¯¥È¥ê¤ÎÃæ¤Çµ¯Æ°¤¹¤ë¡£ ¿ôÃÍÄê¿ô¤Î¤¢¤È¤Î f , F, l and L ¤ò¼è¤ê½ü¤¯¥¹¥¯¥ê¥×¥È( 123.45f -> 123.45 ) -------------------- from here ----------------------- @@ -192,14 +181,14 @@ mv $foo.rm $foo done -------------------- to here ------------------------- - 4-1)timw32g.exe + 3-1)timw32g.exe (configure) CC="bcc32" CXX="bcc32" CPP="cpp32" CFLAGS="" ./configure_bc --enable-w32gui --enable-spline=gauss \ --enable-audio=w32,vorbis,gogo,ogg,flac,portaudio (make) make mv timidity.exe timw32g.exe - 4-2)twsyng.exe + 3-2)twsyng.exe (configure) CC="bcc32" CXX="bcc32" CPP="cpp32" CFLAGS="" \ ./configure_bc --enable-network --enable-winsyng --enable-spline=linear \ @@ -207,7 +196,7 @@ done (make) make mv timidity.exe twsyng.exe - 4-3)twsynsrv.exe + 3-3)twsynsrv.exe (configure) CC="bcc32" CXX="bcc32" CPP="cpp32" CFLAGS=""\ ./configure_bc --enable-network --enable-winsyng --enable-spline=linear \ @@ -217,14 +206,14 @@ done (make) make mv timidity.exe twsynsrv.exe - 4-4)timidity.exe + 3-4)timidity.exe (configure) CC="bcc32" CXX="bcc32" CPP="cpp32" CFLAGS="" \ ./configure_bc --enable-interface=vt100,winsyn,ncurses --enable-network --enable-spline=linear \ --enable-audio=w32,vorbis,gogo,ogg,flac,portaudio (make) make - 4-5)timiditydrv.dll + 3-5)timiditydrv.dll (configure) CC="bcc32" CXX="bcc32" CPP="cpp32" CFLAGS="" \ ./configure_bc --enable-winsyn --enable-windrv --enable-spline=linear \ @@ -303,18 +292,12 @@ done portaudio.h¤µ¤¨¤¢¤ì¤ÐTiMidity++¤Ï¥³¥ó¥Ñ¥¤¥ë¤Ç¤­¤ë¡£ £²¡Ý£¶¡Ëportmidi(http://www-2.cs.cmu.edu/~music/portmusic/) ¡Ê¤³¤³¤Ç¤Ï»È¤ï¤Ê¤¤¡Ë -¡Ê£³¡Ëtimiditydrv.dll¤ò¥³¥ó¥Ñ¥¤¥ë¤¹¤ë¾ì¹ç¤Î½àÈ÷ - 3-1)Microsoft Platform SDK¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¡£ - 3-2)Platform SDK¤«¤émidl.exe¤ò¼è¤ê½Ð¤·¥Ñ¥¹¤ÎÄ̤俥ǥ£¥ì¥¯¥È¥ê¤Ë¤ª¤¯¡£ - 3-3)Free Pascal Compiler(http://www.freepascal.org/)¤«¤é - cpp.exe¤ò¼è¤ê½Ð¤·fpcpp.exe¤È̾Á°¤òÊѤ¨¤Æ¥Ñ¥¹¤ÎÄ̤俥ǥ£¥ì¥¯¥È¥ê¤Ë¤ª¤¯¡£ - ¡Ê'wcc386.exe -p'¤Ïmidl.exeÍѤΥץê¥×¥í¥»¥Ã¥µ¤Ë¤ÏÉÔ¸þ¤­¡Ë -¡Ê£´¡ËTiMIdity++¤Î¥³¥ó¥Ñ¥¤¥ë - 4-0)wcc386_w.sh & wpp386_w.sh( scripts/¥Ç¥£¥ì¥¯¥È¥ê¤Ë¤¢¤ë ) +¡Ê£³¡ËTiMIdity++¤Î¥³¥ó¥Ñ¥¤¥ë + 3-0)wcc386_w.sh & wpp386_w.sh( scripts/¥Ç¥£¥ì¥¯¥È¥ê¤Ë¤¢¤ë ) Wcc386 ¤ÏGNU¤Îauto Tool¤ÈÃ礬°­¤¤¤Î¤Ç¥é¥Ã¥Ñ¡¼¤ò¤Ä¤¯¤Ã¤¿¡£ ¥Ñ¥¹¤ÎÄ̤俥ǥ£¥ì¥¯¥È¥ê¤Ë°ÜÆ°¤µ¤»¤Æ¤ª¤¤¤Æ¡£ wcc386.exe¤Î¤«¤ï¤ê¤Ëwcc386_w.sh¤ò¸Æ¤Ó½Ð¤·¤Æ»È¤¦¡£ - 4-1)timw32g.exe + 3-1)timw32g.exe (configure) CC="wcc386_w.sh" CXX="wpp386_w.sh" CPP="wcc386_w.sh -p" CFLAGS="-d0 -obll+riemcht" \ ./configure --enable-network --enable-w32gui --enable-spline=gauss \ @@ -323,7 +306,7 @@ done (make) make mv timidity.exe timw32g.exe - 4-2)twsyng.exe + 3-2)twsyng.exe (configure) CC="wcc386_w.sh" CXX="wpp386_w.sh" CPP="wcc386_w.sh -p" CFLAGS="-d0 -obll+riemcht" \ ./configure --enable-network --enable-winsyng --enable-spline=linear \ @@ -332,7 +315,7 @@ done (make) make mv timidity.exe twsyng.exe - 4-3)twsynsrv.exe + 3-3)twsynsrv.exe (configure) CC="wcc386_w.sh" CXX="wpp386_w.sh" CPP="wcc386_w.sh -p" CFLAGS="-d0 -obll+riemcht" \ ./configure --enable-network --enable-winsyng --enable-spline=linear \ @@ -343,7 +326,7 @@ done (make) make mv timidity.exe twsynsrv.exe - 4-4)timidity.exe + 3-4)timidity.exe (configure) CC="wcc386_w.sh" CXX="wpp386_w.sh" CPP="wcc386_w.sh -p" CFLAGS="-d0 -obll+riemcht" \ ./configure --enable-interface=ncurses,vt100,winsyn --enable-network --enable-spline=linear \ @@ -351,7 +334,7 @@ done --disable-oggtest --disable-vorbistest --disable-libFLACtest --disable-libOggFLACtest (make) make - 4-5)timiditydrv.dll + 3-5)timiditydrv.dll (configure) CC="wcc386_w.sh" CXX="wpp386_w.sh" CPP="wcc386_w.sh -p" CFLAGS="-d0 -obll+riemcht" \ ./configure --enable-winsyn --enable-windrv --enable-spline=linear \ @@ -414,10 +397,8 @@ Microsoft Visual C++ Toolkit 2003 portaudio.h¤µ¤¨¤¢¤ì¤ÐTiMidity++¤Ï¥³¥ó¥Ñ¥¤¥ë¤Ç¤­¤ë¡£ £²¡Ý£¶¡Ëportmidi(http://www-2.cs.cmu.edu/~music/portmusic/) ¡Ê¤³¤³¤Ç¤Ï»È¤ï¤Ê¤¤¡Ë -¡Ê£³¡Ëtimiditydrv.dll¤ò¥³¥ó¥Ñ¥¤¥ë¤¹¤ë¾ì¹ç¤Î½àÈ÷ - 3-1)Microsoft Platform SDK¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¡£ -¡Ê£´¡ËTiMIdity++¤Î¥³¥ó¥Ñ¥¤¥ë - 4-1)timw32g.exe +¡Ê£³¡ËTiMIdity++¤Î¥³¥ó¥Ñ¥¤¥ë + 3-1)timw32g.exe (configure) CC="cl" CPP="cl.exe -EP" CFLAGS="-O2" \ ./configure --enable-network --enable-w32gui --enable-spline=gauss \ @@ -425,7 +406,7 @@ Microsoft Visual C++ Toolkit 2003 (make) make mv timidity.exe timw32g.exe - 4-2)twsyng.exe + 3-2)twsyng.exe (configure) CC="cl" CPP="cl.exe -EP" CFLAGS="-O2" \ ./configure --enable-network --enable-winsyng --enable-spline=linear \ @@ -433,7 +414,7 @@ Microsoft Visual C++ Toolkit 2003 (make) make mv timidity.exe twsyng.exe - 4-3)twsynsrv.exe + 3-3)twsynsrv.exe (configure) CC="cl" CPP="cl.exe -EP" CFLAGS="-O2"\ ./configure --enable-network --enable-winsyng --enable-spline=linear \ @@ -443,14 +424,14 @@ Microsoft Visual C++ Toolkit 2003 (make) make mv timidity.exe twsynsrv.exe - 4-4)timidity.exe + 3-4)timidity.exe (configure) CC="cl" CPP="cl.exe -EP" CFLAGS="-O2" \ ./configure --enable-interface=ncurses,vt100,winsyn --enable-network --enable-spline=linear \ --enable-audio=w32,vorbis,gogo,ogg,flac,portaudio (make) make - 4-5)timiditydrv.dll + 3-5)timiditydrv.dll (configure) CC="cl" CXX="cl" CPP="cl.exe -EP" CFLAGS="-O2" \ ./configure --enable-winsyn --enable-windrv --enable-spline=linear \ @@ -525,21 +506,16 @@ Microsoft Visual C++ Toolkit 2003 portaudio.h¤µ¤¨¤¢¤ì¤ÐTiMidity++¤Ï¥³¥ó¥Ñ¥¤¥ë¤Ç¤­¤ë¡£ £²¡Ý£¶¡Ëportmidi(http://www-2.cs.cmu.edu/~music/portmusic/) ¡Ê¤³¤³¤Ç¤Ï»È¤ï¤Ê¤¤¡Ë -¡Ê£³¡Ëtimiditydrv.dll¤ò¥³¥ó¥Ñ¥¤¥ë¤¹¤ë¾ì¹ç¤Î½àÈ÷ - 3-1)Microsoft Platform SDK¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¡£ - 3-2)Platform SDK¤«¤émidl.exe¤ò¼è¤ê½Ð¤·¥Ñ¥¹¤ÎÄ̤俥ǥ£¥ì¥¯¥È¥ê¤Ë¤ª¤¯¡£ - 3-3)Free Pascal Compiler(http://www.freepascal.org/)¤«¤é - cpp.exe¤ò¼è¤ê½Ð¤·fpcpp.exe¤È̾Á°¤òÊѤ¨¤Æ¥Ñ¥¹¤ÎÄ̤俥ǥ£¥ì¥¯¥È¥ê¤Ë¤ª¤¯¡£ -¡Ê£´¡ËTiMIdity++¤Î¥³¥ó¥Ñ¥¤¥ë - 4-0-1) unix->dos¤Î²þ¹Ô¥³¡¼¥ÉÊÑ´¹¡ÊLF->CRLF) +¡Ê£³¡ËTiMIdity++¤Î¥³¥ó¥Ñ¥¤¥ë + 3-0-1) unix->dos¤Î²þ¹Ô¥³¡¼¥ÉÊÑ´¹¡ÊLF->CRLF) $sh script/unix2dos.sh - 4-0-1) perl -pe 's/CC\s-o\s\S\S*\s/CC /g' configure |perl -pe 's/CXX\s-o\s\S\S*\s/CXX /g' - >configure_dm + 3-0-1) perl -pe 's/CC\s-o\s\S\S*\s/CC /g' configure |perl -pe 's/CXX\s-o\s\S\S*\s/CXX /g' - >configure_dm (configureÃæ¤Î -o xxxx ¤Ïdmc.exe¤¬¼õ¤±ÉÕ¤±¤Ê¤¤¤¿¤á) - 4-0-2) Free Pascal Compiler(http://www.freepascal.org/)¤«¤é + 3-0-2) Free Pascal Compiler(http://www.freepascal.org/)¤«¤é cpp.exe¤ò¼è¤ê½Ð¤·fpcpp.exe¤È̾Á°¤òÊѤ¨¤Æ¥Ñ¥¹¤ÎÄ̤俥ǥ£¥ì¥¯¥È¥ê¤Ë¤ª¤¯¡£ ¡Êdmc.exe¤Ïgnu autotoolsÍѤΥץê¥×¥í¥»¥Ã¥µ¤Ë¤ÏÉÔ¸þ¤­¡Ë - 4-1)timw32g.exe + 3-1)timw32g.exe (configure) CC="dmc -Jm -w -mn -5 -o" CXX="dmc -Jm -w -mn -cpp -5 -o" CPP="fpcpp -D__NT__ -I/i/dm/include" \ ./configure_dm --enable-network --enable-w32gui --enable-spline=gauss \ @@ -547,7 +523,7 @@ Microsoft Visual C++ Toolkit 2003 (make) make mv timidity.exe timw32g.exe - 4-2)twsyng.exe + 3-2)twsyng.exe (configure) CC="dmc -Jm -w -mn -5 -o" CXX="dmc -Jm -w -mn -cpp -5 -o" CPP="fpcpp -D__NT__ -I/i/dm/include" \ ./configure_dm --enable-network --enable-winsyng --enable-spline=linear \ @@ -555,7 +531,7 @@ Microsoft Visual C++ Toolkit 2003 (make) make mv timidity.exe twsyng.exe - 4-3)twsynsrv.exe + 3-3)twsynsrv.exe (configure) CC="dmc -Jm -w -mn -5 -o" CXX="dmc -Jm -w -mn -cpp -5 -o" CPP="fpcpp -D__NT__ -I/i/dm/include" \ ./configure_dm --enable-network --enable-winsyng --enable-spline=linear \ @@ -565,14 +541,14 @@ Microsoft Visual C++ Toolkit 2003 (make) make mv timidity.exe twsynsrv.exe - 4-4)timidity.exe + 3-4)timidity.exe (configure) CC="dmc -Jm -w -mn -5 -o" CXX="dmc -Jm -w -mn -cpp -5 -o" CPP="fpcpp -D__NT__ -I/i/dm/include" \ ./configure_dm --enable-interface=ncurses,vt100,winsyn --enable-network --enable-spline=linear \ --enable-audio=w32,vorbis,gogo,ogg,flac,portaudio (make) make - 4-5)timiditydrv.dll + 3-5)timiditydrv.dll (configure) CC="dmc -Jm -w -mn -5 -o" CXX="dmc -Jm -w -mn -cpp -5 -o" CPP="fpcpp -D__NT__ -I/i/dm/include" \ ./configure_dm --enable-interface=windrv,winsyn --enable-network --enable-spline=linear \ @@ -628,16 +604,10 @@ Microsoft Visual C++ Toolkit 2003 portaudio.h¤µ¤¨¤¢¤ì¤ÐTiMidity++¤Ï¥³¥ó¥Ñ¥¤¥ë¤Ç¤­¤ë¡£ £²¡Ý£¶¡Ëportmidi(http://www-2.cs.cmu.edu/~music/portmusic/) ¡Ê¤³¤³¤Ç¤Ï»È¤ï¤Ê¤¤¡Ë -¡Ê£³¡Ëtimiditydrv.dll¤ò¥³¥ó¥Ñ¥¤¥ë¤¹¤ë¾ì¹ç¤Î½àÈ÷ - 3-1)Microsoft Platform SDK¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¡£ - 3-2)Platform SDK¤«¤émidl.exe¤ò¼è¤ê½Ð¤·¥Ñ¥¹¤ÎÄ̤俥ǥ£¥ì¥¯¥È¥ê¤Ë¤ª¤¯¡£ - 3-3)Free Pascal Compiler(http://www.freepascal.org/)¤«¤é - cpp.exe¤ò¼è¤ê½Ð¤·fpcpp.exe¤È̾Á°¤òÊѤ¨¤Æ¥Ñ¥¹¤ÎÄ̤俥ǥ£¥ì¥¯¥È¥ê¤Ë¤ª¤¯¡£ - "cc.exe -E" ¤Ïmidl.exeÍѤΥץê¥×¥í¥»¥Ã¥µ¤Ë¤ÏÉÔ¸þ¤­¡Ë -¡Ê£´¡ËTiMIdity++¤Î¥³¥ó¥Ñ¥¤¥ë - 4-0) perl -pe 's/CC\s-o\s\S\S*\s/CC /g' configure >configure_pocc +¡Ê£³¡ËTiMIdity++¤Î¥³¥ó¥Ñ¥¤¥ë + 3-0) perl -pe 's/CC\s-o\s\S\S*\s/CC /g' configure >configure_pocc (configureÃæ¤Î -o xxxx ¤Ï Pelles C ¤¬¼õ¤±ÉÕ¤±¤Ê¤¤¤¿¤á) - 4-1)timw32g.exe + 3-1)timw32g.exe (configure) CC="cc" CPP="pocc.exe -E" CFLAGS="-MT" ./configure_pocc \ --enable-network --enable-w32gui --enable-spline=gauss \ @@ -645,7 +615,7 @@ Microsoft Visual C++ Toolkit 2003 (make) make mv timidity.exe timw32g.exe - 4-2)twsyng.exe + 3-2)twsyng.exe (configure) CC="cc" CPP="pocc.exe -E" CFLAGS="-MT" ./configure_pocc \ --enable-network --enable-winsyng --enable-spline=linear \ @@ -653,7 +623,7 @@ Microsoft Visual C++ Toolkit 2003 (make) make mv timidity.exe twsyng.exe - 4-3)twsynsrv.exe + 3-3)twsynsrv.exe (configure) CC="cc" CPP="pocc.exe -E" CFLAGS="-MT" ./configure_pocc \ --enable-network --enable-winsyng --enable-spline=linear \ @@ -663,14 +633,14 @@ Microsoft Visual C++ Toolkit 2003 (make) make mv timidity.exe twsynsrv.exe - 4-4)timidity.exe + 3-4)timidity.exe (configure) CC="cc" CPP="pocc.exe -E" CFLAGS="-MT" ./configure_pocc \ --enable-interface=ncurses,vt100,winsyn --enable-network --enable-spline=linear \ --enable-audio=w32,vorbis,gogo,ogg,flac,portaudio (make) make - 4-5)timiditydrv.dll + 3-5)timiditydrv.dll (configure) CC="cc" CPP="pocc.exe -E" CFLAGS="-MT" ./configure_pocc \ --enable-winsyn --enable-windrv --enable-spline=linear \ @@ -679,4 +649,4 @@ Microsoft Visual C++ Toolkit 2003 make -2006.12.22 Ëö±Ê¡¡·½»Ê(skeishi@mutt.freemail.ne.jp) +2006.12.23 Ëö±Ê¡¡·½»Ê(skeishi@mutt.freemail.ne.jp) diff --git a/windrv/Makefile.am b/windrv/Makefile.am index 19573c22..d6086dca 100755 --- a/windrv/Makefile.am +++ b/windrv/Makefile.am @@ -35,7 +35,6 @@ noinst_LIBRARIES = libtimiditydrv.a endif libtimiditydrv_a_SOURCES = \ - timiditydrv.idl \ timiditydrv.c \ timiwp_timidity.h \ timiwp_timidity.c \ @@ -45,11 +44,9 @@ libtimiditydrv_a_SOURCES = \ SYSEXTRAS: timiditydrv.h EXTRA_DIST = \ - oemsetup.inf \ timiditydrv.inf -CLEANFILES = timiditydrv.tlb if MINGWGCC libtimiditydrv_a_LIBADD = \ @@ -197,69 +194,14 @@ endif libtimiditydrv.a: $(libtimiditydrv_a_OBJECTS) $(libtimiditydrv_a_dep) touch $@ -if VCPP -timiditydrv_i.c timiditydrv_p.c timiditydrv.h:timiditydrv.idl - midl -nologo timiditydrv.idl -else -if DMC -#Get cpp.exe from Free Pascal and rename it to fpcpp.exe. -timiditydrv_i.c timiditydrv_p.c timiditydrv.h:timiditydrv.idl - midl -cpp_cmd fpcpp -cpp_opt -E timiditydrv.idl -else -if BORLANDC -#Get cpp.exe from Free Pascal and rename it to fpcpp.exe. -timiditydrv_i.c timiditydrv_p.c timiditydrv.h:timiditydrv.idl - midl -cpp_cmd fpcpp -cpp_opt -E -Ii:/dm/include/win32 timiditydrv.idl -else -if MINGWGCC -#Get cpp.exe from Free Pascal and rename it to fpcpp.exe. -timiditydrv_i.c timiditydrv_p.c timiditydrv.h:timiditydrv.idl - midl -cpp_cmd fpcpp -cpp_opt -E timiditydrv.idl -else -if WATCOM_C -#Get cpp.exe from Free Pascal and rename it to fpcpp.exe. -timiditydrv_i.c timiditydrv_p.c timiditydrv.h:timiditydrv.idl - midl -cpp_cmd fpcpp -cpp_opt -E timiditydrv.idl -else -if POCC -#Get cpp.exe from Free Pascal and rename it to fpcpp.exe. -timiditydrv_i.c timiditydrv_p.c timiditydrv.h:timiditydrv.idl - midl -cpp_cmd fpcpp -cpp_opt -E timiditydrv.idl -endif -# POCC -endif -# WATCOM_C -endif -# MINGWGCC -endif -# BORLANDC -endif -# DMC -endif -# VCPP objs: $(libtimiditydrv_a_OBJECTS) $(libtimiditydrv_a_DEPENDENCIES) @: -if MINGWGCC -timiditydrv.o: timiditydrv.c timiditydrv.h - source='$<' object='$@' libtool=no \ - depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' \ - $(DEPMODE) $(depcomp) \ - $(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` -else -timiditydrv.obj: timiditydrv.c timiditydrv.h - source='$<' object='$@' libtool=no \ - depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' \ - $(DEPMODE) $(depcomp) \ - $(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` -endif -# MINGWGCC uninstall-info-am: clean: - -rm -f *.o *.a *.dll *.obj *.RES *.idb *.pch *.lib - -rm -f timiditydrv_i.c timiditydrv_p.c timiditydrv.h dlldata.c + -rm -f *.o *.a *.dll *.obj *.RES *.lib diff --git a/windrv/oemsetup.inf b/windrv/oemsetup.inf deleted file mode 100755 index 79b1693f..00000000 --- a/windrv/oemsetup.inf +++ /dev/null @@ -1,9 +0,0 @@ -[Source Media Descriptions] -1 = "TiMidity++ Driver Files" , TAGFILE = disk1 - -[Installable.Drivers] -timiditydrv = 1:timiditydrv.dll, "MIDI", "TiMidity++",,, - -[timiditydrv] - - diff --git a/windrv/timiditydrv.c b/windrv/timiditydrv.c index 37f87be4..f6fde39a 100644 --- a/windrv/timiditydrv.c +++ b/windrv/timiditydrv.c @@ -24,7 +24,6 @@ #define _WIN32_WINNT 0x0400 #endif -#include #if __DMC__ unsigned long _beginthreadex( void *security, unsigned stack_size, unsigned ( __stdcall *start_address )( void * ), void *arglist, @@ -36,59 +35,10 @@ void _endthreadex( unsigned retval ); #include #endif -#if __DMC__ -#include -#endif -#include -#include "timiditydrv.h" - +#include #include "mmddk.h" - #include -// some compilers' mmsystem.h lacks MIDIOUTCAPS2 definitions, -// so followings are imported from wine's mmsystem.h -#if !( defined(_MSC_VER) || \ - ( defined(__POCC__) && (__POCC__ >= 450) ) || \ - ( defined(__BORLANDC__) && (__BORLANDC__ >= 0x582) ) ) - -typedef struct tagMIDIOUTCAPS2A { - WORD wMid; - WORD wPid; - MMVERSION vDriverVersion; - CHAR szPname[MAXPNAMELEN]; - WORD wTechnology; - WORD wVoices; - WORD wNotes; - WORD wChannelMask; - DWORD dwSupport; - GUID ManufacturerGuid; - GUID ProductGuid; - GUID NameGuid; -} MIDIOUTCAPS2A, *LPMIDIOUTCAPS2A; - -typedef struct tagMIDIOUTCAPS2W { - WORD wMid; - WORD wPid; - MMVERSION vDriverVersion; - WCHAR szPname[MAXPNAMELEN]; - WORD wTechnology; - WORD wVoices; - WORD wNotes; - WORD wChannelMask; - DWORD dwSupport; - GUID ManufacturerGuid; - GUID ProductGuid; - GUID NameGuid; -} MIDIOUTCAPS2W, *LPMIDIOUTCAPS2W; -#endif - -#if defined(__MINGW32__) || defined(__WATCOMC__) -#define __IID_DEFINED__ 1 -#endif -#include "timiditydrv_i.c" - -//#include "mmreg.h" //Fom SDK for MM_UNMAPPED & MM_PID_UNMAPPED #include "config.h" #include "sysdep.h" @@ -168,8 +118,6 @@ STDAPI_(LONG) DriverProc(DWORD dwDriverId, HDRVR hdrvr, UINT msg, LONG lParam1, HRESULT modGetCaps(PVOID capsPtr, DWORD capsSize) { MIDIOUTCAPSA * myCapsA; MIDIOUTCAPSW * myCapsW; - MIDIOUTCAPS2A * myCaps2A; - MIDIOUTCAPS2W * myCaps2W; CHAR synthName[] = "Timidity++ Driver\0"; WCHAR synthNameW[] = L"Timidity++ Driver\0"; @@ -202,39 +150,6 @@ HRESULT modGetCaps(PVOID capsPtr, DWORD capsSize) { return MMSYSERR_NOERROR; break; - - case (sizeof(MIDIOUTCAPS2A)): - myCaps2A = (MIDIOUTCAPS2A *)capsPtr; - myCaps2A->wMid = 0xffff; - myCaps2A->wPid = 0xffff; - memcpy(myCaps2A->szPname, synthName, sizeof(synthName)); - myCaps2A->wTechnology = MOD_MIDIPORT; - myCaps2A->vDriverVersion = 0x0090; - myCaps2A->wVoices = 0; - myCaps2A->wNotes = 0; - myCaps2A->wChannelMask = 0xffff; - myCaps2A->dwSupport = 0; - myCaps2A->ManufacturerGuid = CLSID_tim_synth; - myCaps2A->ProductGuid = CLSID_tim_synth; - myCaps2A->NameGuid = CLSID_tim_synth; - return MMSYSERR_NOERROR; - - case (sizeof(MIDIOUTCAPS2W)): - myCaps2W = (MIDIOUTCAPS2W *)capsPtr; - myCaps2W->wMid = 0xffff; - myCaps2W->wPid = 0xffff; - memcpy(myCaps2W->szPname, synthNameW, sizeof(synthNameW)); - myCaps2W->wTechnology = MOD_MIDIPORT; - myCaps2W->vDriverVersion = 0x0090; - myCaps2W->wVoices = 0; - myCaps2W->wNotes = 0; - myCaps2W->wChannelMask = 0xffff; - myCaps2W->dwSupport = 0; - myCaps2W->ManufacturerGuid = CLSID_tim_synth; - myCaps2W->ProductGuid = CLSID_tim_synth; - myCaps2W->NameGuid = CLSID_tim_synth; - return MMSYSERR_NOERROR; - default: return MMSYSERR_ERROR; diff --git a/windrv/timiditydrv.idl b/windrv/timiditydrv.idl deleted file mode 100755 index 4b4af2b9..00000000 --- a/windrv/timiditydrv.idl +++ /dev/null @@ -1,62 +0,0 @@ -/* - TiMidity++ -- MIDI to WAVE converter and player - Copyright (C) 1999-2002 Masanao Izumo - Copyright (C) 1995 Tuukka Toivonen - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - - aRts_a.c by Peter L Jones - based on esd_a.c - - Functions to play sound through aRts -*/ - -// This file will be processed by the MIDL tool to -// produce the type library (timiditydrv.tlb) and marshalling code. - -//import "oaidl.idl"; -//import "ocidl.idl"; - - [ - object, - uuid(D908258C-4B41-41f0-AAD9-684FDAA84C75), - dual, - helpstring("Itim_synth Interface"), - pointer_default(unique) - ] - interface Itim_synth : IDispatch - { - }; - -[ - uuid(6D98B569-D56A-4fff-870A-F2E27052A0DE), - version(1.0), - helpstring("timiditydrv 1.0 Type Library") -] -library TIM_DRVLib -{ - importlib("stdole32.tlb"); - importlib("stdole2.tlb"); - - - [ - uuid(0FEC4C35-A705-41d7-A3BB-D587A231045A), - helpstring("tim_synth Class") - ] - coclass tim_synth - { - [default] interface Itim_synth; - }; -}; -- 2.11.0