changes for MSCV: added dsp file, rename any .cc files to .cpp

diff --git a/src/flac/Makefile.am b/src/flac/Makefile.am
index 9ea85cc..024df44 100644 (file)
--- a/src/flac/Makefile.am
+++ b/src/flac/Makefile.am
@@ -16,7 +16,7 @@
 #  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 bin_PROGRAMS = flac
-CFLAGS = @CFLAGS@  @OGG_CFLAGS@ 
+CFLAGS = @CFLAGS@ @OGG_CFLAGS@
 
 if FLaC__HAS_OGG
 NEED_OGGFLAC_LIB = $(top_builddir)/src/libOggFLAC/libOggFLAC.la
@@ -24,7 +24,8 @@ endif
 
 EXTRA_DIST = \
        Makefile.lite \
-       Makefile.vc
+       Makefile.vc \
+       flac.dsp
 
 flac_SOURCES = \
        analyze.c \
@@ -39,4 +40,4 @@ flac_SOURCES = \
        file.h \
        vorbiscomment.h
 
-flac_LDADD = $(NEED_OGGFLAC_LIB) $(top_builddir)/src/libFLAC/libFLAC.la @ OGG_LIBS@  @ SHARE_LIBS@  @ LIBICONV@  -lm
+flac_LDADD = $(NEED_OGGFLAC_LIB) $(top_builddir)/src/libFLAC/libFLAC.la @OGG_LIBS@ @SHARE_LIBS@ @LIBICONV@ -lm

diff --git a/src/libFLAC++/Makefile.am b/src/libFLAC++/Makefile.am
index 38f3f78..80a8789 100644 (file)
--- a/src/libFLAC++/Makefile.am
+++ b/src/libFLAC++/Makefile.am
@@ -25,16 +25,17 @@ m4data_DATA = libFLAC++.m4
 EXTRA_DIST = \
        Makefile.lite \
        Makefile.vc \
+       libFLAC++.dsp \
        libFLAC++.m4
 
 # see 'http://www.gnu.org/software/libtool/manual.html#Versioning' for numbering convention
 libFLAC___la_LDFLAGS = -version-info 2:1:0
 
 libFLAC___la_SOURCES = \
-       file_decoder.cc \
-       file_encoder.cc \
-       metadata.cc \
-       seekable_stream_decoder.cc \
-       seekable_stream_encoder.cc \
-       stream_decoder.cc \
-       stream_encoder.cc
+       file_decoder.cpp \
+       file_encoder.cpp \
+       metadata.cpp \
+       seekable_stream_decoder.cpp \
+       seekable_stream_encoder.cpp \
+       stream_decoder.cpp \
+       stream_encoder.cpp

diff --git a/src/libFLAC/Makefile.am b/src/libFLAC/Makefile.am
index 9cf1eb0..11ce679 100644 (file)
--- a/src/libFLAC/Makefile.am
+++ b/src/libFLAC/Makefile.am
@@ -20,7 +20,7 @@ lib_LTLIBRARIES = libFLAC.la
 if DEBUG
 DEBUGCFLAGS = -DFLAC__OVERFLOW_DETECT
 endif
-CFLAGS = @CFLAGS@  $(DEBUGCFLAGS)
+CFLAGS = @CFLAGS@ $(DEBUGCFLAGS)
 
 if FLaC__NO_ASM
 else
@@ -40,6 +40,7 @@ m4data_DATA = libFLAC.m4
 EXTRA_DIST = \
        Makefile.lite \
        Makefile.vc \
+       libFLAC.dsp \
        libFLAC.m4
 
 # see 'http://www.gnu.org/software/libtool/manual.html#Versioning' for numbering convention

diff --git a/src/libOggFLAC++/Makefile.am b/src/libOggFLAC++/Makefile.am
index ccad9ba..4be26db 100644 (file)
--- a/src/libOggFLAC++/Makefile.am
+++ b/src/libOggFLAC++/Makefile.am
@@ -25,11 +25,12 @@ m4data_DATA = libOggFLAC++.m4
 EXTRA_DIST = \
        Makefile.lite \
        Makefile.vc \
+       libOggFLAC++.dsp \
        libOggFLAC++.m4
 
 # see 'http://www.gnu.org/software/libtool/manual.html#Versioning' for numbering convention
 libOggFLAC___la_LDFLAGS = -version-info 0:1:0
 
 libOggFLAC___la_SOURCES = \
-       stream_decoder.cc \
-       stream_encoder.cc
+       stream_decoder.cpp \
+       stream_encoder.cpp

diff --git a/src/libOggFLAC/Makefile.am b/src/libOggFLAC/Makefile.am
index bc58bad..9a88c75 100644 (file)
--- a/src/libOggFLAC/Makefile.am
+++ b/src/libOggFLAC/Makefile.am
@@ -20,7 +20,7 @@ lib_LTLIBRARIES = libOggFLAC.la
 if DEBUG
 DEBUGCFLAGS = 
 endif
-CFLAGS = @CFLAGS@  $(DEBUGCFLAGS)
+CFLAGS = @CFLAGS@ $(DEBUGCFLAGS)
 
 SUBDIRS = include .
 
@@ -30,6 +30,7 @@ m4data_DATA = libOggFLAC.m4
 EXTRA_DIST = \
        Makefile.lite \
        Makefile.vc \
+       libOggFLAC.dsp \
        libOggFLAC.m4
 
 # see 'http://www.gnu.org/software/libtool/manual.html#Versioning' for numbering convention

diff --git a/src/metaflac/Makefile.am b/src/metaflac/Makefile.am
index bde4133..8837e77 100644 (file)
--- a/src/metaflac/Makefile.am
+++ b/src/metaflac/Makefile.am
@@ -16,14 +16,15 @@
 #  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 bin_PROGRAMS = metaflac
-CFLAGS = @CFLAGS@ 
+CFLAGS = @CFLAGS@
 
 EXTRA_DIST = \
        Makefile.lite \
-       Makefile.vc
+       Makefile.vc \
+       metaflac.dsp
 
 metaflac_SOURCES = \
        main.c
 metaflac_LDFLAGS = 
 
-metaflac_LDADD = $(top_builddir)/src/libFLAC/libFLAC.la @ SHARE_LIBS@  @ LIBICONV@  -lm
+metaflac_LDADD = $(top_builddir)/src/libFLAC/libFLAC.la @SHARE_LIBS@ @LIBICONV@ -lm

diff --git a/src/plugin_common/Makefile.am b/src/plugin_common/Makefile.am
index 272196b..64f3675 100644 (file)
--- a/src/plugin_common/Makefile.am
+++ b/src/plugin_common/Makefile.am
@@ -27,7 +27,8 @@ libplugin_common_a_SOURCES = \
 EXTRA_DIST = \
        Makefile.lite \
        Makefile.vc \
-       README
+       README \
+       plugin_common.dsp
 
 debug:
        $(MAKE) all CFLAGS="@DEBUG@"

diff --git a/src/plugin_xmms/Makefile.am b/src/plugin_xmms/Makefile.am
index c95afe4..45abb83 100644 (file)
--- a/src/plugin_xmms/Makefile.am
+++ b/src/plugin_xmms/Makefile.am
@@ -27,9 +27,9 @@ noinst_HEADERS = \
        configure.h \
        wrap_id3.h
 
-CFLAGS = @CFLAGS@  @ ID3LIB_CFLAGS@  @ XMMS_CFLAGS@ 
+CFLAGS = @CFLAGS@ @ID3LIB_CFLAGS@ @XMMS_CFLAGS@
 INCLUDES = -I$(top_srcdir)/src
-xmmsinputplugindir = @ XMMS_INPUT_PLUGIN_DIR@ 
+xmmsinputplugindir = @XMMS_INPUT_PLUGIN_DIR@
 
 # Don't build a static library
 LIBTOOL = $(top_builddir)/libtool-disable-static
@@ -52,5 +52,5 @@ endif
 # for fix info see:
 #   http://lists.freshrpms.net/pipermail/rpm-list/2002-April/000746.html
 # the workaround is the extra '-L$(top_builddir)/src/libFLAC/.libs'
-libxmms_flac_la_LIBADD = $(top_builddir)/src/plugin_common/libplugin_common.a $(top_builddir)/src/libFLAC/libFLAC.la -L$(top_builddir)/src/libFLAC/.libs @ XMMS_LIBS@  @ ID3LIB_LIBS@ 
+libxmms_flac_la_LIBADD = $(top_builddir)/src/plugin_common/libplugin_common.a $(top_builddir)/src/libFLAC/libFLAC.la -L$(top_builddir)/src/libFLAC/.libs @XMMS_LIBS@ @ID3LIB_LIBS@
 libxmms_flac_la_LDFLAGS = -module -avoid-version

diff --git a/src/share/Makefile.am b/src/share/Makefile.am
index 1fafc9c..23890cc 100644 (file)
--- a/src/share/Makefile.am
+++ b/src/share/Makefile.am
@@ -17,7 +17,9 @@ EXTRA_DIST = \
        charmaps.h \
        makemap.c \
        charset_test.c \
-       charsetmap.h
+       charsetmap.h \
+       getopt.dsp \
+       utf8.dsp
 
 debug:
        $(MAKE) all CFLAGS="@DEBUG@"

diff --git a/src/test_libFLAC++/Makefile.am b/src/test_libFLAC++/Makefile.am
index 95ae79d..9e16525 100644 (file)
--- a/src/test_libFLAC++/Makefile.am
+++ b/src/test_libFLAC++/Makefile.am
@@ -15,23 +15,24 @@
 #  along with this program; if not, write to the Free Software
 #  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-CFLAGS = @CFLAGS@ 
+CFLAGS = @CFLAGS@
 
 EXTRA_DIST = \
        Makefile.lite \
        Makefile.vc \
-       README
+       README \
+       test_libFLAC++.dsp
 
 noinst_PROGRAMS = test_libFLAC++
 test_libFLAC___LDADD = $(top_builddir)/src/libFLAC++/libFLAC++.la $(top_builddir)/src/libFLAC/libFLAC.la -lm
 test_libFLAC___SOURCES = \
-       decoders.cc \
-       encoders.cc \
+       decoders.cpp \
+       encoders.cpp \
        file_utils.c \
-       main.cc \
-       metadata.cc \
-       metadata_manip.cc \
-       metadata_object.cc \
+       main.cpp \
+       metadata.cpp \
+       metadata_manip.cpp \
+       metadata_object.cpp \
        decoders.h \
        encoders.h \
        file_utils.h \

diff --git a/src/test_libFLAC/Makefile.am b/src/test_libFLAC/Makefile.am
index 563062b..f4fa20a 100644 (file)
--- a/src/test_libFLAC/Makefile.am
+++ b/src/test_libFLAC/Makefile.am
@@ -17,9 +17,10 @@
 
 EXTRA_DIST = \
        Makefile.lite \
-       Makefile.vc
+       Makefile.vc \
+       test_libFLAC.dsp
 
-CFLAGS = @CFLAGS@ 
+CFLAGS = @CFLAGS@
 INCLUDES = -I$(top_srcdir)/src/libFLAC/include
 
 noinst_PROGRAMS = test_libFLAC

diff --git a/src/test_libOggFLAC++/Makefile.am b/src/test_libOggFLAC++/Makefile.am
index f66639b..d819118 100644 (file)
--- a/src/test_libOggFLAC++/Makefile.am
+++ b/src/test_libOggFLAC++/Makefile.am
@@ -18,17 +18,18 @@
 EXTRA_DIST = \
        Makefile.lite \
        Makefile.vc \
-       README
+       README \
+       test_libOggFLAC++.dsp
 
-CFLAGS = @CFLAGS@  @OGG_CFLAGS@ 
+CFLAGS = @CFLAGS@ @OGG_CFLAGS@
 
 noinst_PROGRAMS = test_libOggFLAC++
-test_libOggFLAC___LDADD = $(top_builddir)/src/libOggFLAC++/libOggFLAC++.la $(top_builddir)/src/libOggFLAC/libOggFLAC.la $(top_builddir)/src/libFLAC/libFLAC.la @ OGG_LIBS@  -lm
+test_libOggFLAC___LDADD = $(top_builddir)/src/libOggFLAC++/libOggFLAC++.la $(top_builddir)/src/libOggFLAC/libOggFLAC.la $(top_builddir)/src/libFLAC/libFLAC.la @OGG_LIBS@ -lm
 test_libOggFLAC___SOURCES = \
-       decoders.cc \
-       encoders.cc \
+       decoders.cpp \
+       encoders.cpp \
        file_utils.c \
-       main.cc \
+       main.cpp \
        decoders.h \
        encoders.h \
        file_utils.h

diff --git a/src/test_libOggFLAC/Makefile.am b/src/test_libOggFLAC/Makefile.am
index 7a6ec56..1e5b41a 100644 (file)
--- a/src/test_libOggFLAC/Makefile.am
+++ b/src/test_libOggFLAC/Makefile.am
@@ -17,13 +17,14 @@
 
 EXTRA_DIST = \
        Makefile.lite \
-       Makefile.vc
+       Makefile.vc \
+       test_libOggFLAC.dsp
 
-CFLAGS = @CFLAGS@  @OGG_CFLAGS@ 
+CFLAGS = @CFLAGS@ @OGG_CFLAGS@
 INCLUDES = 
 
 noinst_PROGRAMS = test_libOggFLAC
-test_libOggFLAC_LDADD = $(top_builddir)/src/libOggFLAC/libOggFLAC.la $(top_builddir)/src/libFLAC/libFLAC.la @ OGG_LIBS@  -lm
+test_libOggFLAC_LDADD = $(top_builddir)/src/libOggFLAC/libOggFLAC.la $(top_builddir)/src/libFLAC/libFLAC.la @OGG_LIBS@ -lm
 test_libOggFLAC_SOURCES = \
        decoders.c \
        encoders.c \

diff --git a/src/test_streams/Makefile.am b/src/test_streams/Makefile.am
index acc8da0..1f97594 100644 (file)
--- a/src/test_streams/Makefile.am
+++ b/src/test_streams/Makefile.am
@@ -17,9 +17,10 @@
 
 EXTRA_DIST = \
        Makefile.lite \
-       Makefile.vc
+       Makefile.vc \
+       test_streams.dsp
 
-CFLAGS = @CFLAGS@ 
+CFLAGS = @CFLAGS@
 
 noinst_PROGRAMS = test_streams
 test_streams_SOURCES = \