diff --git a/libs/spandsp/src/Makefile.am b/libs/spandsp/src/Makefile.am
index 9f60205f07..46347fe00a 100644
--- a/libs/spandsp/src/Makefile.am
+++ b/libs/spandsp/src/Makefile.am
@@ -44,7 +44,7 @@ EXTRA_DIST = floating_fudge.h \
libspandsp.2005.vcproj \
libspandsp.2008.vcproj \
libspandsp.2010.vcproj \
- libspandsp.2012.vcproj \
+ libspandsp.2012.vcxproj \
libtiff.2005.vcproj \
libtiff.2008.vcproj \
filter_tools.c \
@@ -74,6 +74,10 @@ EXTRA_DIST = floating_fudge.h \
msvc/vc8proj.head \
msvc/vc9proj.foot \
msvc/vc9proj.head \
+ msvc/vc10proj.foot \
+ msvc/vc10proj.head \
+ msvc/vc12proj.foot \
+ msvc/vc12proj.head \
msvc/sys/time.h \
spandsp/private/README \
spandsp/version.h.in
@@ -364,13 +368,13 @@ noinst_HEADERS = cielab_luts.h \
v29tx_constellation_maps.h
make_at_dictionary$(EXEEXT): $(top_srcdir)/src/make_at_dictionary.c
- $(CC_FOR_BUILD) -o make_at_dictionary$(EXEEXT) $(top_srcdir)/src/make_at_dictionary.c -DHAVE_CONFIG_H -I$(top_builddir)/src
+ $(CC_FOR_BUILD) -o make_at_dictionary$(EXEEXT) $(top_srcdir)/src/make_at_dictionary.c -DHAVE_CONFIG_H -I$(top_builddir)/src
make_cielab_luts$(EXEEXT): $(top_srcdir)/src/make_cielab_luts.c
$(CC_FOR_BUILD) -o make_cielab_luts$(EXEEXT) $(top_srcdir)/src/make_cielab_luts.c -DHAVE_CONFIG_H -I$(top_builddir)/src -lm
make_math_fixed_tables$(EXEEXT): $(top_srcdir)/src/make_math_fixed_tables.c
- $(CC_FOR_BUILD) -o make_math_fixed_tables$(EXEEXT) $(top_srcdir)/src/make_math_fixed_tables.c -DHAVE_CONFIG_H -I$(top_builddir)/src -lm
+ $(CC_FOR_BUILD) -o make_math_fixed_tables$(EXEEXT) $(top_srcdir)/src/make_math_fixed_tables.c -DHAVE_CONFIG_H -I$(top_builddir)/src -lm
make_modem_filter$(EXEEXT): $(top_srcdir)/src/make_modem_filter.c $(top_srcdir)/src/filter_tools.c
$(CC_FOR_BUILD) -o make_modem_filter$(EXEEXT) $(top_srcdir)/src/make_modem_filter.c $(top_srcdir)/src/filter_tools.c -DHAVE_CONFIG_H -I$(top_builddir)/src -lm
@@ -498,7 +502,7 @@ v29tx_rrc.h: make_modem_filter$(EXEEXT)
VCPROJ8 = libspandsp.2005.vcproj
VCPROJ9 = libspandsp.2008.vcproj
VCPROJ10 = libspandsp.2010.vcproj
-VCPROJ12 = libspandsp.2012.vcproj
+VCPROJ12 = libspandsp.2012.vcxproj
WIN32SOURCES = $(libspandsp_la_SOURCES) .\\msvc\\gettimeofday.c
WIN32HEADERS = $(nobase_include_HEADERS) spandsp.h
diff --git a/libs/spandsp/src/libspandsp.2012.sln b/libs/spandsp/src/libspandsp.2012.sln
index c0cc75f4e3..6063a30635 100644
--- a/libs/spandsp/src/libspandsp.2012.sln
+++ b/libs/spandsp/src/libspandsp.2012.sln
@@ -48,30 +48,34 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "t38_core_tests", "..\tests\
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "t38_non_ecm_buffer_tests", "..\tests\msvc\t38_non_ecm_buffer_tests.2012.vcxproj", "{80A3D9D9-3846-4DA5-8676-F940D725EA62}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vector_int_tests", "..\tests\msvc\vector_int_tests.2012.vcxproj", "{80A60464-29E8-4EE8-BAFA-8708B7C08CC3}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vector_float_tests", "..\tests\msvc\vector_float_tests.2012.vcxproj", "{EA745FF7-9E4B-4C13-BA19-2EE8165A6245}"
-EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "complex_tests", "..\tests\msvc\complex_tests.2012.vcxproj", "{A349379F-0FEA-49C8-9535-05F39663337B}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "complex_vector_float_tests", "..\tests\msvc\complex_vector_float_tests.2012.vcxproj", "{2B0D705C-1CF2-401C-BFBC-A43FB806908C}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "complex_vector_int_tests", "..\tests\msvc\complex_vector_int_tests.2012.vcxproj", "{C2E8B4D1-A398-4D57-94F8-B61F20C7D514}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "queue_tests", "..\tests\msvc\queue_tests.2012.vcxproj", "{D9C0F575-83E7-4C15-BF71-D7A0D44A26BF}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dtmf_rx_tests", "..\tests\msvc\dtmf_rx_tests.2012.vcxproj", "{24E7EF80-7854-4A21-80FB-31C4E71109DE}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dtmf_tx_tests", "..\tests\msvc\dtmf_tx_tests.2012.vcxproj", "{1577F41D-9A06-45DD-87D4-9ADCC9CCDAD5}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dtmf_rx_tests", "..\tests\msvc\dtmf_rx_tests.2012.vcxproj", "{24E7EF80-7854-4A21-80FB-31C4E71109DE}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "queue_tests", "..\tests\msvc\queue_tests.2012.vcxproj", "{D9C0F575-83E7-4C15-BF71-D7A0D44A26BF}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "v29_tests", "..\tests\msvc\v29_tests.2012.vcxproj", "{323BD962-4581-4561-8105-8C166A9FA933}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "t38_core_tests", "..\tests\msvc\t38_core_tests.2012.vcxproj", "{A34A9D0E-A7E2-4A04-B044-7BB2FE709EF3}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "v80_tests", "..\tests\msvc\v80_tests.2012.vcxproj", "{10263F04-37DD-4E4A-AE4F-0641B018B714}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "t38_non_ecm_buffer_tests", "..\tests\msvc\t38_non_ecm_buffer_tests.2012.vcxproj", "{80A3D9D9-3846-4DA5-8676-F940D725EA62}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "v22bis_tests", "..\tests\msvc\v22bis_tests.2012.vcxproj", "{DA4DB99F-E5BA-48BD-BB6B-3595CE24CBAE}"
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "v29_tests", "..\tests\msvc\v29_tests.2012.vcxproj", "{323BD962-4581-4561-8105-8C166A9FA933}"
+EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "v8_tests", "..\tests\msvc\v8_tests.2012.vcxproj", "{0C69B8C2-0CE1-4CD4-870C-1C13FB3F9B34}"
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "v80_tests", "..\tests\msvc\v80_tests.2012.vcxproj", "{10263F04-37DD-4E4A-AE4F-0641B018B714}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vector_int_tests", "..\tests\msvc\vector_int_tests.2012.vcxproj", "{80A60464-29E8-4EE8-BAFA-8708B7C08CC3}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vector_float_tests", "..\tests\msvc\vector_float_tests.2012.vcxproj", "{EA745FF7-9E4B-4C13-BA19-2EE8165A6245}"
+EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{C84E437E-9D4C-46C8-9724-DF301C849E61}"
EndProject
Global
diff --git a/libs/spandsp/src/libspandsp.2012.vcxproj b/libs/spandsp/src/libspandsp.2012.vcxproj
index ff7338af7a..c075d0cf5b 100644
--- a/libs/spandsp/src/libspandsp.2012.vcxproj
+++ b/libs/spandsp/src/libspandsp.2012.vcxproj
@@ -173,6 +173,7 @@
+
@@ -191,8 +192,8 @@
-
+
@@ -214,12 +215,6 @@
-
-
-
-
-
-
@@ -229,6 +224,12 @@
+
+
+
+
+
+
@@ -256,6 +257,7 @@
+
@@ -270,6 +272,7 @@
+
@@ -285,10 +288,11 @@
-
+
+
@@ -296,12 +300,6 @@
-
-
-
-
-
-
@@ -310,12 +308,6 @@
-
-
-
-
-
-
@@ -326,6 +318,12 @@
+
+
+
+
+
+
@@ -347,6 +345,7 @@
+
@@ -354,6 +353,7 @@
+
@@ -365,12 +365,16 @@
+
+
+
+
@@ -387,7 +391,14 @@
+
+
+
+
+
+
+
diff --git a/libs/spandsp/src/msvc/vc10proj.foot b/libs/spandsp/src/msvc/vc10proj.foot
new file mode 100644
index 0000000000..be77f0a5a8
--- /dev/null
+++ b/libs/spandsp/src/msvc/vc10proj.foot
@@ -0,0 +1,33 @@
+
+ Copying %(FullPath) to $(ProjectDir)%(Filename)%(Extension)
+ copy "%(FullPath)" "$(ProjectDir)%(Filename)%(Extension)"
+ $(ProjectDir)%(Filename)%(Extension);%(Outputs)
+ Copying %(FullPath) to $(ProjectDir)%(Filename)%(Extension)
+ copy "%(FullPath)" "$(ProjectDir)%(Filename)%(Extension)"
+ $(ProjectDir)%(Filename)%(Extension);%(Outputs)
+ Copying %(FullPath) to $(ProjectDir)%(Filename)%(Extension)
+ copy "%(FullPath)" "$(ProjectDir)%(Filename)%(Extension)"
+ $(ProjectDir)%(Filename)%(Extension);%(Outputs)
+ Copying %(FullPath) to $(ProjectDir)%(Filename)%(Extension)
+ copy "%(FullPath)" "$(ProjectDir)%(Filename)%(Extension)"
+ $(ProjectDir)%(Filename)%(Extension);%(Outputs)
+
+
+
+
+ {401a40cd-5db4-4e34-ac68-fa99e9fac014}
+ false
+
+
+ {dee932ab-5911-4700-9eeb-8c7090a0a330}
+ false
+
+
+ {329a6fa0-0fcc-4435-a950-e670aefa9838}
+ false
+
+
+
+
+
+
diff --git a/libs/spandsp/src/msvc/vc10proj.head b/libs/spandsp/src/msvc/vc10proj.head
new file mode 100644
index 0000000000..37f2b12b29
--- /dev/null
+++ b/libs/spandsp/src/msvc/vc10proj.head
@@ -0,0 +1,157 @@
+
+
+
+
+ Debug
+ Win32
+
+
+ Debug
+ x64
+
+
+ Release
+ Win32
+
+
+ Release
+ x64
+
+
+
+ libspandsp
+ {1CBB0077-18C5-455F-801C-0A0CE7B0BBF5}
+ libspandsp
+ Win32Proj
+
+
+
+ DynamicLibrary
+ Unicode
+ true
+
+
+ DynamicLibrary
+ Unicode
+
+
+ DynamicLibrary
+ Unicode
+ true
+
+
+ DynamicLibrary
+ Unicode
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ <_ProjectFileVersion>10.0.30319.1
+ true
+ false
+ true
+ false
+
+
+
+ $(IntDir)BuildLog $(ProjectName).htm
+
+
+ Disabled
+ .;..\..\src\spandsp;..\..\src;..\..\src\msvc;.\spandsp;.\msvc;..\..\tiff-4.0.2\libtiff;%(AdditionalIncludeDirectories)
+ WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBSPANDSP_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;HAVE_CONFIG_H;%(PreprocessorDefinitions)
+ true
+ EnableFastChecks
+ MultiThreadedDebugDLL
+ Level4
+ CompileAsC
+ 4127;%(DisableSpecificWarnings)
+
+
+ true
+ Windows
+ false
+ MachineX86
+
+
+
+
+ $(IntDir)BuildLog $(ProjectName).htm
+
+
+ .;.\spandsp;.\msvc;..\..\tiff-4.0.2\libtiff;%(AdditionalIncludeDirectories)
+ WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBSPANDSP_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;HAVE_CONFIG_H;%(PreprocessorDefinitions)
+ MultiThreadedDLL
+ Level4
+ 4127;%(DisableSpecificWarnings)
+
+
+ true
+ Windows
+ true
+ true
+ false
+ MachineX86
+
+
+
+
+ $(IntDir)BuildLog $(ProjectName).htm
+
+
+ Disabled
+ .;.\spandsp;.\msvc;..\..\tiff-4.0.2\libtiff;%(AdditionalIncludeDirectories)
+ WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBSPANDSP_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;HAVE_CONFIG_H;%(PreprocessorDefinitions)
+ true
+ EnableFastChecks
+ MultiThreadedDebugDLL
+ Level4
+ CompileAsC
+ 4127;%(DisableSpecificWarnings)
+
+
+ true
+ Windows
+ false
+ MachineX64
+
+
+
+
+ $(IntDir)BuildLog $(ProjectName).htm
+
+
+ .;.\spandsp;.\msvc;..\..\tiff-4.0.2\libtiff;%(AdditionalIncludeDirectories)
+ WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBSPANDSP_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;HAVE_CONFIG_H;%(PreprocessorDefinitions)
+ MultiThreadedDLL
+ Level4
+ 4127;%(DisableSpecificWarnings)
+
+
+ true
+ Windows
+ true
+ true
+ false
+ MachineX64
+
+
+
diff --git a/libs/spandsp/src/msvc/vc12proj.foot b/libs/spandsp/src/msvc/vc12proj.foot
new file mode 100644
index 0000000000..e67b5d098f
--- /dev/null
+++ b/libs/spandsp/src/msvc/vc12proj.foot
@@ -0,0 +1,47 @@
+
+ Copying %(FullPath) to $(ProjectDir)%(Filename)%(Extension)
+ copy "%(FullPath)" "$(ProjectDir)%(Filename)%(Extension)"
+ $(ProjectDir)%(Filename)%(Extension);%(Outputs)
+ Copying %(FullPath) to $(ProjectDir)%(Filename)%(Extension)
+ copy "%(FullPath)" "$(ProjectDir)%(Filename)%(Extension)"
+ $(ProjectDir)%(Filename)%(Extension);%(Outputs)
+ Copying %(FullPath) to $(ProjectDir)%(Filename)%(Extension)
+ copy "%(FullPath)" "$(ProjectDir)%(Filename)%(Extension)"
+ $(ProjectDir)%(Filename)%(Extension);%(Outputs)
+ Copying %(FullPath) to $(ProjectDir)%(Filename)%(Extension)
+ copy "%(FullPath)" "$(ProjectDir)%(Filename)%(Extension)"
+ $(ProjectDir)%(Filename)%(Extension);%(Outputs)
+
+
+
+
+ {019dbd2a-273d-4ba4-bf86-b5efe2ed76b1}
+ false
+
+
+ {401a40cd-5db4-4e34-ac68-fa99e9fac014}
+ false
+
+
+ {dee932ab-5911-4700-9eeb-8c7090a0a330}
+ false
+
+
+ {85f0cf8c-c7ab-48f6-ba19-cc94cf87f981}
+
+
+ {2386b892-35f5-46cf-a0f0-10394d2fbf9b}
+
+
+ {329a6fa0-0fcc-4435-a950-e670aefa9838}
+ false
+
+
+ {eddb8ab9-c53e-44c0-a620-0e86c2cbd5d5}
+ false
+
+
+
+
+
+
diff --git a/libs/spandsp/src/msvc/vc12proj.head b/libs/spandsp/src/msvc/vc12proj.head
new file mode 100644
index 0000000000..396eed7ae2
--- /dev/null
+++ b/libs/spandsp/src/msvc/vc12proj.head
@@ -0,0 +1,161 @@
+
+
+
+
+ Debug
+ Win32
+
+
+ Debug
+ x64
+
+
+ Release
+ Win32
+
+
+ Release
+ x64
+
+
+
+ libspandsp
+ {1CBB0077-18C5-455F-801C-0A0CE7B0BBF5}
+ libspandsp
+ Win32Proj
+
+
+
+ DynamicLibrary
+ Unicode
+ true
+ v110
+
+
+ DynamicLibrary
+ Unicode
+ v110
+
+
+ DynamicLibrary
+ Unicode
+ true
+ v110
+
+
+ DynamicLibrary
+ Unicode
+ v110
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ <_ProjectFileVersion>10.0.30319.1
+ true
+ false
+ true
+ false
+
+
+
+ $(IntDir)BuildLog $(ProjectName).htm
+
+
+ Disabled
+ .;.\spandsp;.\msvc;..\tiff-4.0.3\tiff-4.0.3\libtiff;..\jpeg-8d;%(AdditionalIncludeDirectories)
+ WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBSPANDSP_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;HAVE_CONFIG_H;%(PreprocessorDefinitions)
+ true
+ EnableFastChecks
+ MultiThreadedDebugDLL
+ Level4
+ CompileAsC
+ 4127;4324;4267;4306;%(DisableSpecificWarnings)
+
+
+ true
+ Windows
+ false
+ MachineX86
+
+
+
+
+ $(IntDir)BuildLog $(ProjectName).htm
+
+
+ .;.\spandsp;.\msvc;..\tiff-4.0.3\tiff-4.0.3\libtiff;..\jpeg-8d;%(AdditionalIncludeDirectories)
+ WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBSPANDSP_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;HAVE_CONFIG_H;%(PreprocessorDefinitions)
+ MultiThreadedDLL
+ Level4
+ 4127;4324;4267;4306;%(DisableSpecificWarnings)
+
+
+ true
+ Windows
+ true
+ true
+ false
+ MachineX86
+
+
+
+
+ $(IntDir)BuildLog $(ProjectName).htm
+
+
+ Disabled
+ .;.\spandsp;.\msvc;..\tiff-4.0.3\tiff-4.0.3\libtiff;..\jpeg-8d;%(AdditionalIncludeDirectories)
+ WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBSPANDSP_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;HAVE_CONFIG_H;%(PreprocessorDefinitions)
+ true
+ EnableFastChecks
+ MultiThreadedDebugDLL
+ Level4
+ CompileAsC
+ 4127;4324;4267;4306;%(DisableSpecificWarnings)
+
+
+ true
+ Windows
+ false
+ MachineX64
+
+
+
+
+ $(IntDir)BuildLog $(ProjectName).htm
+
+
+ .;.\spandsp;.\msvc;..\tiff-4.0.3\tiff-4.0.3\libtiff;..\jpeg-8d;%(AdditionalIncludeDirectories)
+ WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBSPANDSP_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;HAVE_CONFIG_H;%(PreprocessorDefinitions)
+ MultiThreadedDLL
+ Level4
+ 4127;4324;4267;4306;%(DisableSpecificWarnings)
+
+
+ true
+ Windows
+ true
+ true
+ false
+ MachineX64
+
+
+