From a8d10bcab401f7142f310a6217acaee475fa4592 Mon Sep 17 00:00:00 2001 From: Josh Green Date: Thu, 20 Sep 2007 07:47:38 +0000 Subject: [PATCH] Doc updates, win32 build changes, fixed bug causing QSynth crash, reverted reverb level and chorus changes. --- fluidsynth/AUTHORS | 1 + fluidsynth/ChangeLog | 26 +- fluidsynth/README-OSX | 26 +- fluidsynth/configure.ac | 1 + fluidsynth/src/config_win32.h | 7 +- fluidsynth/src/config_win32.h.in | 34 + fluidsynth/src/fluid_alsa.c | 42 +- fluidsynth/src/fluid_aufile.c | 4 - fluidsynth/src/fluid_dsound.c | 2 +- fluidsynth/src/fluid_lash.h | 2 + fluidsynth/src/fluid_oss.c | 16 +- fluidsynth/src/fluid_rev.c | 8 +- fluidsynth/src/fluid_synth.c | 43 +- fluidsynth/src/fluid_synth.h | 3 +- fluidsynth/src/fluid_voice.c | 4 +- fluidsynth/src/fluidsynth.c | 6 +- fluidsynth/winbuild/Makefile.am | 2 +- fluidsynth/winbuild/fluidsynth.dsw | 31 +- fluidsynth/winbuild/fluidsynth.sln | 38 + fluidsynth/winbuild/fluidsynth/Makefile.am | 2 +- fluidsynth/winbuild/fluidsynth/fluidsynth.dsp | 90 +- .../winbuild/fluidsynth/fluidsynth.vcproj | 162 ++++ .../winbuild/fluidsynth_dll/Makefile.am | 2 +- .../fluidsynth_dll/fluidsynth_dll.dsp | 289 +------ .../fluidsynth_dll/fluidsynth_dll.vcproj | 774 ++++++++++++++++++ .../winbuild/fluidsynth_lib/Makefile.am | 2 +- .../fluidsynth_lib/fluidsynth_lib.dsp | 280 +------ .../fluidsynth_lib/fluidsynth_lib.vcproj | 747 +++++++++++++++++ 28 files changed, 1984 insertions(+), 660 deletions(-) create mode 100644 fluidsynth/src/config_win32.h.in create mode 100755 fluidsynth/winbuild/fluidsynth.sln create mode 100755 fluidsynth/winbuild/fluidsynth/fluidsynth.vcproj create mode 100755 fluidsynth/winbuild/fluidsynth_dll/fluidsynth_dll.vcproj create mode 100755 fluidsynth/winbuild/fluidsynth_lib/fluidsynth_lib.vcproj diff --git a/fluidsynth/AUTHORS b/fluidsynth/AUTHORS index 6b930c5b..1580adf4 100644 --- a/fluidsynth/AUTHORS +++ b/fluidsynth/AUTHORS @@ -117,3 +117,4 @@ Henri Manson Mihail Zenkov Paul Millar Nick Daly +David Hilvert diff --git a/fluidsynth/ChangeLog b/fluidsynth/ChangeLog index 982fc9b2..b93d43d5 100644 --- a/fluidsynth/ChangeLog +++ b/fluidsynth/ChangeLog @@ -1,4 +1,28 @@ -2008-09-02 Josh Green +2007-09-20 Josh Green + + * Doc updates to AUTHORS and latest README-OSX from Ebrahim Mayat. + * src/config_win32.h.in: VERSION is now filled in at configure time. + * src/fluid_alsa.c (fluid_alsa_audio_run_s16): Fixed bug which was + causing weird crashes with QSynth when new_fluid_audio_driver2() when + audio meters were enabled (user data parameter was being used as a + fluid_synth_t instance). Synth instance is now no longer used in + this case (it was only used for 16 bit dithering before). + * src/fluid_oss.c: Fixed the same bug that was affecting ALSA driver. + * src/fluid_rev.c: Reverted to old commented out code in regards to + reverb level. + * src/fluid_synth.c (fluid_synth_dither_s16): Now no longer uses + fluid_synth_t instance, but accepts a pointer to an integer instead + for keeping track of dithering buffer index (all that the synth instance + was being used for). + * src/fluid_synth.c (fluid_synth_one_block): Reverted patch which + performs assignment of chorus and reverb levels in synthesis loop, + until a better scheme is devised (unnecessary CPU consumption). + * Added Visual Studio .sln and .vcproj files and some minor source + changes to get FluidSynth to build with it. + * Back-converted Visual Studio project to VC++ 6 project for users + using that build platform (not tested). + +2007-09-02 Josh Green * configure.ac: Removed SSE and longlong related switches (SSE support removed for now and longlong is now always used). diff --git a/fluidsynth/README-OSX b/fluidsynth/README-OSX index 958cec65..319f6f40 100644 --- a/fluidsynth/README-OSX +++ b/fluidsynth/README-OSX @@ -1,5 +1,5 @@ -Compiling fluidsynth-1.0.7 on Mac OS X.4 (Tiger) --------------------------------------------- +Compiling fluidsynth-1.0.8 on Mac OS X.4.10 (Tiger) +----------------------------------------------------------------------- Requirements: - "XcodeTools.mpkg","DevSDK.pkg", "CoreAudioSDK.pkg" packages (The Tiger Install DVD). @@ -7,17 +7,17 @@ Requirements: - libgnugetopt-1.2, readline-4.3, ladspa-1.12 and ladspa-cmt-1.15 from fink: e.g. "fink install libgnugetopt" -- MidiShare-1.87 for Mac OS X +- midishare-1.92-macosx - - Jack-0.51 for Mac OS X - +- Jack OSX version 0.74 + 1. Edit the "/usr/local/lib/pkgconfig/jack.pc" file using your favorite Unix editor: - In the "Libs" line, replace "ljack" with "-framework Jack" - + In the "Libs" line, replace "ljack" with "-framework Jack" + 2. cd to the fluidsynth directory and in the configure script, substitute "-lmidishare" with "-framework MidiShare". 3. Run configure with the following options (all on one line in a text editor, then copy and paste into Terminal): -PKG_CONFIG_PATH=/usr/local/lib/pkgconfig ./configure --enable-midishare --enable-ladspa --enable-functioncheck --enable-debug --enable-profiling --enable-jack-support --enable-longlong --disable-lash "CPPFLAGS=-I/usr/local/include -I/sw/include -I/System/Library/Frameworks/MidiShare.framework/Versions/A/Headers -I/System/Library/Frameworks/CoreAudio.framework/Versions/A/Headers -I/Library/Frameworks/Jack.framework/Headers" "LDFLAGS=-L/usr/local/lib -L/sw/lib -framework MidiShare -framework CoreAudio -framework Jack" +PKG_CONFIG_PATH=/usr/local/lib/pkgconfig ./configure --enable-midishare --disable-lash This should result in ************************************************************** @@ -27,17 +27,15 @@ OSS: no MidiShare: yes JACK: yes CoreAudio: yes -LADSPA support: yes +LADSPA support: no LASH support: no LADCCA support: no -Readline: yes +Readline: no Debug: yes -Profiling: yes -use long long: yes +Profiling: no ************************************************************** 4. make && make install as root Ebrahim Mayat -20th February 2006 - +4th September 2007 diff --git a/fluidsynth/configure.ac b/fluidsynth/configure.ac index fbdc6c54..fa588e3c 100644 --- a/fluidsynth/configure.ac +++ b/fluidsynth/configure.ac @@ -327,6 +327,7 @@ AC_OUTPUT([ winbuild/fluidsynth_dll/Makefile winbuild/fluidsynth_lib/Makefile src/Makefile + src/config_win32.h doc/Makefile include/Makefile include/fluidsynth/Makefile diff --git a/fluidsynth/src/config_win32.h b/fluidsynth/src/config_win32.h index d38f2ac9..ef9ca4c0 100644 --- a/fluidsynth/src/config_win32.h +++ b/fluidsynth/src/config_win32.h @@ -1,5 +1,4 @@ - -#define VERSION "0.2.4" +#define VERSION "1.0.8" #define HAVE_STRING_H 1 #define HAVE_STDLIB_H 1 @@ -29,3 +28,7 @@ #pragma warning(disable : 4305) #define WITHOUT_SERVER 1 + +#ifndef inline +#define inline __inline +#endif diff --git a/fluidsynth/src/config_win32.h.in b/fluidsynth/src/config_win32.h.in new file mode 100644 index 00000000..d70223db --- /dev/null +++ b/fluidsynth/src/config_win32.h.in @@ -0,0 +1,34 @@ +#define VERSION "@VERSION@" + +#define HAVE_STRING_H 1 +#define HAVE_STDLIB_H 1 +#define HAVE_STDIO_H 1 +#define HAVE_MATH_H 1 +#define HAVE_STDARG_H 1 +#define HAVE_FCNTL_H 1 +#define HAVE_LIMITS_H 1 +#define HAVE_IO_H 1 +#define HAVE_WINDOWS_H 1 + +#define DSOUND_SUPPORT 1 +#define WINMIDI_SUPPORT 1 +#define WITH_FLOAT 1 + +#define snprintf _snprintf +#define vsnprintf _vsnprintf +#define STDIN_FILENO 0 +#define STDOUT_FILENO 1 +#define STDERR_FILENO 2 + + +#define WITH_PROFILING 0 + +#pragma warning(disable : 4244) +#pragma warning(disable : 4101) +#pragma warning(disable : 4305) + +#define WITHOUT_SERVER 1 + +#ifndef inline +#define inline __inline +#endif diff --git a/fluidsynth/src/fluid_alsa.c b/fluidsynth/src/fluid_alsa.c index 1beffa0b..5b23cc4d 100644 --- a/fluidsynth/src/fluid_alsa.c +++ b/fluidsynth/src/fluid_alsa.c @@ -516,7 +516,6 @@ static void* fluid_alsa_audio_run_float(void* d) static void* fluid_alsa_audio_run_s16(void* d) { fluid_alsa_audio_driver_t* dev = (fluid_alsa_audio_driver_t*) d; - fluid_synth_t* synth = (fluid_synth_t *)(dev->data); float* left; float* right; short* buf; @@ -548,41 +547,52 @@ static void* fluid_alsa_audio_run_s16(void* d) goto error_recovery; } - /* use separate loops depending on if callback supplied or not (overkill?) */ + /* use separate loops depending on if callback supplied or not */ if (dev->callback) { - while (dev->cont) { - (*dev->callback)(synth, buffer_size, 0, NULL, 2, handle); + int dither_index = 0; + + while (dev->cont) + { + (*dev->callback)(dev->data, buffer_size, 0, NULL, 2, handle); /* convert floating point data to 16 bit (with dithering) */ - fluid_synth_dither_s16 (synth, buffer_size, left, right, buf, 0, 2, buf, 1, 2); - + fluid_synth_dither_s16 (&dither_index, buffer_size, left, right, + buf, 0, 2, buf, 1, 2); offset = 0; - while (offset < buffer_size) { - n = snd_pcm_writei(dev->pcm, (void*) (buf + 2 * offset), buffer_size - offset); - + while (offset < buffer_size) + { + n = snd_pcm_writei (dev->pcm, (void*) (buf + 2 * offset), + buffer_size - offset); if (n < 0) /* error occurred? */ { if (fluid_alsa_handle_write_error (dev->pcm, n) != FLUID_OK) goto error_recovery; - } else offset += n; /* no error occurred */ + } + else offset += n; /* no error occurred */ } /* while (offset < buffer_size) */ } /* while (dev->cont) */ } - else /* no user audio callback (faster) */ + else /* no user audio callback, dev->data is the synth instance */ { - while (dev->cont) { - fluid_synth_write_s16(dev->data, buffer_size, buf, 0, 2, buf, 1, 2); + fluid_synth_t* synth = (fluid_synth_t *)(dev->data); + + while (dev->cont) + { + fluid_synth_write_s16 (synth, buffer_size, buf, 0, 2, buf, 1, 2); offset = 0; - while (offset < buffer_size) { - n = snd_pcm_writei(dev->pcm, (void*) (buf + 2 * offset), buffer_size - offset); + while (offset < buffer_size) + { + n = snd_pcm_writei (dev->pcm, (void*) (buf + 2 * offset), + buffer_size - offset); if (n < 0) /* error occurred? */ { if (fluid_alsa_handle_write_error (dev->pcm, n) != FLUID_OK) goto error_recovery; - } else offset += n; /* no error occurred */ + } + else offset += n; /* no error occurred */ } /* while (offset < buffer_size) */ } /* while (dev->cont) */ } diff --git a/fluidsynth/src/fluid_aufile.c b/fluidsynth/src/fluid_aufile.c index cc91708a..579844e8 100644 --- a/fluidsynth/src/fluid_aufile.c +++ b/fluidsynth/src/fluid_aufile.c @@ -180,8 +180,4 @@ static int fluid_file_audio_run_s16(void* d, unsigned int clock_time) dev->samples += dev->period_size; return 1; - - error_recovery: - - return 0; } diff --git a/fluidsynth/src/fluid_dsound.c b/fluidsynth/src/fluid_dsound.c index 6ea2a1d7..10a3319f 100644 --- a/fluidsynth/src/fluid_dsound.c +++ b/fluidsynth/src/fluid_dsound.c @@ -62,7 +62,7 @@ BOOL CALLBACK fluid_dsound_enum_callback(LPGUID guid, LPCTSTR description, LPCTSTR module, LPVOID context) { fluid_settings_t* settings = (fluid_settings_t*) context; - fluid_settings_add_option(settings, "audio.dsound.device", description); + fluid_settings_add_option(settings, "audio.dsound.device", (char *)description); return TRUE; } diff --git a/fluidsynth/src/fluid_lash.h b/fluidsynth/src/fluid_lash.h index 2d290ddc..125283c0 100644 --- a/fluidsynth/src/fluid_lash.h +++ b/fluidsynth/src/fluid_lash.h @@ -17,7 +17,9 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA * 02111-1307, USA */ +#if HAVE_CONFIG_H #include "config.h" +#endif #if defined(HAVE_LASH) || defined(HAVE_LADCCA) diff --git a/fluidsynth/src/fluid_oss.c b/fluidsynth/src/fluid_oss.c index 9d014376..ea75dc0d 100644 --- a/fluidsynth/src/fluid_oss.c +++ b/fluidsynth/src/fluid_oss.c @@ -590,9 +590,10 @@ fluid_oss_audio_run(void* d) int len = dev->buffer_size; /* it's as simple as that: */ - while (dev->cont) { - dev->read(synth, len, buffer, 0, 2, buffer, 1, 2); - write(dev->dspfd, buffer, dev->buffer_byte_size); + while (dev->cont) + { + dev->read (synth, len, buffer, 0, 2, buffer, 1, 2); + write (dev->dspfd, buffer, dev->buffer_byte_size); } FLUID_LOG(FLUID_DBG, "Audio thread finished"); @@ -615,19 +616,20 @@ fluid_oss_audio_run2(void* d) float* right = dev->buffers[1]; int buffer_size = dev->buffer_size; int len = dev->buffer_size; + int dither_index = 0; int i, k; FLUID_LOG(FLUID_DBG, "Audio thread running"); /* it's as simple as that: */ - while (dev->cont) { - + while (dev->cont) + { (*dev->callback)(dev->data, buffer_size, 0, NULL, 2, dev->buffers); - fluid_synth_dither_s16 (dev->data, buffer_size, left, right, + fluid_synth_dither_s16 (&dither_index, buffer_size, left, right, buffer, 0, 2, buffer, 1, 2); - write(dev->dspfd, buffer, dev->buffer_byte_size); + write (dev->dspfd, buffer, dev->buffer_byte_size); } FLUID_LOG(FLUID_DBG, "Audio thread finished"); diff --git a/fluidsynth/src/fluid_rev.c b/fluidsynth/src/fluid_rev.c index 5c363930..3f09b6d6 100644 --- a/fluidsynth/src/fluid_rev.c +++ b/fluidsynth/src/fluid_rev.c @@ -272,7 +272,6 @@ struct _fluid_revmodel_t { fluid_real_t roomsize; fluid_real_t damp; fluid_real_t wet, wet1, wet2; - fluid_real_t level; fluid_real_t width; fluid_real_t gain; /* @@ -492,6 +491,7 @@ fluid_revmodel_update(fluid_revmodel_t* rev) fluid_comb_setfeedback(&rev->combL[i], rev->roomsize); fluid_comb_setfeedback(&rev->combR[i], rev->roomsize); } + for (i = 0; i < numcombs; i++) { fluid_comb_setdamp(&rev->combL[i], rev->damp); fluid_comb_setdamp(&rev->combR[i], rev->damp); @@ -535,13 +535,15 @@ fluid_revmodel_getdamp(fluid_revmodel_t* rev) void fluid_revmodel_setlevel(fluid_revmodel_t* rev, fluid_real_t value) { - rev->level = value; + fluid_clip(value, 0.0f, 1.0f); + rev->wet = value * scalewet; + fluid_revmodel_update(rev); } fluid_real_t fluid_revmodel_getlevel(fluid_revmodel_t* rev) { - return rev->level; + return rev->wet / scalewet; } void diff --git a/fluidsynth/src/fluid_synth.c b/fluidsynth/src/fluid_synth.c index 54fd7dda..d1bd8a98 100644 --- a/fluidsynth/src/fluid_synth.c +++ b/fluidsynth/src/fluid_synth.c @@ -1805,12 +1805,13 @@ fluid_synth_write_s16(fluid_synth_t* synth, int len, /* * fluid_synth_dither_s16 * Converts stereo floating point sample data to signed 16 bit data with - * dithering. This function and fluid_synth_write_s16 should not be used - * on the same synth instance (dithering is per synth). + * dithering. 'dither_index' parameter is a caller supplied pointer to an + * integer which should be initialized to 0 before the first call and passed + * unmodified to additional calls which are part of the same synthesis output. * Only used internally currently. */ void -fluid_synth_dither_s16(fluid_synth_t* synth, int len, float* lin, float* rin, +fluid_synth_dither_s16(int *dither_index, int len, float* lin, float* rin, void* lout, int loff, int lincr, void* rout, int roff, int rincr) { @@ -1820,8 +1821,7 @@ fluid_synth_dither_s16(fluid_synth_t* synth, int len, float* lin, float* rin, double prof_ref = fluid_profile_ref(); fluid_real_t left_sample; fluid_real_t right_sample; -/* double time = fluid_utime(); */ - int di = synth->dither_index; + int di = *dither_index; for (i = 0, j = loff, k = roff; i < len; i++, j += lincr, k += rincr) { @@ -1841,15 +1841,9 @@ fluid_synth_dither_s16(fluid_synth_t* synth, int len, float* lin, float* rin, right_out[k] = (signed short) right_sample; } - synth->dither_index = di; /* keep dither buffer continous */ + *dither_index = di; /* keep dither buffer continous */ fluid_profile(FLUID_PROF_WRITE_S16, prof_ref); - - /* FIXME - Should cpu_load be processed here? - time = fluid_utime() - time; - synth->cpu_load = 0.5 * (synth->cpu_load + - time * synth->sample_rate / len / 10000.0); - */ } /* @@ -1866,8 +1860,6 @@ fluid_synth_one_block(fluid_synth_t* synth, int do_not_mix_fx_to_out) fluid_real_t* chorus_buf; int byte_size = FLUID_BUFSIZE * sizeof(fluid_real_t); double prof_ref = fluid_profile_ref(); - fluid_real_t chorus_level = fluid_chorus_get_level(synth->chorus); - fluid_real_t reverb_level = fluid_revmodel_getlevel(synth->reverb); /* fluid_mutex_lock(synth->busy); /\* Here comes the audio thread. Lock the synth. *\/ */ @@ -1878,6 +1870,7 @@ fluid_synth_one_block(fluid_synth_t* synth, int do_not_mix_fx_to_out) FLUID_MEMSET(synth->left_buf[i], 0, byte_size); FLUID_MEMSET(synth->right_buf[i], 0, byte_size); } + for (i = 0; i < synth->effects_channels; i++) { FLUID_MEMSET(synth->fx_left_buf[i], 0, byte_size); FLUID_MEMSET(synth->fx_right_buf[i], 0, byte_size); @@ -1887,18 +1880,8 @@ fluid_synth_one_block(fluid_synth_t* synth, int do_not_mix_fx_to_out) * enabled on synth level. Nonexisting buffers are detected in the * DSP loop. Not sending the reverb / chorus signal saves some time * in that case. */ - if (synth->with_reverb) { - reverb_buf = synth->fx_left_buf[0]; - } else { - reverb_buf = NULL; - } - - if (synth->with_chorus) { - chorus_buf = synth->fx_left_buf[1]; - } else { - chorus_buf = NULL; - } - + reverb_buf = synth->with_reverb ? synth->fx_left_buf[0] : NULL; + chorus_buf = synth->with_chorus ? synth->fx_left_buf[1] : NULL; fluid_profile(FLUID_PROF_ONE_BLOCK_CLEAR, prof_ref); @@ -1926,14 +1909,6 @@ fluid_synth_one_block(fluid_synth_t* synth, int do_not_mix_fx_to_out) left_buf = synth->left_buf[auchan]; right_buf = synth->right_buf[auchan]; - fluid_voice_set_param(voice, GEN_CHORUSSEND, - 1000.0 - * (chorus_level - FLUID_CHORUS_DEFAULT_LEVEL) - / FLUID_CHORUS_DEFAULT_LEVEL, 1 /* ? */); - fluid_voice_set_param(voice, GEN_REVERBSEND, - 1000.0 - * (reverb_level - FLUID_REVERB_DEFAULT_LEVEL) - / FLUID_REVERB_DEFAULT_LEVEL, 1 /* ? */); fluid_voice_write(voice, left_buf, right_buf, reverb_buf, chorus_buf); fluid_profile(FLUID_PROF_ONE_BLOCK_VOICE, prof_ref_voice); diff --git a/fluidsynth/src/fluid_synth.h b/fluidsynth/src/fluid_synth.h index 50d8c32a..4e8fadb2 100644 --- a/fluidsynth/src/fluid_synth.h +++ b/fluidsynth/src/fluid_synth.h @@ -211,8 +211,7 @@ int fluid_synth_update_polyphony(fluid_synth_t* synth, char* name, int value); fluid_bank_offset_t* fluid_synth_get_bank_offset0(fluid_synth_t* synth, int sfont_id); void fluid_synth_remove_bank_offset(fluid_synth_t* synth, int sfont_id); -/* FIXME: Might be useful in public API */ -void fluid_synth_dither_s16(fluid_synth_t* synth, int len, float* lin, float* rin, +void fluid_synth_dither_s16(int *dither_index, int len, float* lin, float* rin, void* lout, int loff, int lincr, void* rout, int roff, int rincr); /* diff --git a/fluidsynth/src/fluid_voice.c b/fluidsynth/src/fluid_voice.c index 14f78a82..e9dedc27 100644 --- a/fluidsynth/src/fluid_voice.c +++ b/fluidsynth/src/fluid_voice.c @@ -696,7 +696,7 @@ fluid_voice_effects (fluid_voice_t *voice, int count, fluid_real_t dsp_centernode; int dsp_i; - + float v; /* filter (implement the voice filter according to Soundfont standard) */ @@ -751,7 +751,7 @@ fluid_voice_effects (fluid_voice_t *voice, int count, /* The voice is centered. Use voice->amp_left twice. */ for (dsp_i = 0; dsp_i < count; dsp_i++) { - float v = voice->amp_left * dsp_buf[dsp_i]; + v = voice->amp_left * dsp_buf[dsp_i]; dsp_left_buf[dsp_i] += v; dsp_right_buf[dsp_i] += v; } diff --git a/fluidsynth/src/fluidsynth.c b/fluidsynth/src/fluidsynth.c index d8cc512c..f87f48e2 100644 --- a/fluidsynth/src/fluidsynth.c +++ b/fluidsynth/src/fluidsynth.c @@ -18,7 +18,9 @@ * 02111-1307, USA */ +#if HAVE_CONFIG_H #include "config.h" +#endif #include #include @@ -37,10 +39,6 @@ #include "fluidsynth.h" -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - #if defined(WIN32) && !defined(MINGW32) #include "config_win32.h" #endif diff --git a/fluidsynth/winbuild/Makefile.am b/fluidsynth/winbuild/Makefile.am index 715df1ad..68e3a9bf 100644 --- a/fluidsynth/winbuild/Makefile.am +++ b/fluidsynth/winbuild/Makefile.am @@ -1,4 +1,4 @@ ## Process this file with automake to produce Makefile.in SUBDIRS = fluidsynth fluidsynth_dll fluidsynth_lib -EXTRA_DIST = fluidsynth.dsw +EXTRA_DIST = fluidsynth.dsw fluidsynth.sln diff --git a/fluidsynth/winbuild/fluidsynth.dsw b/fluidsynth/winbuild/fluidsynth.dsw index 73a637f3..7c91fa82 100644 --- a/fluidsynth/winbuild/fluidsynth.dsw +++ b/fluidsynth/winbuild/fluidsynth.dsw @@ -3,22 +3,7 @@ Microsoft Developer Studio Workspace File, Format Version 6.00 ############################################################################### -Project: "fluidsynth"=".\fluidsynth\fluidsynth.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name fluidsynth_dll - End Project Dependency -}}} - -############################################################################### - -Project: "fluidsynth_dll"=".\fluidsynth_dll\fluidsynth_dll.dsp" - Package Owner=<4> +Project: "fluidsynth"=fluidsynth\fluidsynth.dsp - Package Owner=<4> Package=<5> {{{ @@ -30,7 +15,19 @@ Package=<4> ############################################################################### -Project: "fluidsynth_lib"=".\fluidsynth_lib\fluidsynth_lib.dsp" - Package Owner=<4> +Project: "fluidsynth_dll"=fluidsynth_dll\fluidsynth_dll.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ +}}} + +############################################################################### + +Project: "fluidsynth_lib"=fluidsynth_lib\fluidsynth_lib.dsp - Package Owner=<4> Package=<5> {{{ diff --git a/fluidsynth/winbuild/fluidsynth.sln b/fluidsynth/winbuild/fluidsynth.sln new file mode 100755 index 00000000..b3f19acd --- /dev/null +++ b/fluidsynth/winbuild/fluidsynth.sln @@ -0,0 +1,38 @@ +Microsoft Visual Studio Solution File, Format Version 8.00 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fluidsynth", "fluidsynth\fluidsynth.vcproj", "{8150EAA4-CF92-448B-972A-01A423B3A23D}" + ProjectSection(ProjectDependencies) = postProject + {A52C4164-8C82-4E38-A70B-6D0E836D6644} = {A52C4164-8C82-4E38-A70B-6D0E836D6644} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fluidsynth_dll", "fluidsynth_dll\fluidsynth_dll.vcproj", "{A52C4164-8C82-4E38-A70B-6D0E836D6644}" + ProjectSection(ProjectDependencies) = postProject + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fluidsynth_lib", "fluidsynth_lib\fluidsynth_lib.vcproj", "{CD7D1A45-9970-4958-BD8F-7F42B083093C}" + ProjectSection(ProjectDependencies) = postProject + EndProjectSection +EndProject +Global + GlobalSection(SolutionConfiguration) = preSolution + Debug = Debug + Release = Release + EndGlobalSection + GlobalSection(ProjectConfiguration) = postSolution + {8150EAA4-CF92-448B-972A-01A423B3A23D}.Debug.ActiveCfg = Debug|Win32 + {8150EAA4-CF92-448B-972A-01A423B3A23D}.Debug.Build.0 = Debug|Win32 + {8150EAA4-CF92-448B-972A-01A423B3A23D}.Release.ActiveCfg = Release|Win32 + {8150EAA4-CF92-448B-972A-01A423B3A23D}.Release.Build.0 = Release|Win32 + {A52C4164-8C82-4E38-A70B-6D0E836D6644}.Debug.ActiveCfg = Debug|Win32 + {A52C4164-8C82-4E38-A70B-6D0E836D6644}.Debug.Build.0 = Debug|Win32 + {A52C4164-8C82-4E38-A70B-6D0E836D6644}.Release.ActiveCfg = Release|Win32 + {A52C4164-8C82-4E38-A70B-6D0E836D6644}.Release.Build.0 = Release|Win32 + {CD7D1A45-9970-4958-BD8F-7F42B083093C}.Debug.ActiveCfg = Debug|Win32 + {CD7D1A45-9970-4958-BD8F-7F42B083093C}.Debug.Build.0 = Debug|Win32 + {CD7D1A45-9970-4958-BD8F-7F42B083093C}.Release.ActiveCfg = Release|Win32 + {CD7D1A45-9970-4958-BD8F-7F42B083093C}.Release.Build.0 = Release|Win32 + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + EndGlobalSection + GlobalSection(ExtensibilityAddIns) = postSolution + EndGlobalSection +EndGlobal diff --git a/fluidsynth/winbuild/fluidsynth/Makefile.am b/fluidsynth/winbuild/fluidsynth/Makefile.am index 17e811a5..b13cb737 100644 --- a/fluidsynth/winbuild/fluidsynth/Makefile.am +++ b/fluidsynth/winbuild/fluidsynth/Makefile.am @@ -1,3 +1,3 @@ ## Process this file with automake to produce Makefile.in -EXTRA_DIST = fluidsynth.dsp +EXTRA_DIST = fluidsynth.dsp fluidsynth.vcproj diff --git a/fluidsynth/winbuild/fluidsynth/fluidsynth.dsp b/fluidsynth/winbuild/fluidsynth/fluidsynth.dsp index 8a16b54b..4939403d 100644 --- a/fluidsynth/winbuild/fluidsynth/fluidsynth.dsp +++ b/fluidsynth/winbuild/fluidsynth/fluidsynth.dsp @@ -17,8 +17,8 @@ CFG=fluidsynth - Win32 Debug !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE -!MESSAGE "fluidsynth - Win32 Release" (based on "Win32 (x86) Console Application") !MESSAGE "fluidsynth - Win32 Debug" (based on "Win32 (x86) Console Application") +!MESSAGE "fluidsynth - Win32 Release" (based on "Win32 (x86) Console Application") !MESSAGE # Begin Project @@ -26,65 +26,65 @@ CFG=fluidsynth - Win32 Debug # PROP Scc_ProjName "" # PROP Scc_LocalPath "" CPP=cl.exe +MTL=midl.exe RSC=rc.exe -!IF "$(CFG)" == "fluidsynth - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib dsound.lib /nologo /subsystem:console /machine:I386 /out:"../fluidsynth.exe" - -!ELSEIF "$(CFG)" == "fluidsynth - Win32 Debug" +!IF "$(CFG)" == "fluidsynth - Win32 Debug" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" +# PROP BASE Output_Dir ".\Debug" +# PROP BASE Intermediate_Dir ".\Debug" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 +# PROP Output_Dir ".\Debug" +# PROP Intermediate_Dir ".\Debug" # PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" +# ADD BASE CPP /nologo /MDd /I "..\..\include" /Zi /W3 /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /Fp".\Debug\fluidsynth.pch" /Fo".\Debug\" /Fd".\Debug\" /GZ /c +# ADD CPP /nologo /MDd /I "..\..\include" /Zi /W3 /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /Fp".\Debug\fluidsynth.pch" /Fo".\Debug\" /Fd".\Debug\" /GZ /c +# ADD BASE MTL /tlb ".\Debug/fluidsynth.tlb" /win32 +# ADD MTL /tlb ".\Debug/fluidsynth.tlb" /win32 +# ADD BASE RSC /l 1033 /d "_DEBUG" +# ADD RSC /l 1033 /d "_DEBUG" BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo +# ADD BASE BSC32 +# ADD BSC32 LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib dsound.lib winmm.lib /nologo /subsystem:console /debug /machine:I386 /out:"../fluidsynth_debug.exe" /pdbtype:sept +# ADD BASE LINK32 odbc32.lib odbccp32.lib dsound.lib winmm.lib /nologo /out:"../fluidsynth_debug.exe" /incremental:no /debug /pdb:".\Debug/fluidsynth_debug.pdb" /pdbtype:sept /subsystem:console /machine:ix86 +# ADD LINK32 odbc32.lib odbccp32.lib dsound.lib winmm.lib /nologo /out:"../fluidsynth_debug.exe" /incremental:no /debug /pdb:".\Debug/fluidsynth_debug.pdb" /pdbtype:sept /subsystem:console /machine:ix86 -!ENDIF +!ELSEIF "$(CFG)" == "fluidsynth - Win32 Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir ".\Release" +# PROP BASE Intermediate_Dir ".\Release" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir ".\Release" +# PROP Intermediate_Dir ".\Release" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /MD /I "..\..\include" /W3 /O2 /Ob1 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /GF /Gy /YX /Fo".\Release\" /Fd".\Release\" /c +# ADD CPP /nologo /MD /I "..\..\include" /W3 /O2 /Ob1 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /GF /Gy /YX /Fo".\Release\" /Fd".\Release\" /c +# ADD BASE MTL /tlb ".\Release/fluidsynth.tlb" /win32 +# ADD MTL /tlb ".\Release/fluidsynth.tlb" /win32 +# ADD BASE RSC /l 1033 /d "NDEBUG" +# ADD RSC /l 1033 /d "NDEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 +# ADD BSC32 +LINK32=link.exe +# ADD BASE LINK32 odbc32.lib odbccp32.lib dsound.lib /nologo /out:"../fluidsynth.exe" /incremental:no /pdb:".\Release/fluidsynth.pdb" /pdbtype:sept /subsystem:console /machine:ix86 +# ADD LINK32 odbc32.lib odbccp32.lib dsound.lib /nologo /out:"../fluidsynth.exe" /incremental:no /pdb:".\Release/fluidsynth.pdb" /pdbtype:sept /subsystem:console /machine:ix86 + +!ENDIF # Begin Target -# Name "fluidsynth - Win32 Release" # Name "fluidsynth - Win32 Debug" -# Begin Source File - -SOURCE=..\..\src\fluidsynth.c -# End Source File +# Name "fluidsynth - Win32 Release" # End Target # End Project + diff --git a/fluidsynth/winbuild/fluidsynth/fluidsynth.vcproj b/fluidsynth/winbuild/fluidsynth/fluidsynth.vcproj new file mode 100755 index 00000000..a83c859c --- /dev/null +++ b/fluidsynth/winbuild/fluidsynth/fluidsynth.vcproj @@ -0,0 +1,162 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/fluidsynth/winbuild/fluidsynth_dll/Makefile.am b/fluidsynth/winbuild/fluidsynth_dll/Makefile.am index 12b8e101..b581d356 100644 --- a/fluidsynth/winbuild/fluidsynth_dll/Makefile.am +++ b/fluidsynth/winbuild/fluidsynth_dll/Makefile.am @@ -1,3 +1,3 @@ ## Process this file with automake to produce Makefile.in -EXTRA_DIST = fluidsynth_dll.dsp +EXTRA_DIST = fluidsynth_dll.dsp fluidsynth_dll.vcproj diff --git a/fluidsynth/winbuild/fluidsynth_dll/fluidsynth_dll.dsp b/fluidsynth/winbuild/fluidsynth_dll/fluidsynth_dll.dsp index c4b792e6..465e4ff8 100644 --- a/fluidsynth/winbuild/fluidsynth_dll/fluidsynth_dll.dsp +++ b/fluidsynth/winbuild/fluidsynth_dll/fluidsynth_dll.dsp @@ -4,7 +4,7 @@ # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 -CFG=fluidsynth_dll - Win32 Debug +CFG=fluidsynth_dll - Win32 Release !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run !MESSAGE @@ -13,7 +13,7 @@ CFG=fluidsynth_dll - Win32 Debug !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: !MESSAGE -!MESSAGE NMAKE /f "fluidsynth_dll.mak" CFG="fluidsynth_dll - Win32 Debug" +!MESSAGE NMAKE /f "fluidsynth_dll.mak" CFG="fluidsynth_dll - Win32 Release" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE @@ -33,283 +33,58 @@ RSC=rc.exe # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" +# PROP BASE Output_Dir ".\Release" +# PROP BASE Intermediate_Dir ".\Release" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 +# PROP Output_Dir ".\Release" +# PROP Intermediate_Dir ".\Release" # PROP Target_Dir "" -# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "FLUIDSYNTH_DLL_EXPORTS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "FLUIDSYNTH_DLL_EXPORTS" /D "FLUIDSYNTH_SEQ_DLL_EXPORTS" /YX /FD /c -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" +# ADD BASE CPP /nologo /MD /I "..\..\include" /W3 /O2 /Ob1 /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_USRDLL" /D "FLUIDSYNTH_DLL_EXPORTS" /D "FLUIDSYNTH_SEQ_DLL_EXPORTS" /D "_MBCS" /GF /Gy /YX /Fo".\Release\" /Fd".\Release\" /c +# ADD CPP /nologo /MD /I "..\..\include" /W3 /O2 /Ob1 /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_USRDLL" /D "FLUIDSYNTH_DLL_EXPORTS" /D "FLUIDSYNTH_SEQ_DLL_EXPORTS" /D "_MBCS" /GF /Gy /YX /Fo".\Release\" /Fd".\Release\" /c +# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /tlb ".\Release/fluidsynth_dll.tlb" /win32 +# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /tlb ".\Release/fluidsynth_dll.tlb" /win32 +# ADD BASE RSC /l 1033 /d "NDEBUG" +# ADD RSC /l 1033 /d "NDEBUG" BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo +# ADD BASE BSC32 +# ADD BSC32 LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib dsound.lib winmm.lib /nologo /dll /machine:I386 /out:"../fluidsynth.dll" +# ADD BASE LINK32 odbc32.lib odbccp32.lib dsound.lib winmm.lib /nologo /out:"../fluidsynth.dll" /incremental:no /pdb:".\Release/fluidsynth.pdb" /pdbtype:sept /subsystem:windows /implib:".\Release/fluidsynth.lib" /machine:ix86 +# ADD LINK32 odbc32.lib odbccp32.lib dsound.lib winmm.lib /nologo /out:"../fluidsynth.dll" /incremental:no /pdb:".\Release/fluidsynth.pdb" /pdbtype:sept /subsystem:windows /implib:".\Release/fluidsynth.lib" /machine:ix86 !ELSEIF "$(CFG)" == "fluidsynth_dll - Win32 Debug" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" +# PROP BASE Output_Dir ".\Debug" +# PROP BASE Intermediate_Dir ".\Debug" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 +# PROP Output_Dir ".\Debug" +# PROP Intermediate_Dir ".\Debug" # PROP Target_Dir "" -# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "FLUIDSYNTH_DLL_EXPORTS" /YX /FD /GZ /c -# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "..\..\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "FLUIDSYNTH_DLL_EXPORTS" /D "FLUIDSYNTH_SEQ_DLL_EXPORTS" /YX /FD /GZ /c -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" +# ADD BASE CPP /nologo /MTd /I "..\..\include" /Zi /W3 /Od /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_USRDLL" /D "FLUIDSYNTH_DLL_EXPORTS" /D "FLUIDSYNTH_SEQ_DLL_EXPORTS" /D "_MBCS" /YX /Fp".\Debug\fluidsynth_dll.pch" /Fo".\Debug\" /Fd".\Debug\" /GZ /c +# ADD CPP /nologo /MTd /I "..\..\include" /Zi /W3 /Od /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_USRDLL" /D "FLUIDSYNTH_DLL_EXPORTS" /D "FLUIDSYNTH_SEQ_DLL_EXPORTS" /D "_MBCS" /YX /Fp".\Debug\fluidsynth_dll.pch" /Fo".\Debug\" /Fd".\Debug\" /GZ /c +# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /tlb ".\Debug/fluidsynth_dll.tlb" /win32 +# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /tlb ".\Debug/fluidsynth_dll.tlb" /win32 +# ADD BASE RSC /l 1033 /d "_DEBUG" +# ADD RSC /l 1033 /d "_DEBUG" BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo +# ADD BASE BSC32 +# ADD BSC32 LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib dsound.lib winmm.lib /nologo /dll /debug /machine:I386 /out:"../fluidsynth_debug.dll" /pdbtype:sept +# ADD BASE LINK32 odbc32.lib odbccp32.lib dsound.lib winmm.lib /nologo /out:"../fluidsynth_debug.dll" /incremental:no /debug /pdb:".\Debug/fluidsynth_debug.pdb" /pdbtype:sept /subsystem:windows /implib:".\Debug/fluidsynth_debug.lib" /machine:ix86 +# ADD LINK32 odbc32.lib odbccp32.lib dsound.lib winmm.lib /nologo /out:"../fluidsynth_debug.dll" /incremental:no /debug /pdb:".\Debug/fluidsynth_debug.pdb" /pdbtype:sept /subsystem:windows /implib:".\Debug/fluidsynth_debug.lib" /machine:ix86 -!ENDIF +!ENDIF # Begin Target # Name "fluidsynth_dll - Win32 Release" # Name "fluidsynth_dll - Win32 Debug" -# Begin Source File - -SOURCE=..\..\src\config_win32.h -# End Source File -# Begin Source File - -SOURCE=..\..\src\fluid_adriver.c -# End Source File -# Begin Source File - -SOURCE=..\..\src\fluid_adriver.h -# End Source File -# Begin Source File - -SOURCE=..\..\src\fluid_chan.c -# End Source File -# Begin Source File - -SOURCE=..\..\src\fluid_chan.h -# End Source File -# Begin Source File - -SOURCE=..\..\src\fluid_chorus.c -# End Source File -# Begin Source File - -SOURCE=..\..\src\fluid_chorus.h -# End Source File -# Begin Source File - -SOURCE=..\..\src\fluid_cmd.c -# End Source File -# Begin Source File - -SOURCE=..\..\src\fluid_cmd.h -# End Source File -# Begin Source File - -SOURCE=..\..\src\fluid_conv.c -# End Source File -# Begin Source File - -SOURCE=..\..\src\fluid_conv.h -# End Source File -# Begin Source File - -SOURCE=..\..\src\fluid_defsfont.c -# End Source File -# Begin Source File - -SOURCE=..\..\src\fluid_defsfont.h -# End Source File -# Begin Source File - -SOURCE=..\..\src\fluid_dll.c -# End Source File -# Begin Source File - -SOURCE=..\..\src\fluid_dsound.c -# End Source File -# Begin Source File - -SOURCE=..\..\src\fluid_event.c -# End Source File -# Begin Source File - -SOURCE=..\..\src\fluid_event_priv.h -# End Source File -# Begin Source File - -SOURCE=..\..\src\fluid_gen.c -# End Source File -# Begin Source File - -SOURCE=..\..\src\fluid_gen.h -# End Source File -# Begin Source File - -SOURCE=..\..\src\fluid_hash.c -# End Source File -# Begin Source File - -SOURCE=..\..\src\fluid_hash.h -# End Source File -# Begin Source File - -SOURCE=..\..\src\fluid_io.c -# End Source File -# Begin Source File - -SOURCE=..\..\src\fluid_io.h -# End Source File -# Begin Source File - -SOURCE=..\..\src\fluid_list.c -# End Source File -# Begin Source File - -SOURCE=..\..\src\fluid_list.h -# End Source File -# Begin Source File - -SOURCE=..\..\src\fluid_mdriver.c -# End Source File -# Begin Source File - -SOURCE=..\..\src\fluid_mdriver.h -# End Source File -# Begin Source File - -SOURCE=..\..\src\fluid_midi.c -# End Source File -# Begin Source File - -SOURCE=..\..\src\fluid_midi.h -# End Source File -# Begin Source File - -SOURCE=..\..\src\fluid_midi_router.c -# End Source File -# Begin Source File - -SOURCE=..\..\src\fluid_midi_router.h -# End Source File -# Begin Source File - -SOURCE=..\..\src\fluid_mod.c -# End Source File -# Begin Source File - -SOURCE=..\..\src\fluid_mod.h -# End Source File -# Begin Source File - -SOURCE=..\..\src\fluid_phase.h -# End Source File -# Begin Source File - -SOURCE=..\..\src\fluid_ramsfont.c -# End Source File -# Begin Source File - -SOURCE=..\..\src\fluid_ramsfont.h -# End Source File -# Begin Source File - -SOURCE=..\..\src\fluid_rev.c -# End Source File -# Begin Source File - -SOURCE=..\..\src\fluid_rev.h -# End Source File -# Begin Source File - -SOURCE=..\..\src\fluid_seq.c -# End Source File -# Begin Source File - -SOURCE=..\..\src\fluid_seqbind.c -# End Source File -# Begin Source File - -SOURCE=..\..\src\fluid_settings.c -# End Source File -# Begin Source File - -SOURCE=..\..\src\fluid_settings.h -# End Source File -# Begin Source File - -SOURCE=..\..\src\fluid_sse.h -# End Source File -# Begin Source File - -SOURCE=..\..\src\fluid_strtok.c -# End Source File -# Begin Source File - -SOURCE=..\..\src\fluid_strtok.h -# End Source File -# Begin Source File - -SOURCE=..\..\src\fluid_synth.c -# End Source File -# Begin Source File - -SOURCE=..\..\src\fluid_synth.h -# End Source File -# Begin Source File - -SOURCE=..\..\src\fluid_sys.c -# End Source File -# Begin Source File - -SOURCE=..\..\src\fluid_sys.h -# End Source File -# Begin Source File - -SOURCE=..\..\src\fluid_tuning.c -# End Source File -# Begin Source File - -SOURCE=..\..\src\fluid_tuning.h -# End Source File -# Begin Source File - -SOURCE=..\..\src\fluid_voice.c -# End Source File -# Begin Source File - -SOURCE=..\..\src\fluid_voice.h -# End Source File -# Begin Source File - -SOURCE=..\..\src\fluid_winmidi.c -# End Source File -# Begin Source File - -SOURCE=..\..\src\fluidsynth.h -# End Source File -# Begin Source File - -SOURCE=..\..\src\fluidsynth_priv.h -# End Source File # End Target # End Project + diff --git a/fluidsynth/winbuild/fluidsynth_dll/fluidsynth_dll.vcproj b/fluidsynth/winbuild/fluidsynth_dll/fluidsynth_dll.vcproj new file mode 100755 index 00000000..3bbc8aa5 --- /dev/null +++ b/fluidsynth/winbuild/fluidsynth_dll/fluidsynth_dll.vcproj @@ -0,0 +1,774 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/fluidsynth/winbuild/fluidsynth_lib/Makefile.am b/fluidsynth/winbuild/fluidsynth_lib/Makefile.am index b439e0c9..f6d25a29 100644 --- a/fluidsynth/winbuild/fluidsynth_lib/Makefile.am +++ b/fluidsynth/winbuild/fluidsynth_lib/Makefile.am @@ -1,3 +1,3 @@ ## Process this file with automake to produce Makefile.in -EXTRA_DIST = fluidsynth_lib.dsp +EXTRA_DIST = fluidsynth_lib.dsp fluidsynth_lib.vcproj diff --git a/fluidsynth/winbuild/fluidsynth_lib/fluidsynth_lib.dsp b/fluidsynth/winbuild/fluidsynth_lib/fluidsynth_lib.dsp index 956a4925..a6b97905 100644 --- a/fluidsynth/winbuild/fluidsynth_lib/fluidsynth_lib.dsp +++ b/fluidsynth/winbuild/fluidsynth_lib/fluidsynth_lib.dsp @@ -4,7 +4,7 @@ # TARGTYPE "Win32 (x86) Static Library" 0x0104 -CFG=fluidsynth_lib - Win32 Debug +CFG=fluidsynth_lib - Win32 Release !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run !MESSAGE @@ -13,7 +13,7 @@ CFG=fluidsynth_lib - Win32 Debug !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: !MESSAGE -!MESSAGE NMAKE /f "fluidsynth_lib.mak" CFG="fluidsynth_lib - Win32 Debug" +!MESSAGE NMAKE /f "fluidsynth_lib.mak" CFG="fluidsynth_lib - Win32 Release" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE @@ -26,279 +26,65 @@ CFG=fluidsynth_lib - Win32 Debug # PROP Scc_ProjName "" # PROP Scc_LocalPath "" CPP=cl.exe +MTL=midl.exe RSC=rc.exe !IF "$(CFG)" == "fluidsynth_lib - Win32 Release" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" +# PROP BASE Output_Dir ".\Release" +# PROP BASE Intermediate_Dir ".\Release" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" +# PROP Output_Dir ".\Release" +# PROP Intermediate_Dir ".\Release" # PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\include" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "FLUIDSYNTH_NOT_A_DLL" /YX /FD /c -# ADD BASE RSC /l 0x40c /d "NDEBUG" -# ADD RSC /l 0x40c /d "NDEBUG" +# ADD BASE CPP /nologo /MD /I "..\..\include" /W3 /O2 /Ob1 /D "NDEBUG" /D "WIN32" /D "_LIB" /D "FLUIDSYNTH_NOT_A_DLL" /D "_MBCS" /GF /Gy /YX /Fo".\Release\" /Fd".\Release\" /c +# ADD CPP /nologo /MD /I "..\..\include" /W3 /O2 /Ob1 /D "NDEBUG" /D "WIN32" /D "_LIB" /D "FLUIDSYNTH_NOT_A_DLL" /D "_MBCS" /GF /Gy /YX /Fo".\Release\" /Fd".\Release\" /c +# ADD BASE MTL /win32 +# ADD MTL /win32 +# ADD BASE RSC /l 1036 /d "NDEBUG" +# ADD RSC /l 1036 /d "NDEBUG" BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo +# ADD BASE BSC32 +# ADD BSC32 LIB32=link.exe -lib -# ADD BASE LIB32 /nologo -# ADD LIB32 /nologo /out:"..\fluidsynth_lib.lib" +# ADD BASE LIB32 /nologo /out:"..\fluidsynth_lib.lib" +# ADD LIB32 /nologo /out:"..\fluidsynth_lib.lib" !ELSEIF "$(CFG)" == "fluidsynth_lib - Win32 Debug" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" +# PROP BASE Output_Dir ".\Debug" +# PROP BASE Intermediate_Dir ".\Debug" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" +# PROP Output_Dir ".\Debug" +# PROP Intermediate_Dir ".\Debug" # PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\include" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "FLUIDSYNTH_NOT_A_DLL" /YX /FD /GZ /c -# ADD BASE RSC /l 0x40c /d "_DEBUG" -# ADD RSC /l 0x40c /d "_DEBUG" +# ADD BASE CPP /nologo /MDd /I "..\..\include" /Zi /W3 /Od /D "_DEBUG" /D "WIN32" /D "_LIB" /D "FLUIDSYNTH_NOT_A_DLL" /D "_MBCS" /YX /Fp".\Debug\fluidsynth_lib.pch" /Fo".\Debug\" /Fd".\Debug\" /GZ /c +# ADD CPP /nologo /MDd /I "..\..\include" /Zi /W3 /Od /D "_DEBUG" /D "WIN32" /D "_LIB" /D "FLUIDSYNTH_NOT_A_DLL" /D "_MBCS" /YX /Fp".\Debug\fluidsynth_lib.pch" /Fo".\Debug\" /Fd".\Debug\" /GZ /c +# ADD BASE MTL /win32 +# ADD MTL /win32 +# ADD BASE RSC /l 1036 /d "_DEBUG" +# ADD RSC /l 1036 /d "_DEBUG" BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo +# ADD BASE BSC32 +# ADD BSC32 LIB32=link.exe -lib -# ADD BASE LIB32 /nologo -# ADD LIB32 /nologo /out:"..\fluidsynth_lib_debug.lib" +# ADD BASE LIB32 /nologo /out:"..\fluidsynth_lib_debug.lib" +# ADD LIB32 /nologo /out:"..\fluidsynth_lib_debug.lib" -!ENDIF +!ENDIF # Begin Target # Name "fluidsynth_lib - Win32 Release" # Name "fluidsynth_lib - Win32 Debug" -# Begin Source File - -SOURCE=..\..\src\config_win32.h -# End Source File -# Begin Source File - -SOURCE=..\..\src\fluid_adriver.c -# End Source File -# Begin Source File - -SOURCE=..\..\src\fluid_adriver.h -# End Source File -# Begin Source File - -SOURCE=..\..\src\fluid_chan.c -# End Source File -# Begin Source File - -SOURCE=..\..\src\fluid_chan.h -# End Source File -# Begin Source File - -SOURCE=..\..\src\fluid_chorus.c -# End Source File -# Begin Source File - -SOURCE=..\..\src\fluid_chorus.h -# End Source File -# Begin Source File - -SOURCE=..\..\src\fluid_cmd.c -# End Source File -# Begin Source File - -SOURCE=..\..\src\fluid_cmd.h -# End Source File -# Begin Source File - -SOURCE=..\..\src\fluid_conv.c -# End Source File -# Begin Source File - -SOURCE=..\..\src\fluid_conv.h -# End Source File -# Begin Source File - -SOURCE=..\..\src\fluid_defsfont.c -# End Source File -# Begin Source File - -SOURCE=..\..\src\fluid_defsfont.h -# End Source File -# Begin Source File - -SOURCE=..\..\src\fluid_dll.c -# End Source File -# Begin Source File - -SOURCE=..\..\src\fluid_dsound.c -# End Source File -# Begin Source File - -SOURCE=..\..\src\fluid_event.c -# End Source File -# Begin Source File - -SOURCE=..\..\src\fluid_event_priv.h -# End Source File -# Begin Source File - -SOURCE=..\..\src\fluid_gen.c -# End Source File -# Begin Source File - -SOURCE=..\..\src\fluid_gen.h -# End Source File -# Begin Source File - -SOURCE=..\..\src\fluid_hash.c -# End Source File -# Begin Source File - -SOURCE=..\..\src\fluid_hash.h -# End Source File -# Begin Source File - -SOURCE=..\..\src\fluid_io.c -# End Source File -# Begin Source File - -SOURCE=..\..\src\fluid_io.h -# End Source File -# Begin Source File - -SOURCE=..\..\src\fluid_list.c -# End Source File -# Begin Source File - -SOURCE=..\..\src\fluid_list.h -# End Source File -# Begin Source File - -SOURCE=..\..\src\fluid_mdriver.c -# End Source File -# Begin Source File - -SOURCE=..\..\src\fluid_mdriver.h -# End Source File -# Begin Source File - -SOURCE=..\..\src\fluid_midi.c -# End Source File -# Begin Source File - -SOURCE=..\..\src\fluid_midi.h -# End Source File -# Begin Source File - -SOURCE=..\..\src\fluid_midi_router.c -# End Source File -# Begin Source File - -SOURCE=..\..\src\fluid_midi_router.h -# End Source File -# Begin Source File - -SOURCE=..\..\src\fluid_mod.c -# End Source File -# Begin Source File - -SOURCE=..\..\src\fluid_mod.h -# End Source File -# Begin Source File - -SOURCE=..\..\src\fluid_phase.h -# End Source File -# Begin Source File - -SOURCE=..\..\src\fluid_ramsfont.c -# End Source File -# Begin Source File - -SOURCE=..\..\src\fluid_ramsfont.h -# End Source File -# Begin Source File - -SOURCE=..\..\src\fluid_rev.c -# End Source File -# Begin Source File - -SOURCE=..\..\src\fluid_rev.h -# End Source File -# Begin Source File - -SOURCE=..\..\src\fluid_seq.c -# End Source File -# Begin Source File - -SOURCE=..\..\src\fluid_seqbind.c -# End Source File -# Begin Source File - -SOURCE=..\..\src\fluid_settings.c -# End Source File -# Begin Source File - -SOURCE=..\..\src\fluid_settings.h -# End Source File -# Begin Source File - -SOURCE=..\..\src\fluid_strtok.c -# End Source File -# Begin Source File - -SOURCE=..\..\src\fluid_strtok.h -# End Source File -# Begin Source File - -SOURCE=..\..\src\fluid_synth.c -# End Source File -# Begin Source File - -SOURCE=..\..\src\fluid_synth.h -# End Source File -# Begin Source File - -SOURCE=..\..\src\fluid_sys.c -# End Source File -# Begin Source File - -SOURCE=..\..\src\fluid_sys.h -# End Source File -# Begin Source File - -SOURCE=..\..\src\fluid_tuning.c -# End Source File -# Begin Source File - -SOURCE=..\..\src\fluid_tuning.h -# End Source File -# Begin Source File - -SOURCE=..\..\src\fluid_voice.c -# End Source File -# Begin Source File - -SOURCE=..\..\src\fluid_voice.h -# End Source File -# Begin Source File - -SOURCE=..\..\src\fluid_winmidi.c -# End Source File -# Begin Source File - -SOURCE=..\..\include\fluidsynth.h -# End Source File -# Begin Source File - -SOURCE=..\..\src\fluidsynth_priv.h -# End Source File # End Target # End Project + diff --git a/fluidsynth/winbuild/fluidsynth_lib/fluidsynth_lib.vcproj b/fluidsynth/winbuild/fluidsynth_lib/fluidsynth_lib.vcproj new file mode 100755 index 00000000..589abe97 --- /dev/null +++ b/fluidsynth/winbuild/fluidsynth_lib/fluidsynth_lib.vcproj @@ -0,0 +1,747 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +