From 56946b78aa746261de759669626d04c52ed4eb0a Mon Sep 17 00:00:00 2001
From: Michael Jerris <mike@jerris.com>
Date: Tue, 5 Jun 2007 04:47:13 +0000
Subject: [PATCH] update windows build
git-svn-id: http://svn.openzap.org/svn/openzap/trunk@219 a93c3328-9c30-0410-af19-c9cd2b2d52af
---
libs/openzap/msvc/openzap.vcproj | 54 ++++++++++++--------------------
libs/openzap/openzap.sln | 2 --
libs/openzap/src/zap_io.c | 2 ++
3 files changed, 22 insertions(+), 36 deletions(-)
diff --git a/libs/openzap/msvc/openzap.vcproj b/libs/openzap/msvc/openzap.vcproj
index f677bc216b..33776e109c 100644
--- a/libs/openzap/msvc/openzap.vcproj
+++ b/libs/openzap/msvc/openzap.vcproj
@@ -41,7 +41,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="../src/include;../src/isdn/include;../src/dsp"
+ AdditionalIncludeDirectories="../src/include;../src/isdn/include"
PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -109,7 +109,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="../src/include;../src/isdn/include;../src/dsp"
+ AdditionalIncludeDirectories="../src/include;../src/isdn/include"
PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
RuntimeLibrary="2"
DisableLanguageExtensions="false"
@@ -324,6 +324,7 @@
>
<FileConfiguration
Name="Debug|Win32"
+ ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
@@ -332,6 +333,7 @@
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
+ ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
@@ -369,6 +371,10 @@
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
+ <File
+ RelativePath="..\src\fsk.c"
+ >
+ </File>
<File
RelativePath="..\src\g711.c"
>
@@ -389,6 +395,10 @@
RelativePath="..\src\libteletone_generate.c"
>
</File>
+ <File
+ RelativePath="..\src\uart.c"
+ >
+ </File>
<File
RelativePath="..\src\zap_buffer.c"
>
@@ -411,6 +421,10 @@
Filter="h;hpp;hxx;hm;inl;inc;xsd"
UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
>
+ <File
+ RelativePath="..\src\include\fsk.h"
+ >
+ </File>
<File
RelativePath="..\src\include\g711.h"
>
@@ -443,6 +457,10 @@
RelativePath="..\src\include\openzap.h"
>
</File>
+ <File
+ RelativePath="..\src\include\uart.h"
+ >
+ </File>
<File
RelativePath="..\src\include\zap_buffer.h"
>
@@ -461,38 +479,6 @@
</File>
</Filter>
</Filter>
- <Filter
- Name="Dsp"
- >
- <File
- RelativePath="..\src\dsp\readme.txt"
- >
- </File>
- <Filter
- Name="Header Files"
- >
- <File
- RelativePath="..\src\dsp\fsk.h"
- >
- </File>
- <File
- RelativePath="..\src\dsp\uart.h"
- >
- </File>
- </Filter>
- <Filter
- Name="Source Files"
- >
- <File
- RelativePath="..\src\dsp\fsk.c"
- >
- </File>
- <File
- RelativePath="..\src\dsp\uart.c"
- >
- </File>
- </Filter>
- </Filter>
</Files>
<Globals>
</Globals>
diff --git a/libs/openzap/openzap.sln b/libs/openzap/openzap.sln
index ab53115d35..2e05fb4136 100644
--- a/libs/openzap/openzap.sln
+++ b/libs/openzap/openzap.sln
@@ -7,8 +7,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Unix Makefiles", "Unix Make
ProjectSection(SolutionItems) = preProject
general.makefile = general.makefile
Makefile = Makefile
- wanpipe = wanpipe
- zt = zt
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testanalog", "msvc\testanalog\testanalog.vcproj", "{BB833648-BAFF-4BE2-94DB-F8BB043C588C}"
diff --git a/libs/openzap/src/zap_io.c b/libs/openzap/src/zap_io.c
index 6f6bdb6940..9c251c9c42 100644
--- a/libs/openzap/src/zap_io.c
+++ b/libs/openzap/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"