Commit 4934d1de authored by Ghislain MARY's avatar Ghislain MARY
Browse files

Fix compilation for Windows CE and Windows Mobile with Visual Studio.

parent 0c086e3c
This diff is collapsed.
...@@ -199,9 +199,9 @@ ...@@ -199,9 +199,9 @@
/> />
</Configuration> </Configuration>
<Configuration <Configuration
Name="Debug|Windows Mobile 6 Standard SDK (ARMV4I)" Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
OutputDirectory="Windows Mobile 6 Standard SDK (ARMV4I)\$(ConfigurationName)" OutputDirectory="$(PlatformName)\Release"
IntermediateDirectory="Windows Mobile 6 Standard SDK (ARMV4I)\$(ConfigurationName)" IntermediateDirectory="$(PlatformName)\Release"
ConfigurationType="2" ConfigurationType="2"
UseOfMFC="0" UseOfMFC="0"
CharacterSet="1" CharacterSet="1"
...@@ -220,18 +220,15 @@ ...@@ -220,18 +220,15 @@
/> />
<Tool <Tool
Name="VCMIDLTool" Name="VCMIDLTool"
PreprocessorDefinitions="_DEBUG" PreprocessorDefinitions="NDEBUG"
MkTypLibCompatible="false" MkTypLibCompatible="false"
TargetEnvironment="1"
/> />
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
ExecutionBucket="7" ExecutionBucket="7"
Optimization="2"
FavorSizeOrSpeed="1"
AdditionalIncludeDirectories="..\..\include;..\..\..\osip\include" AdditionalIncludeDirectories="..\..\include;..\..\..\osip\include"
PreprocessorDefinitions="ORTP_INET6;ORTP_EXPORT;AMD_HACK;_WIN32_WCE=$(CEVER);UNDER_CE=$(CEVER);WINCE;$(PLATFORMDEFINES);_DEBUG;_USRDLL;$(ARCHFAM);$(_ARCHFAM_)" PreprocessorDefinitions="ORTP_INET6;ORTP_EXPORT;AMD_HACK;_WIN32_WCE=$(CEVER);UNDER_CE=$(CEVER);WINCE;$(PLATFORMDEFINES);NDEBUG;_USRDLL;$(ARCHFAM);$(_ARCHFAM_);POCKETPC2003_UI_MODEL;POCKETPC2003_UI_MODEL"
RuntimeLibrary="3" RuntimeLibrary="2"
TreatWChar_tAsBuiltInType="true" TreatWChar_tAsBuiltInType="true"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
ProgramDataBaseFileName="$(IntDir)/oRTP.pdb" ProgramDataBaseFileName="$(IntDir)/oRTP.pdb"
...@@ -243,7 +240,7 @@ ...@@ -243,7 +240,7 @@
/> />
<Tool <Tool
Name="VCResourceCompilerTool" Name="VCResourceCompilerTool"
PreprocessorDefinitions="_DEBUG;_UNICODE;UNICODE;_WIN32_WCE;UNDER_CE" PreprocessorDefinitions="NDEBUG;_UNICODE;UNICODE;_WIN32_WCE;UNDER_CE"
Culture="1033" Culture="1033"
AdditionalIncludeDirectories="$(IntDir)" AdditionalIncludeDirectories="$(IntDir)"
/> />
...@@ -253,13 +250,11 @@ ...@@ -253,13 +250,11 @@
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalOptions=" /SUBSYSTEM:WINDOWSCE,5.01 /MACHINE:THUMB" AdditionalOptions=" /SUBSYSTEM:WINDOWSCE,5.01 /MACHINE:THUMB"
AdditionalDependencies="ws2.lib iphlpapi.lib mmtimer.lib libcmtd.lib" AdditionalDependencies="ws2.lib iphlpapi.lib mmtimer.lib libcmt.lib"
IgnoreAllDefaultLibraries="true" IgnoreAllDefaultLibraries="true"
ModuleDefinitionFile="oRTP.def" ModuleDefinitionFile="oRTP.def"
GenerateDebugInformation="true"
RandomizedBaseAddress="1" RandomizedBaseAddress="1"
DataExecutionPrevention="0" DataExecutionPrevention="0"
TargetMachine="0"
/> />
<Tool <Tool
Name="VCALinkTool" Name="VCALinkTool"
...@@ -281,7 +276,7 @@ ...@@ -281,7 +276,7 @@
/> />
<DeploymentTool <DeploymentTool
ForceDirty="-1" ForceDirty="-1"
RemoteDirectory="%CSIDL_PROGRAM_FILES%\amsipua" RemoteDirectory="\amsip"
RegisterOutput="0" RegisterOutput="0"
AdditionalFiles="" AdditionalFiles=""
/> />
...@@ -289,9 +284,9 @@ ...@@ -289,9 +284,9 @@
/> />
</Configuration> </Configuration>
<Configuration <Configuration
Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)" Name="Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"
OutputDirectory="Windows Mobile 6 Professional SDK (ARMV4I)\$(ConfigurationName)" OutputDirectory="$(PlatformName)\Release"
IntermediateDirectory="Windows Mobile 6 Professional SDK (ARMV4I)\$(ConfigurationName)" IntermediateDirectory="$(PlatformName)\Release"
ConfigurationType="2" ConfigurationType="2"
UseOfMFC="0" UseOfMFC="0"
CharacterSet="1" CharacterSet="1"
...@@ -310,18 +305,15 @@ ...@@ -310,18 +305,15 @@
/> />
<Tool <Tool
Name="VCMIDLTool" Name="VCMIDLTool"
PreprocessorDefinitions="_DEBUG" PreprocessorDefinitions="NDEBUG"
MkTypLibCompatible="false" MkTypLibCompatible="false"
TargetEnvironment="1"
/> />
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
ExecutionBucket="7" ExecutionBucket="7"
Optimization="2"
FavorSizeOrSpeed="1"
AdditionalIncludeDirectories="..\..\include;..\..\..\osip\include" AdditionalIncludeDirectories="..\..\include;..\..\..\osip\include"
PreprocessorDefinitions="ORTP_INET6;ORTP_EXPORT;AMD_HACK;_WIN32_WCE=$(CEVER);UNDER_CE=$(CEVER);WINCE;$(PLATFORMDEFINES);_DEBUG;_USRDLL;$(ARCHFAM);$(_ARCHFAM_);POCKETPC2003_UI_MODEL" PreprocessorDefinitions="ORTP_INET6;ORTP_EXPORT;AMD_HACK;_WIN32_WCE=$(CEVER);UNDER_CE=$(CEVER);WINCE;$(PLATFORMDEFINES);NDEBUG;_USRDLL;$(ARCHFAM);$(_ARCHFAM_);SMARTPHONE2003_UI_MODEL;SMARTPHONE2003_UI_MODEL"
RuntimeLibrary="3" RuntimeLibrary="2"
TreatWChar_tAsBuiltInType="true" TreatWChar_tAsBuiltInType="true"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
ProgramDataBaseFileName="$(IntDir)/oRTP.pdb" ProgramDataBaseFileName="$(IntDir)/oRTP.pdb"
...@@ -333,7 +325,7 @@ ...@@ -333,7 +325,7 @@
/> />
<Tool <Tool
Name="VCResourceCompilerTool" Name="VCResourceCompilerTool"
PreprocessorDefinitions="_DEBUG;_UNICODE;UNICODE;_WIN32_WCE;UNDER_CE" PreprocessorDefinitions="NDEBUG;_UNICODE;UNICODE;_WIN32_WCE;UNDER_CE"
Culture="1033" Culture="1033"
AdditionalIncludeDirectories="$(IntDir)" AdditionalIncludeDirectories="$(IntDir)"
/> />
...@@ -343,13 +335,11 @@ ...@@ -343,13 +335,11 @@
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalOptions=" /SUBSYSTEM:WINDOWSCE,5.01 /MACHINE:THUMB" AdditionalOptions=" /SUBSYSTEM:WINDOWSCE,5.01 /MACHINE:THUMB"
AdditionalDependencies="ws2.lib iphlpapi.lib mmtimer.lib libcmtd.lib" AdditionalDependencies="ws2.lib iphlpapi.lib mmtimer.lib libcmt.lib"
IgnoreAllDefaultLibraries="true" IgnoreAllDefaultLibraries="true"
ModuleDefinitionFile="oRTP.def" ModuleDefinitionFile="oRTP.def"
GenerateDebugInformation="true"
RandomizedBaseAddress="1" RandomizedBaseAddress="1"
DataExecutionPrevention="0" DataExecutionPrevention="0"
TargetMachine="0"
/> />
<Tool <Tool
Name="VCALinkTool" Name="VCALinkTool"
...@@ -371,7 +361,7 @@ ...@@ -371,7 +361,7 @@
/> />
<DeploymentTool <DeploymentTool
ForceDirty="-1" ForceDirty="-1"
RemoteDirectory="%CSIDL_PROGRAM_FILES%\linphone" RemoteDirectory="%CSIDL_PROGRAM_FILES%\vbamsipua"
RegisterOutput="0" RegisterOutput="0"
AdditionalFiles="" AdditionalFiles=""
/> />
...@@ -379,9 +369,9 @@ ...@@ -379,9 +369,9 @@
/> />
</Configuration> </Configuration>
<Configuration <Configuration
Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" Name="Debug|Windows Mobile 6 Standard SDK (ARMV4I)"
OutputDirectory="$(PlatformName)\Release" OutputDirectory="Windows Mobile 6 Standard SDK (ARMV4I)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\Release" IntermediateDirectory="Windows Mobile 6 Standard SDK (ARMV4I)\$(ConfigurationName)"
ConfigurationType="2" ConfigurationType="2"
UseOfMFC="0" UseOfMFC="0"
CharacterSet="1" CharacterSet="1"
...@@ -400,15 +390,18 @@ ...@@ -400,15 +390,18 @@
/> />
<Tool <Tool
Name="VCMIDLTool" Name="VCMIDLTool"
PreprocessorDefinitions="NDEBUG" PreprocessorDefinitions="_DEBUG"
MkTypLibCompatible="false" MkTypLibCompatible="false"
TargetEnvironment="1"
/> />
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
ExecutionBucket="7" ExecutionBucket="7"
Optimization="2"
FavorSizeOrSpeed="1"
AdditionalIncludeDirectories="..\..\include;..\..\..\osip\include" AdditionalIncludeDirectories="..\..\include;..\..\..\osip\include"
PreprocessorDefinitions="ORTP_INET6;ORTP_EXPORT;AMD_HACK;_WIN32_WCE=$(CEVER);UNDER_CE=$(CEVER);WINCE;$(PLATFORMDEFINES);NDEBUG;_USRDLL;$(ARCHFAM);$(_ARCHFAM_);POCKETPC2003_UI_MODEL;POCKETPC2003_UI_MODEL" PreprocessorDefinitions="ORTP_INET6;ORTP_EXPORT;AMD_HACK;_WIN32_WCE=$(CEVER);UNDER_CE=$(CEVER);WINCE;$(PLATFORMDEFINES);_DEBUG;_USRDLL;$(ARCHFAM);$(_ARCHFAM_)"
RuntimeLibrary="2" RuntimeLibrary="3"
TreatWChar_tAsBuiltInType="true" TreatWChar_tAsBuiltInType="true"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
ProgramDataBaseFileName="$(IntDir)/oRTP.pdb" ProgramDataBaseFileName="$(IntDir)/oRTP.pdb"
...@@ -420,7 +413,7 @@ ...@@ -420,7 +413,7 @@
/> />
<Tool <Tool
Name="VCResourceCompilerTool" Name="VCResourceCompilerTool"
PreprocessorDefinitions="NDEBUG;_UNICODE;UNICODE;_WIN32_WCE;UNDER_CE" PreprocessorDefinitions="_DEBUG;_UNICODE;UNICODE;_WIN32_WCE;UNDER_CE"
Culture="1033" Culture="1033"
AdditionalIncludeDirectories="$(IntDir)" AdditionalIncludeDirectories="$(IntDir)"
/> />
...@@ -430,11 +423,13 @@ ...@@ -430,11 +423,13 @@
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalOptions=" /SUBSYSTEM:WINDOWSCE,5.01 /MACHINE:THUMB" AdditionalOptions=" /SUBSYSTEM:WINDOWSCE,5.01 /MACHINE:THUMB"
AdditionalDependencies="ws2.lib iphlpapi.lib mmtimer.lib libcmt.lib" AdditionalDependencies="ws2.lib iphlpapi.lib mmtimer.lib libcmtd.lib"
IgnoreAllDefaultLibraries="true" IgnoreAllDefaultLibraries="true"
ModuleDefinitionFile="oRTP.def" ModuleDefinitionFile="oRTP.def"
GenerateDebugInformation="true"
RandomizedBaseAddress="1" RandomizedBaseAddress="1"
DataExecutionPrevention="0" DataExecutionPrevention="0"
TargetMachine="0"
/> />
<Tool <Tool
Name="VCALinkTool" Name="VCALinkTool"
...@@ -456,7 +451,7 @@ ...@@ -456,7 +451,7 @@
/> />
<DeploymentTool <DeploymentTool
ForceDirty="-1" ForceDirty="-1"
RemoteDirectory="\amsip" RemoteDirectory="%CSIDL_PROGRAM_FILES%\amsipua"
RegisterOutput="0" RegisterOutput="0"
AdditionalFiles="" AdditionalFiles=""
/> />
...@@ -464,9 +459,9 @@ ...@@ -464,9 +459,9 @@
/> />
</Configuration> </Configuration>
<Configuration <Configuration
Name="Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
OutputDirectory="$(PlatformName)\Release" OutputDirectory="Windows Mobile 6 Professional SDK (ARMV4I)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\Release" IntermediateDirectory="Windows Mobile 6 Professional SDK (ARMV4I)\$(ConfigurationName)"
ConfigurationType="2" ConfigurationType="2"
UseOfMFC="0" UseOfMFC="0"
CharacterSet="1" CharacterSet="1"
...@@ -485,15 +480,18 @@ ...@@ -485,15 +480,18 @@
/> />
<Tool <Tool
Name="VCMIDLTool" Name="VCMIDLTool"
PreprocessorDefinitions="NDEBUG" PreprocessorDefinitions="_DEBUG"
MkTypLibCompatible="false" MkTypLibCompatible="false"
TargetEnvironment="1"
/> />
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
ExecutionBucket="7" ExecutionBucket="7"
Optimization="2"
FavorSizeOrSpeed="1"
AdditionalIncludeDirectories="..\..\include;..\..\..\osip\include" AdditionalIncludeDirectories="..\..\include;..\..\..\osip\include"
PreprocessorDefinitions="ORTP_INET6;ORTP_EXPORT;AMD_HACK;_WIN32_WCE=$(CEVER);UNDER_CE=$(CEVER);WINCE;$(PLATFORMDEFINES);NDEBUG;_USRDLL;$(ARCHFAM);$(_ARCHFAM_);SMARTPHONE2003_UI_MODEL;SMARTPHONE2003_UI_MODEL" PreprocessorDefinitions="ORTP_INET6;ORTP_EXPORT;AMD_HACK;_WIN32_WCE=$(CEVER);UNDER_CE=$(CEVER);WINCE;$(PLATFORMDEFINES);_DEBUG;_USRDLL;$(ARCHFAM);$(_ARCHFAM_);POCKETPC2003_UI_MODEL"
RuntimeLibrary="2" RuntimeLibrary="3"
TreatWChar_tAsBuiltInType="true" TreatWChar_tAsBuiltInType="true"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
ProgramDataBaseFileName="$(IntDir)/oRTP.pdb" ProgramDataBaseFileName="$(IntDir)/oRTP.pdb"
...@@ -505,7 +503,7 @@ ...@@ -505,7 +503,7 @@
/> />
<Tool <Tool
Name="VCResourceCompilerTool" Name="VCResourceCompilerTool"
PreprocessorDefinitions="NDEBUG;_UNICODE;UNICODE;_WIN32_WCE;UNDER_CE" PreprocessorDefinitions="_DEBUG;_UNICODE;UNICODE;_WIN32_WCE;UNDER_CE"
Culture="1033" Culture="1033"
AdditionalIncludeDirectories="$(IntDir)" AdditionalIncludeDirectories="$(IntDir)"
/> />
...@@ -515,11 +513,13 @@ ...@@ -515,11 +513,13 @@
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalOptions=" /SUBSYSTEM:WINDOWSCE,5.01 /MACHINE:THUMB" AdditionalOptions=" /SUBSYSTEM:WINDOWSCE,5.01 /MACHINE:THUMB"
AdditionalDependencies="ws2.lib iphlpapi.lib mmtimer.lib libcmt.lib" AdditionalDependencies="ws2.lib iphlpapi.lib mmtimer.lib libcmtd.lib"
IgnoreAllDefaultLibraries="true" IgnoreAllDefaultLibraries="true"
ModuleDefinitionFile="oRTP.def" ModuleDefinitionFile="oRTP.def"
GenerateDebugInformation="true"
RandomizedBaseAddress="1" RandomizedBaseAddress="1"
DataExecutionPrevention="0" DataExecutionPrevention="0"
TargetMachine="0"
/> />
<Tool <Tool
Name="VCALinkTool" Name="VCALinkTool"
...@@ -541,7 +541,7 @@ ...@@ -541,7 +541,7 @@
/> />
<DeploymentTool <DeploymentTool
ForceDirty="-1" ForceDirty="-1"
RemoteDirectory="%CSIDL_PROGRAM_FILES%\vbamsipua" RemoteDirectory="%CSIDL_PROGRAM_FILES%\linphone"
RegisterOutput="0" RegisterOutput="0"
AdditionalFiles="" AdditionalFiles=""
/> />
...@@ -747,6 +747,14 @@ ...@@ -747,6 +747,14 @@
RelativePath="..\..\src\jitterctl.c" RelativePath="..\..\src\jitterctl.c"
> >
</File> </File>
<File
RelativePath="..\..\src\logging.c"
>
</File>
<File
RelativePath="..\..\src\netsim.c"
>
</File>
<File <File
RelativePath="..\..\src\ortp.c" RelativePath="..\..\src\ortp.c"
> >
...@@ -775,6 +783,10 @@ ...@@ -775,6 +783,10 @@
RelativePath="..\..\src\rtpparse.c" RelativePath="..\..\src\rtpparse.c"
> >
</File> </File>
<File
RelativePath="..\..\src\rtpprofile.c"
>
</File>
<File <File
RelativePath="..\..\src\rtpsession.c" RelativePath="..\..\src\rtpsession.c"
> >
...@@ -837,6 +849,10 @@ ...@@ -837,6 +849,10 @@
RelativePath="..\..\src\jitterctl.h" RelativePath="..\..\src\jitterctl.h"
> >
</File> </File>
<File
RelativePath="..\..\include\ortp\logging.h"
>
</File>
<File <File
RelativePath="..\..\src\ortp-config-win32.h" RelativePath="..\..\src\ortp-config-win32.h"
> >
...@@ -861,6 +877,10 @@ ...@@ -861,6 +877,10 @@
RelativePath="..\..\include\ortp\rtp.h" RelativePath="..\..\include\ortp\rtp.h"
> >
</File> </File>
<File
RelativePath="..\..\include\ortp\rtpprofile.h"
>
</File>
<File <File
RelativePath="..\..\include\ortp\rtpsession.h" RelativePath="..\..\include\ortp\rtpsession.h"
> >
......
...@@ -119,7 +119,6 @@ int __ortp_thread_create(pthread_t *thread, pthread_attr_t *attr, void * (*routi ...@@ -119,7 +119,6 @@ int __ortp_thread_create(pthread_t *thread, pthread_attr_t *attr, void * (*routi
#include <stdarg.h> #include <stdarg.h>
#include <winsock2.h> #include <winsock2.h>
#include <ws2tcpip.h> #include <ws2tcpip.h>
#include <io.h>
#ifdef _MSC_VER #ifdef _MSC_VER
#pragma push_macro("_WINSOCKAPI_") #pragma push_macro("_WINSOCKAPI_")
...@@ -136,6 +135,7 @@ typedef unsigned char uint8_t; ...@@ -136,6 +135,7 @@ typedef unsigned char uint8_t;
typedef __int16 int16_t; typedef __int16 int16_t;
#else #else
#include <stdint.h> /*provided by mingw32*/ #include <stdint.h> /*provided by mingw32*/
#include <io.h>
#endif #endif
#define vsnprintf _vsnprintf #define vsnprintf _vsnprintf
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment