Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
L
libzmq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
libzmq
Commits
249a59a5
Commit
249a59a5
authored
May 12, 2014
by
evoskuil
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Updated libsodium imports.
parent
4e5921b7
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
23 additions
and
99 deletions
+23
-99
libsodium.import.props
builds/msvc/vs2010/libsodium.import.props
+8
-35
libsodium.import.props
builds/msvc/vs2012/libsodium.import.props
+8
-35
libsodium.import.props
builds/msvc/vs2013/libsodium.import.props
+7
-29
No files found.
builds/msvc/vs2010/libsodium.import.props
View file @
249a59a5
...
...
@@ -16,39 +16,12 @@
<ItemDefinitionGroup>
<ClCompile>
<AdditionalIncludeDirectories>
$(ProjectDir)..\..\..\..\..\libsodium\src\libsodium\include;$(ProjectDir)..\..\..\..\..\libsodium\src\libsodium\include\sodium\;%(AdditionalIncludeDirectories)
</AdditionalIncludeDirectories>
<PreprocessorDefinitions
Condition=
"'$(Linkage-libsodium)' == 'static' Or '$(Linkage-libsodium)' == 'ltcg'"
>
SODIUM_STATIC;%(PreprocessorDefinitions)
</PreprocessorDefinitions>
</ClCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup
Condition=
"'$(Linkage-libsodium)' == 'static' Or '$(Linkage-libsodium)' == 'ltcg'"
>
<ClCompile>
<PreprocessorDefinitions>
SODIUM_STATIC;%(PreprocessorDefinitions)
</PreprocessorDefinitions>
</ClCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup
Condition=
"'$(Linkage-libsodium)' == 'dynamic'"
>
<Link
Condition=
"$(Configuration.IndexOf('Debug')) != -1"
>
<AdditionalDependencies>
$(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Debug\libsodium10\libsodium.imp.lib;%(AdditionalDependencies)
</AdditionalDependencies>
</Link>
<Link
Condition=
"$(Configuration.IndexOf('Release')) != -1"
>
<AdditionalDependencies>
$(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Release\libsodium10\libsodium.imp.lib;%(AdditionalDependencies)
</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup
Condition=
"'$(Linkage-libsodium)' == 'static'"
>
<Link
Condition=
"$(Configuration.IndexOf('Debug')) != -1"
>
<AdditionalDependencies>
$(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Debug\libsodium10\libsodium.lib;%(AdditionalDependencies)
</AdditionalDependencies>
</Link>
<Link
Condition=
"$(Configuration.IndexOf('Release')) != -1"
>
<AdditionalDependencies>
$(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Release\libsodium10\libsodium.lib;%(AdditionalDependencies)
</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup
Condition=
"'$(Linkage-libsodium)' == 'ltcg'"
>
<Link
Condition=
"$(Configuration.IndexOf('Debug')) != -1"
>
<AdditionalDependencies>
$(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Debug\libsodium10\libsodium.ltcg.lib;%(AdditionalDependencies)
</AdditionalDependencies>
</Link>
<Link
Condition=
"$(Configuration.IndexOf('Release')) != -1"
>
<AdditionalDependencies>
$(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Release\libsodium10\libsodium.ltcg.lib;%(AdditionalDependencies)
</AdditionalDependencies>
<Link>
<AdditionalDependencies>
advapi32.lib;crypt32.lib;libsodium.lib;%(AdditionalDependencies)
</AdditionalDependencies>
<AdditionalLibraryDirectories
Condition=
"$(Configuration.IndexOf('Debug')) != -1"
>
$(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Debug\$(PlatformToolset)\$(Linkage-libsodium)\;%(AdditionalLibraryDirectories)
</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories
Condition=
"$(Configuration.IndexOf('Release')) != -1"
>
$(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Release\$(PlatformToolset)\$(Linkage-libsodium)\;%(AdditionalLibraryDirectories)
</AdditionalLibraryDirectories>
</Link>
</ItemDefinitionGroup>
...
...
@@ -56,15 +29,15 @@
<Target
Name=
"Linkage-libsodium-dynamic"
AfterTargets=
"AfterBuild"
Condition=
"'$(Linkage-libsodium)' == 'dynamic'"
>
<Copy
Condition=
"$(Configuration.IndexOf('Debug')) != -1"
SourceFiles=
"$(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Debug\
libsodium10
\libsodium.dll"
SourceFiles=
"$(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Debug\
$(PlatformToolset)\dynamic
\libsodium.dll"
DestinationFiles=
"$(TargetDir)libsodium.dll"
SkipUnchangedFiles=
"true"
/>
<Copy
Condition=
"$(Configuration.IndexOf('Debug')) != -1"
SourceFiles=
"$(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Debug\
libsodium10
\libsodium.pdb"
SourceFiles=
"$(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Debug\
$(PlatformToolset)\dynamic
\libsodium.pdb"
DestinationFiles=
"$(TargetDir)libsodium.pdb"
SkipUnchangedFiles=
"true"
/>
<Copy
Condition=
"$(Configuration.IndexOf('Release')) != -1"
SourceFiles=
"$(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Release\
libsodium10
\libsodium.dll"
SourceFiles=
"$(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Release\
$(PlatformToolset)\dynamic
\libsodium.dll"
DestinationFiles=
"$(TargetDir)libsodium.dll"
SkipUnchangedFiles=
"true"
/>
</Target>
...
...
builds/msvc/vs2012/libsodium.import.props
View file @
249a59a5
...
...
@@ -16,39 +16,12 @@
<ItemDefinitionGroup>
<ClCompile>
<AdditionalIncludeDirectories>
$(ProjectDir)..\..\..\..\..\libsodium\src\libsodium\include;$(ProjectDir)..\..\..\..\..\libsodium\src\libsodium\include\sodium\;%(AdditionalIncludeDirectories)
</AdditionalIncludeDirectories>
<PreprocessorDefinitions
Condition=
"'$(Linkage-libsodium)' == 'static' Or '$(Linkage-libsodium)' == 'ltcg'"
>
SODIUM_STATIC;%(PreprocessorDefinitions)
</PreprocessorDefinitions>
</ClCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup
Condition=
"'$(Linkage-libsodium)' == 'static' Or '$(Linkage-libsodium)' == 'ltcg'"
>
<ClCompile>
<PreprocessorDefinitions>
SODIUM_STATIC;%(PreprocessorDefinitions)
</PreprocessorDefinitions>
</ClCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup
Condition=
"'$(Linkage-libsodium)' == 'dynamic'"
>
<Link
Condition=
"$(Configuration.IndexOf('Debug')) != -1"
>
<AdditionalDependencies>
$(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Debug\libsodium11\libsodium.imp.lib;%(AdditionalDependencies)
</AdditionalDependencies>
</Link>
<Link
Condition=
"$(Configuration.IndexOf('Release')) != -1"
>
<AdditionalDependencies>
$(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Release\libsodium11\libsodium.imp.lib;%(AdditionalDependencies)
</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup
Condition=
"'$(Linkage-libsodium)' == 'static'"
>
<Link
Condition=
"$(Configuration.IndexOf('Debug')) != -1"
>
<AdditionalDependencies>
$(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Debug\libsodium11\libsodium.lib;%(AdditionalDependencies)
</AdditionalDependencies>
</Link>
<Link
Condition=
"$(Configuration.IndexOf('Release')) != -1"
>
<AdditionalDependencies>
$(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Release\libsodium11\libsodium.lib;%(AdditionalDependencies)
</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup
Condition=
"'$(Linkage-libsodium)' == 'ltcg'"
>
<Link
Condition=
"$(Configuration.IndexOf('Debug')) != -1"
>
<AdditionalDependencies>
$(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Debug\libsodium11\libsodium.ltcg.lib;%(AdditionalDependencies)
</AdditionalDependencies>
</Link>
<Link
Condition=
"$(Configuration.IndexOf('Release')) != -1"
>
<AdditionalDependencies>
$(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Release\libsodium11\libsodium.ltcg.lib;%(AdditionalDependencies)
</AdditionalDependencies>
<Link>
<AdditionalDependencies>
advapi32.lib;crypt32.lib;libsodium.lib;%(AdditionalDependencies)
</AdditionalDependencies>
<AdditionalLibraryDirectories
Condition=
"$(Configuration.IndexOf('Debug')) != -1"
>
$(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Debug\$(PlatformToolset)\$(Linkage-libsodium)\;%(AdditionalLibraryDirectories)
</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories
Condition=
"$(Configuration.IndexOf('Release')) != -1"
>
$(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Release\$(PlatformToolset)\$(Linkage-libsodium)\;%(AdditionalLibraryDirectories)
</AdditionalLibraryDirectories>
</Link>
</ItemDefinitionGroup>
...
...
@@ -56,15 +29,15 @@
<Target
Name=
"Linkage-libsodium-dynamic"
AfterTargets=
"AfterBuild"
Condition=
"'$(Linkage-libsodium)' == 'dynamic'"
>
<Copy
Condition=
"$(Configuration.IndexOf('Debug')) != -1"
SourceFiles=
"$(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Debug\
libsodium11
\libsodium.dll"
SourceFiles=
"$(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Debug\
$(PlatformToolset)\dynamic
\libsodium.dll"
DestinationFiles=
"$(TargetDir)libsodium.dll"
SkipUnchangedFiles=
"true"
/>
<Copy
Condition=
"$(Configuration.IndexOf('Debug')) != -1"
SourceFiles=
"$(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Debug\
libsodium11
\libsodium.pdb"
SourceFiles=
"$(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Debug\
$(PlatformToolset)\dynamic
\libsodium.pdb"
DestinationFiles=
"$(TargetDir)libsodium.pdb"
SkipUnchangedFiles=
"true"
/>
<Copy
Condition=
"$(Configuration.IndexOf('Release')) != -1"
SourceFiles=
"$(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Release\
libsodium11
\libsodium.dll"
SourceFiles=
"$(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Release\
$(PlatformToolset)\dynamic
\libsodium.dll"
DestinationFiles=
"$(TargetDir)libsodium.dll"
SkipUnchangedFiles=
"true"
/>
</Target>
...
...
builds/msvc/vs2013/libsodium.import.props
View file @
249a59a5
...
...
@@ -18,32 +18,10 @@
<AdditionalIncludeDirectories>
$(ProjectDir)..\..\..\..\..\libsodium\src\libsodium\include;$(ProjectDir)..\..\..\..\..\libsodium\src\libsodium\include\sodium\;%(AdditionalIncludeDirectories)
</AdditionalIncludeDirectories>
<PreprocessorDefinitions
Condition=
"'$(Linkage-libsodium)' == 'static' Or '$(Linkage-libsodium)' == 'ltcg'"
>
SODIUM_STATIC;%(PreprocessorDefinitions)
</PreprocessorDefinitions>
</ClCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup
Condition=
"'$(Linkage-libsodium)' == 'dynamic'"
>
<Link
Condition=
"$(Configuration.IndexOf('Debug')) != -1"
>
<AdditionalDependencies>
$(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Debug\libsodium12\libsodium.imp.lib;%(AdditionalDependencies)
</AdditionalDependencies>
</Link>
<Link
Condition=
"$(Configuration.IndexOf('Release')) != -1"
>
<AdditionalDependencies>
$(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Release\libsodium12\libsodium.imp.lib;%(AdditionalDependencies)
</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup
Condition=
"'$(Linkage-libsodium)' == 'static'"
>
<Link
Condition=
"$(Configuration.IndexOf('Debug')) != -1"
>
<AdditionalDependencies>
$(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Debug\libsodium12\libsodium.lib;%(AdditionalDependencies)
</AdditionalDependencies>
</Link>
<Link
Condition=
"$(Configuration.IndexOf('Release')) != -1"
>
<AdditionalDependencies>
$(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Release\libsodium12\libsodium.lib;%(AdditionalDependencies)
</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup
Condition=
"'$(Linkage-libsodium)' == 'ltcg'"
>
<Link
Condition=
"$(Configuration.IndexOf('Debug')) != -1"
>
<AdditionalDependencies>
$(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Debug\libsodium12\libsodium.ltcg.lib;%(AdditionalDependencies)
</AdditionalDependencies>
</Link>
<Link
Condition=
"$(Configuration.IndexOf('Release')) != -1"
>
<AdditionalDependencies>
$(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Release\libsodium12\libsodium.ltcg.lib;%(AdditionalDependencies)
</AdditionalDependencies>
<Link>
<AdditionalDependencies>
advapi32.lib;crypt32.lib;libsodium.lib;%(AdditionalDependencies)
</AdditionalDependencies>
<AdditionalLibraryDirectories
Condition=
"$(Configuration.IndexOf('Debug')) != -1"
>
$(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Debug\$(PlatformToolset)\$(Linkage-libsodium)\;%(AdditionalLibraryDirectories)
</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories
Condition=
"$(Configuration.IndexOf('Release')) != -1"
>
$(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Release\$(PlatformToolset)\$(Linkage-libsodium)\;%(AdditionalLibraryDirectories)
</AdditionalLibraryDirectories>
</Link>
</ItemDefinitionGroup>
...
...
@@ -51,15 +29,15 @@
<Target
Name=
"Linkage-libsodium-dynamic"
AfterTargets=
"AfterBuild"
Condition=
"'$(Linkage-libsodium)' == 'dynamic'"
>
<Copy
Condition=
"$(Configuration.IndexOf('Debug')) != -1"
SourceFiles=
"$(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Debug\
libsodium12
\libsodium.dll"
SourceFiles=
"$(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Debug\
$(PlatformToolset)\dynamic
\libsodium.dll"
DestinationFiles=
"$(TargetDir)libsodium.dll"
SkipUnchangedFiles=
"true"
/>
<Copy
Condition=
"$(Configuration.IndexOf('Debug')) != -1"
SourceFiles=
"$(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Debug\
libsodium12
\libsodium.pdb"
SourceFiles=
"$(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Debug\
$(PlatformToolset)\dynamic
\libsodium.pdb"
DestinationFiles=
"$(TargetDir)libsodium.pdb"
SkipUnchangedFiles=
"true"
/>
<Copy
Condition=
"$(Configuration.IndexOf('Release')) != -1"
SourceFiles=
"$(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Release\
libsodium12
\libsodium.dll"
SourceFiles=
"$(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Release\
$(PlatformToolset)\dynamic
\libsodium.dll"
DestinationFiles=
"$(TargetDir)libsodium.dll"
SkipUnchangedFiles=
"true"
/>
</Target>
...
...
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
