Concerning compilaton with vcc or bcc in Msys or cygwin environment.

some fix  for bcc.

Edited files:
   configure configure.in timidity/Makefile.am
   timidity/flac_a.c

Modified Files:
   configure configure.in timidity/Makefile.am
   timidity/Makefile.in timidity/flac_a.c

diff --git a/configure b/configure
index 2d9b244..64788f0 100755 (executable)
--- a/configure
+++ b/configure
@@ -18293,6 +18293,7 @@ _ACEOF
     else
          BORLANDC_START='C0W32.OBJ'
       CFLAGS="$CFLAGS -tW"
+      lib_w32gui_opt="-aa $lib_w32gui_opt"
     fi
   else
        lib_w32gui_opt='-lgdi32 -lcomctl32 -lcomdlg32 -lole32'
@@ -18360,6 +18361,7 @@ _ACEOF
        else
          BORLANDC_START='C0W32.OBJ'
          CFLAGS="$CFLAGS -tW"
+         lib_w32gui_opt="-aa $lib_w32gui_opt"
        fi
   else
     lib_w32gui_opt='-lgdi32 -lcomctl32 -lcomdlg32 -lole32'

diff --git a/configure.in b/configure.in
index e3f889f..df98631 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1730,6 +1730,7 @@ CONFIG_INTERFACE(winsyng,W32G_SYN,W,
     else
          BORLANDC_START='C0W32.OBJ'
       CFLAGS="$CFLAGS -tW"
+      lib_w32gui_opt="-aa $lib_w32gui_opt"
     fi
   else
        lib_w32gui_opt='-lgdi32 -lcomctl32 -lcomdlg32 -lole32'
@@ -1756,6 +1757,7 @@ CONFIG_INTERFACE(w32gui, W32GUI, w,
        else
          BORLANDC_START='C0W32.OBJ'
          CFLAGS="$CFLAGS -tW"
+         lib_w32gui_opt="-aa $lib_w32gui_opt"
        fi
   else
     lib_w32gui_opt='-lgdi32 -lcomctl32 -lcomdlg32 -lole32'

diff --git a/timidity/Makefile.am b/timidity/Makefile.am
index f1f9648..d60deb8 100644 (file)
--- a/timidity/Makefile.am
+++ b/timidity/Makefile.am
@@ -218,9 +218,6 @@ BORLANDC_LINK_OPTIONS = \
       -L..\\libunimod \
       -L..\\utils
 timidity_dep = $(SYSEXTRAS:.c=.$(OBJEXT)) \
-      $(top_builddir)/interface/interface.lib \
-      $(top_builddir)/libarc/arc.lib \
-timidity_dep = $(SYSEXTRAS:.c=.$(OBJEXT)) \
        $(top_builddir)/interface/interface.lib \
        $(top_builddir)/libarc/arc.lib \
        $(top_builddir)/libunimod/unimod.lib \

diff --git a/timidity/Makefile.in b/timidity/Makefile.in
index 51b0886..02eb56a 100644 (file)
--- a/timidity/Makefile.in
+++ b/timidity/Makefile.in
@@ -505,9 +505,6 @@ calcnewt_SOURCES = calcnewt.c
 @VCPP_TRUE@    $(W32GUI_RES)
 
 @BORLANDC_TRUE@@VCPP_FALSE@timidity_dep = $(SYSEXTRAS:.c=.$(OBJEXT)) \
-@BORLANDC_TRUE@@VCPP_FALSE@      $(top_builddir)/interface/interface.lib \
-@BORLANDC_TRUE@@VCPP_FALSE@      $(top_builddir)/libarc/arc.lib \
-@BORLANDC_TRUE@@VCPP_FALSE@timidity_dep = $(SYSEXTRAS:.c=.$(OBJEXT)) \
 @BORLANDC_TRUE@@VCPP_FALSE@    $(top_builddir)/interface/interface.lib \
 @BORLANDC_TRUE@@VCPP_FALSE@    $(top_builddir)/libarc/arc.lib \
 @BORLANDC_TRUE@@VCPP_FALSE@    $(top_builddir)/libunimod/unimod.lib \

diff --git a/timidity/flac_a.c b/timidity/flac_a.c
index 9d7f9b8..698fd29 100644 (file)
--- a/timidity/flac_a.c
+++ b/timidity/flac_a.c
@@ -476,7 +476,9 @@ static int flac_output_open(const char *fname, const char *comment)
 
     /* set callback */
 /*    FLAC__seekable_stream_encoder_set_metadata_callback(ctx->encoder.flac.s_stream, flac_seekable_stream_encoder_metadata_callback); /* */
+#ifndef __BORLANDC__
     FLAC__stream_encoder_set_metadata_callback(ctx->encoder.flac.s_stream, flac_seekable_stream_encoder_metadata_callback); /* */
+#endif
     FLAC__seekable_stream_encoder_set_write_callback(ctx->encoder.flac.s_stream, flac_seekable_stream_encoder_write_callback);
 
     ctx->state.s_flac = FLAC__seekable_stream_encoder_init(ctx->encoder.flac.s_stream);