update windows build

git-svn-id: http://svn.openzap.org/svn/openzap/trunk@219 a93c3328-9c30-0410-af19-c9cd2b2d52af

diff --git a/libs/freetdm/msvc/openzap.vcproj b/libs/freetdm/msvc/openzap.vcproj
index f677bc216b9bf504b39b450fb6060d384d96c5c4..33776e109cd003ae87af070d5c6a19240bf3d200 100644 (file)
--- a/libs/freetdm/msvc/openzap.vcproj
+++ b/libs/freetdm/msvc/openzap.vcproj
@@ -41,7 +41,7 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories="../src/include;../src/isdn/include;../src/dsp"\r
+                               AdditionalIncludeDirectories="../src/include;../src/isdn/include"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;_LIB"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
@@ -109,7 +109,7 @@
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               AdditionalIncludeDirectories="../src/include;../src/isdn/include;../src/dsp"\r
+                               AdditionalIncludeDirectories="../src/include;../src/isdn/include"\r
                                PreprocessorDefinitions="WIN32;NDEBUG;_LIB"\r
                                RuntimeLibrary="2"\r
                                DisableLanguageExtensions="false"\r
@@ -324,6 +324,7 @@
                                        >\r
                                        <FileConfiguration\r
                                                Name="Debug|Win32"\r
+                                               ExcludedFromBuild="true"\r
                                                >\r
                                                <Tool\r
                                                        Name="VCCLCompilerTool"\r
@@ -332,6 +333,7 @@
                                        </FileConfiguration>\r
                                        <FileConfiguration\r
                                                Name="Release|Win32"\r
+                                               ExcludedFromBuild="true"\r
                                                >\r
                                                <Tool\r
                                                        Name="VCCLCompilerTool"\r
@@ -369,6 +371,10 @@
                                Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"\r
                                UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"\r
                                >\r
+                               <File\r
+                                       RelativePath="..\src\fsk.c"\r
+                                       >\r
+                               </File>\r
                                <File\r
                                        RelativePath="..\src\g711.c"\r
                                        >\r
@@ -389,6 +395,10 @@
                                        RelativePath="..\src\libteletone_generate.c"\r
                                        >\r
                                </File>\r
+                               <File\r
+                                       RelativePath="..\src\uart.c"\r
+                                       >\r
+                               </File>\r
                                <File\r
                                        RelativePath="..\src\zap_buffer.c"\r
                                        >\r
@@ -411,6 +421,10 @@
                                Filter="h;hpp;hxx;hm;inl;inc;xsd"\r
                                UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"\r
                                >\r
+                               <File\r
+                                       RelativePath="..\src\include\fsk.h"\r
+                                       >\r
+                               </File>\r
                                <File\r
                                        RelativePath="..\src\include\g711.h"\r
                                        >\r
@@ -443,6 +457,10 @@
                                        RelativePath="..\src\include\openzap.h"\r
                                        >\r
                                </File>\r
+                               <File\r
+                                       RelativePath="..\src\include\uart.h"\r
+                                       >\r
+                               </File>\r
                                <File\r
                                        RelativePath="..\src\include\zap_buffer.h"\r
                                        >\r
@@ -461,38 +479,6 @@
                                </File>\r
                        </Filter>\r
                </Filter>\r
-               <Filter\r
-                       Name="Dsp"\r
-                       >\r
-                       <File\r
-                               RelativePath="..\src\dsp\readme.txt"\r
-                               >\r
-                       </File>\r
-                       <Filter\r
-                               Name="Header Files"\r
-                               >\r
-                               <File\r
-                                       RelativePath="..\src\dsp\fsk.h"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\src\dsp\uart.h"\r
-                                       >\r
-                               </File>\r
-                       </Filter>\r
-                       <Filter\r
-                               Name="Source Files"\r
-                               >\r
-                               <File\r
-                                       RelativePath="..\src\dsp\fsk.c"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\src\dsp\uart.c"\r
-                                       >\r
-                               </File>\r
-                       </Filter>\r
-               </Filter>\r
        </Files>\r
        <Globals>\r
        </Globals>\r

diff --git a/libs/freetdm/openzap.sln b/libs/freetdm/openzap.sln
index ab53115d35068e1a81c6fa8280b01a0cf4607984..2e05fb41363832d6a88a0a1afc9f3e0220d12b17 100644 (file)
--- a/libs/freetdm/openzap.sln
+++ b/libs/freetdm/openzap.sln
@@ -7,8 +7,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Unix Makefiles", "Unix Make
        ProjectSection(SolutionItems) = preProject\r
                general.makefile = general.makefile\r
                Makefile = Makefile\r
-               wanpipe = wanpipe\r
-               zt = zt\r
        EndProjectSection\r
 EndProject\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testanalog", "msvc\testanalog\testanalog.vcproj", "{BB833648-BAFF-4BE2-94DB-F8BB043C588C}"\r

diff --git a/libs/freetdm/src/zap_io.c b/libs/freetdm/src/zap_io.c
index 6f6bdb69409239acacd6e0966bd2d2b5abfbca3a..9c251c9c427d8709776293285e594f745d816d54 100644 (file)
--- a/libs/freetdm/src/zap_io.c
+++ b/libs/freetdm/src/zap_io.c
@@ -31,7 +31,9 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#ifndef WIN32
 #define ZAP_ZT_SUPPORT
+#endif
 #define ZAP_WANPIPE_SUPPORT
 #include "openzap.h"
 #include "zap_isdn.h"