Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
O
ortp
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
2
Issues
2
List
Board
Labels
Milestones
Merge Requests
2
Merge Requests
2
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
External Wiki
External Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
BC
public
ortp
Commits
d7b4d285
Commit
d7b4d285
authored
Jan 22, 2014
by
Sylvain Berfini
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added SRTP dependency for Windows Phone 8 project + fix wp8 srtp include
parent
b04994f1
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
8 deletions
+13
-8
oRTP.vcxproj
build/vsx/oRTP/oRTP/oRTP.vcxproj
+9
-4
ortp_srtp.h
include/ortp/ortp_srtp.h
+4
-4
No files found.
build/vsx/oRTP/oRTP/oRTP.vcxproj
View file @
d7b4d285
...
...
@@ -116,8 +116,8 @@
<ItemDefinitionGroup
Condition=
"'$(Configuration)|$(Platform)'=='Debug|ARM'"
>
<ClCompile>
<WarningLevel>
Level4
</WarningLevel>
<AdditionalIncludeDirectories>
$(ProjectDir);$(ProjectDir)..\..\..\..\include;%(AdditionalIncludeDirectories)
</AdditionalIncludeDirectories>
<PreprocessorDefinitions>
_WIN32;_WINDLL;_USRDLL;_DEBUG;_CRT_SECURE_NO_WARNINGS;ORTP_INET6;WIN32;ORTP_EXPORTS;WINDOWS_NATIVE;UNICODE;_UNICODE;%(PreprocessorDefinitions)
</PreprocessorDefinitions>
<AdditionalIncludeDirectories>
$(ProjectDir);$(ProjectDir)..\..\..\..\include;
$(ProjectDir)..\..\..\..\..\srtp\include;$(ProjectDir)..\..\..\..\..\srtp\crypto\include;$(ProjectDir)..\..\..\..\..\srtp\build\windows\srtp\srtp;
%(AdditionalIncludeDirectories)
</AdditionalIncludeDirectories>
<PreprocessorDefinitions>
_WIN32;_WINDLL;_USRDLL;_DEBUG;_CRT_SECURE_NO_WARNINGS;ORTP_INET6;WIN32;ORTP_EXPORTS;WINDOWS_NATIVE;UNICODE;_UNICODE;
HAVE_SRTP;
%(PreprocessorDefinitions)
</PreprocessorDefinitions>
<MinimalRebuild>
false
</MinimalRebuild>
<BasicRuntimeChecks>
Default
</BasicRuntimeChecks>
<PrecompiledHeader>
NotUsing
</PrecompiledHeader>
...
...
@@ -140,9 +140,9 @@
<ItemDefinitionGroup
Condition=
"'$(Configuration)|$(Platform)'=='Release|ARM'"
>
<ClCompile>
<WarningLevel>
Level4
</WarningLevel>
<AdditionalIncludeDirectories>
$(ProjectDir);$(ProjectDir)..\..\..\..\include;%(AdditionalIncludeDirectories)
</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>
$(ProjectDir);$(ProjectDir)..\..\..\..\include;
$(ProjectDir)..\..\..\..\..\srtp\include;$(ProjectDir)..\..\..\..\..\srtp\crypto\include;$(ProjectDir)..\..\..\..\..\srtp\build\windows\srtp\srtp;
%(AdditionalIncludeDirectories)
</AdditionalIncludeDirectories>
<PreprocessorDefinitions>
_WIN32;_WINDLL;_USRDLL;NDEBUG;_CRT_SECURE_NO_WARNINGS;ORTP_INET6;WIN32;ORTP_EXPORTS;WINDOWS_NATIVE;UNICODE;_UNICODE;%(PreprocessorDefinitions)
</PreprocessorDefinitions>
<PreprocessorDefinitions>
_USRDLL;NDEBUG;%(PreprocessorDefinitions)
</PreprocessorDefinitions>
<PreprocessorDefinitions>
_USRDLL;NDEBUG;
HAVE_SRTP;
%(PreprocessorDefinitions)
</PreprocessorDefinitions>
<StringPooling>
true
</StringPooling>
<FunctionLevelLinking>
true
</FunctionLevelLinking>
<BasicRuntimeChecks>
Default
</BasicRuntimeChecks>
...
...
@@ -233,6 +233,11 @@
<Private>
false
</Private>
</Reference>
</ItemGroup>
<ItemGroup>
<ProjectReference
Include=
"..\..\..\..\..\srtp\build\windows\srtp\srtp\srtp.vcxproj"
>
<Project>
{b4b96bc4-2b72-4964-98e4-7fd048a43363}
</Project>
</ProjectReference>
</ItemGroup>
<Import
Project=
"$(VCTargetsPath)\Microsoft.Cpp.targets"
/>
<Import
Project=
"$(MSBuildExtensionsPath)\Microsoft\WindowsPhone\v$(TargetPlatformVersion)\Microsoft.Cpp.WindowsPhone.$(TargetPlatformVersion).targets"
Condition=
"'$(Platform)'=='ARM'"
/>
<ImportGroup
Label=
"ExtensionTargets"
>
...
...
include/ortp/ortp_srtp.h
View file @
d7b4d285
...
...
@@ -21,11 +21,11 @@
#define ortp_srtp_h
#ifdef HAVE_SRTP
#ifndef ANDROID
#include <srtp/srtp.h>
#else
// Android doesn't use make install
#if defined(ANDROID) || defined(WINAPI_FAMILY_PHONE_APP)
// Android and Windows phone don't use make install
#include <srtp.h>
#else
#include <srtp/srtp.h>
#endif
#else
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment