diff --git a/libs/broadvoice/src/Makefile.am b/libs/broadvoice/src/Makefile.am
index e3d0a53d6c..ba9b1f58af 100644
--- a/libs/broadvoice/src/Makefile.am
+++ b/libs/broadvoice/src/Makefile.am
@@ -125,17 +125,19 @@ $(DSP): msvc/msvcproj.head msvc/msvcproj.foot Makefile.am
@(cp $(srcdir)/msvc/msvcproj.head $(DSP); \
echo "# Begin Group \"Source Files\"" $(DSPOUT); \
for file in $(WIN32SOURCES); do \
+ myfile=`echo $$file | sed -e 's|/|\\\\|g'`; \
echo "# Begin Source File" $(DSPOUT); \
echo "" $(DSPOUT); \
- echo "SOURCE=.\\"$$file $(DSPOUT); \
+ echo "SOURCE=.\\"$$myfile $(DSPOUT); \
echo "# End Source File" $(DSPOUT); \
done; \
echo "# End Group" $(DSPOUT); \
echo "# Begin Group \"Header Files\"" $(DSPOUT); \
for file in $(WIN32HEADERS); do \
+ myfile=`echo $$file | sed -e 's|/|\\\\|g'`; \
echo "# Begin Source File" $(DSPOUT); \
echo "" $(DSPOUT); \
- echo "SOURCE=.\\"$$file $(DSPOUT); \
+ echo "SOURCE=.\\"$$myfile $(DSPOUT); \
echo "# End Source File" $(DSPOUT); \
done; \
echo "# End Group" $(DSPOUT); \
@@ -145,11 +147,13 @@ $(VCPROJ): msvc/vc8proj.head msvc/vc8proj.foot Makefile.am
echo "creating $(VCPROJ)"
@(cp $(srcdir)/msvc/vc8proj.head $(VCPROJ); \
for file in $(WIN32SOURCES); do \
- echo "" $(VCPROJOUT); \
+ myfile=`echo $$file | sed -e 's|/|\\\\|g'`; \
+ echo "" $(VCPROJOUT); \
done; \
echo "" $(VCPROJOUT); \
for file in $(WIN32HEADERS); do \
- echo "" $(VCPROJOUT); \
+ myfile=`echo $$file | sed -e 's|/|\\\\|g'`; \
+ echo "" $(VCPROJOUT); \
done; \
cat $(srcdir)/msvc/vc8proj.foot $(VCPROJOUT) )
diff --git a/libs/broadvoice/src/broadvoice.dsp b/libs/broadvoice/src/broadvoice.dsp
index 98ec47de3c..cff9477932 100644
--- a/libs/broadvoice/src/broadvoice.dsp
+++ b/libs/broadvoice/src/broadvoice.dsp
@@ -93,21 +93,197 @@ LINK32=link.exe
# Begin Group "Source Files"
# Begin Source File
-SOURCE=.\msvc/gettimeofday.c
+SOURCE=.\bitstream.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\floating\common\a2lsp.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\floating\common\allpole.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\floating\common\allzero.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\floating\common\autocor.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\floating\common\cmtables.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\floating\common\levdur.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\floating\common\lsp2a.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\floating\common\stblchck.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\floating\common\stblzlsp.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\floating\common\utility.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\bitpack16.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\floating\bv16\bv16decoder.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\floating\bv16\bv16encoder.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\floating\bv16\bv16coarse_pitch.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\floating\bv16\bv16excdec.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\floating\bv16\bv16excquan.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\floating\bv16\bv16fine_pitch.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\floating\bv16\bv16gaindec.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\floating\bv16\bv16gainquan.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\floating\bv16\bv16levelest.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\floating\bv16\bv16lspdec.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\floating\bv16\bv16lspquan.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\floating\bv16\bv16plc.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\floating\bv16\bv16ptdec.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\floating\bv16\bv16postfilter.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\floating\bv16\bv16ptquan.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\floating\bv16\bv16tables.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\bitpack32.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\floating\bv32\bv32decoder.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\floating\bv32\bv32encoder.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\floating\bv32\bv32coarse_pitch.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\floating\bv32\bv32excdec.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\floating\bv32\bv32excquan.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\floating\bv32\bv32fine_pitch.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\floating\bv32\bv32gaindec.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\floating\bv32\bv32gainquan.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\floating\bv32\bv32levelest.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\floating\bv32\bv32lspdec.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\floating\bv32\bv32lspquan.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\floating\bv32\bv32plc.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\floating\bv32\bv32ptdec.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\floating\bv32\bv32ptquan.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\floating\bv32\bv32tables.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\msvc\gettimeofday.c
# End Source File
# End Group
# Begin Group "Header Files"
# Begin Source File
-SOURCE=.\broadvoice/broadvoice.h
+SOURCE=.\broadvoice\broadvoice.h
# End Source File
# Begin Source File
-SOURCE=.\broadvoice/version.h
+SOURCE=.\broadvoice\version.h
# End Source File
# Begin Source File
-SOURCE=.\broadvoice/private/broadvoice.h
+SOURCE=.\broadvoice\private\broadvoice.h
# End Source File
# Begin Source File
diff --git a/libs/broadvoice/src/broadvoice.vcproj b/libs/broadvoice/src/broadvoice.vcproj
index 2db7989e9c..ba7b661a74 100644
--- a/libs/broadvoice/src/broadvoice.vcproj
+++ b/libs/broadvoice/src/broadvoice.vcproj
@@ -1,246 +1,231 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+