generic-library/libzmq
1
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2024-12-13 02:42:58 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1027 from evoskuil/master

Browse Source 
Batched VS builds, updated libsodium imports
This commit is contained in:
Pieter Hintjens 2014-05-12 11:45:22 +02:00
commit ec0094c474
26 changed files with 119 additions and 120 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
builds/msvc/build/buildall.bat Normal file
View File

@ -0,0 +1,10 @@
@ECHO OFF
CALL buildbase.bat ..\vs2013\libzmq.sln 12
ECHO.
CALL buildbase.bat ..\vs2012\libzmq.sln 11
ECHO.
CALL buildbase.bat ..\vs2010\libzmq.sln 10
ECHO.
PAUSE

65
builds/msvc/build/buildbase.bat Normal file
View File

@ -0,0 +1,65 @@
@ECHO OFF
REM Usage: [buildbase.bat ..\vs2013\libzmq.sln 12]
SET solution=%1
SET version=%2
SET log=build_%version%.log
REM This breaks if visual studio is not installed or is installed to a non-default location.
SET environment="C:\Program Files (x86)\Microsoft Visual Studio %version%.0\VC\vcvarsall.bat"
ECHO Building: %solution%
CALL %environment% x86 > nul
ECHO Platform=x86
ECHO Configuration=DynDebug
msbuild /m /v:n /p:Configuration=DynDebug /p:Platform=Win32 %solution% > %log%
IF errorlevel 1 GOTO error
ECHO Configuration=DynRelease
msbuild /m /v:n /p:Configuration=DynRelease /p:Platform=Win32 %solution% >> %log%
IF errorlevel 1 GOTO error
ECHO Configuration=LtcgDebug
msbuild /m /v:n /p:Configuration=LtcgDebug /p:Platform=Win32 %solution% >> %log%
IF errorlevel 1 GOTO error
ECHO Configuration=LtcgRelease
msbuild /m /v:n /p:Configuration=LtcgRelease /p:Platform=Win32 %solution% >> %log%
IF errorlevel 1 GOTO error
ECHO Configuration=StaticDebug
msbuild /m /v:n /p:Configuration=StaticDebug /p:Platform=Win32 %solution% >> %log%
IF errorlevel 1 GOTO error
ECHO Configuration=StaticRelease
msbuild /m /v:n /p:Configuration=StaticRelease /p:Platform=Win32 %solution% >> %log%
IF errorlevel 1 GOTO error
CALL %environment% x86_amd64 > nul
ECHO Platform=x64
ECHO Configuration=DynDebug
msbuild /m /v:n /p:Configuration=DynDebug /p:Platform=x64 %solution% > %log%
IF errorlevel 1 GOTO error
ECHO Configuration=DynRelease
msbuild /m /v:n /p:Configuration=DynRelease /p:Platform=x64 %solution% >> %log%
IF errorlevel 1 GOTO error
ECHO Configuration=LtcgDebug
msbuild /m /v:n /p:Configuration=LtcgDebug /p:Platform=x64 %solution% >> %log%
IF errorlevel 1 GOTO error
ECHO Configuration=LtcgRelease
msbuild /m /v:n /p:Configuration=LtcgRelease /p:Platform=x64 %solution% >> %log%
IF errorlevel 1 GOTO error
ECHO Configuration=StaticDebug
msbuild /m /v:n /p:Configuration=StaticDebug /p:Platform=x64 %solution% >> %log%
IF errorlevel 1 GOTO error
ECHO Configuration=StaticRelease
msbuild /m /v:n /p:Configuration=StaticRelease /p:Platform=x64 %solution% >> %log%
IF errorlevel 1 GOTO error
ECHO Complete: %solution%
GOTO end
:error
ECHO *** ERROR, build terminated, see: %log%
:end

2
builds/msvc/vs2010/inproc_lat/inproc_lat.props
View File

@ -11,7 +11,7 @@
<ItemDefinitionGroup> <ItemDefinitionGroup>
<PreBuildEvent> <PreBuildEvent>
<Command>copy $(ProjectDir)..\..\platform.hpp $(ProjectDir)..\..\..\..\perf\</Command> <Command>xcopy /c /y $(ProjectDir)..\..\platform.hpp $(ProjectDir)..\..\..\..\perf\</Command>
</PreBuildEvent> </PreBuildEvent>
<Link> <Link>
<AdditionalDependencies>Advapi32.lib;Rpcrt4.lib;Ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>Advapi32.lib;Rpcrt4.lib;Ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>

2
builds/msvc/vs2010/inproc_thr/inproc_thr.props
View File

@ -11,7 +11,7 @@
<ItemDefinitionGroup> <ItemDefinitionGroup>
<PreBuildEvent> <PreBuildEvent>
<Command>copy $(ProjectDir)..\..\platform.hpp $(ProjectDir)..\..\..\..\perf\</Command> <Command>xcopy /c /y $(ProjectDir)..\..\platform.hpp $(ProjectDir)..\..\..\..\perf\</Command>
</PreBuildEvent> </PreBuildEvent>
<Link> <Link>
<AdditionalDependencies>Advapi32.lib;Rpcrt4.lib;Ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>Advapi32.lib;Rpcrt4.lib;Ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>

43
builds/msvc/vs2010/libsodium.import.props
View File

@ -16,39 +16,12 @@
<ItemDefinitionGroup> <ItemDefinitionGroup>
<ClCompile> <ClCompile>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\..\..\..\libsodium\src\libsodium\include;$(ProjectDir)..\..\..\..\..\libsodium\src\libsodium\include\sodium\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <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> </ClCompile>
</ItemDefinitionGroup> <Link>
<AdditionalDependencies>advapi32.lib;crypt32.lib;libsodium.lib;%(AdditionalDependencies)</AdditionalDependencies>
<ItemDefinitionGroup Condition="'$(Linkage-libsodium)' == 'static' Or '$(Linkage-libsodium)' == 'ltcg'"> <AdditionalLibraryDirectories Condition="$(Configuration.IndexOf('Debug')) != -1">$(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Debug\$(PlatformToolset)\$(Linkage-libsodium)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<ClCompile> <AdditionalLibraryDirectories Condition="$(Configuration.IndexOf('Release')) != -1">$(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Release\$(PlatformToolset)\$(Linkage-libsodium)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<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> </Link>
</ItemDefinitionGroup> </ItemDefinitionGroup>
@ -56,15 +29,15 @@
<Target Name="Linkage-libsodium-dynamic" AfterTargets="AfterBuild" Condition="'$(Linkage-libsodium)' == 'dynamic'"> <Target Name="Linkage-libsodium-dynamic" AfterTargets="AfterBuild" Condition="'$(Linkage-libsodium)' == 'dynamic'">
<Copy Condition="$(Configuration.IndexOf('Debug')) != -1" <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" DestinationFiles="$(TargetDir)libsodium.dll"
SkipUnchangedFiles="true" /> SkipUnchangedFiles="true" />
<Copy Condition="$(Configuration.IndexOf('Debug')) != -1" <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" DestinationFiles="$(TargetDir)libsodium.pdb"
SkipUnchangedFiles="true" /> SkipUnchangedFiles="true" />
<Copy Condition="$(Configuration.IndexOf('Release')) != -1" <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" DestinationFiles="$(TargetDir)libsodium.dll"
SkipUnchangedFiles="true" /> SkipUnchangedFiles="true" />
</Target> </Target>

2
builds/msvc/vs2010/libzmq/libzmq.props
View File

@ -21,7 +21,7 @@
<ItemDefinitionGroup> <ItemDefinitionGroup>
<PreBuildEvent> <PreBuildEvent>
<Command>copy $(ProjectDir)..\..\platform.hpp $(ProjectDir)..\..\..\..\src\</Command> <Command>xcopy /c /y $(ProjectDir)..\..\platform.hpp $(ProjectDir)..\..\..\..\src\</Command>
</PreBuildEvent> </PreBuildEvent>
<ClCompile> <ClCompile>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\..\..\include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>$(ProjectDir)..\..\..\..\include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

2
builds/msvc/vs2010/local_lat/local_lat.props
View File

@ -11,7 +11,7 @@
<ItemDefinitionGroup> <ItemDefinitionGroup>
<PreBuildEvent> <PreBuildEvent>
<Command>copy $(ProjectDir)..\..\platform.hpp $(ProjectDir)..\..\..\..\perf\</Command> <Command>xcopy /c /y $(ProjectDir)..\..\platform.hpp $(ProjectDir)..\..\..\..\perf\</Command>
</PreBuildEvent> </PreBuildEvent>
<Link> <Link>
<AdditionalDependencies>Advapi32.lib;Rpcrt4.lib;Ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>Advapi32.lib;Rpcrt4.lib;Ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>

2
builds/msvc/vs2010/local_thr/local_thr.props
View File

@ -11,7 +11,7 @@
<ItemDefinitionGroup> <ItemDefinitionGroup>
<PreBuildEvent> <PreBuildEvent>
<Command>copy $(ProjectDir)..\..\platform.hpp $(ProjectDir)..\..\..\..\perf\</Command> <Command>xcopy /c /y $(ProjectDir)..\..\platform.hpp $(ProjectDir)..\..\..\..\perf\</Command>
</PreBuildEvent> </PreBuildEvent>
<Link> <Link>
<AdditionalDependencies>Advapi32.lib;Rpcrt4.lib;Ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>Advapi32.lib;Rpcrt4.lib;Ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>

2
builds/msvc/vs2010/remote_lat/remote_lat.props
View File

@ -11,7 +11,7 @@
<ItemDefinitionGroup> <ItemDefinitionGroup>
<PreBuildEvent> <PreBuildEvent>
<Command>copy $(ProjectDir)..\..\platform.hpp $(ProjectDir)..\..\..\..\perf\</Command> <Command>xcopy /c /y $(ProjectDir)..\..\platform.hpp $(ProjectDir)..\..\..\..\perf\</Command>
</PreBuildEvent> </PreBuildEvent>
<Link> <Link>
<AdditionalDependencies>Advapi32.lib;Rpcrt4.lib;Ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>Advapi32.lib;Rpcrt4.lib;Ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>

2
builds/msvc/vs2010/remote_thr/remote_thr.props
View File

@ -11,7 +11,7 @@
<ItemDefinitionGroup> <ItemDefinitionGroup>
<PreBuildEvent> <PreBuildEvent>
<Command>copy $(ProjectDir)..\..\platform.hpp $(ProjectDir)..\..\..\..\perf\</Command> <Command>xcopy /c /y $(ProjectDir)..\..\platform.hpp $(ProjectDir)..\..\..\..\perf\</Command>
</PreBuildEvent> </PreBuildEvent>
<Link> <Link>
<AdditionalDependencies>Advapi32.lib;Rpcrt4.lib;Ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>Advapi32.lib;Rpcrt4.lib;Ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>

2
builds/msvc/vs2012/inproc_lat/inproc_lat.props
View File

@ -11,7 +11,7 @@
<ItemDefinitionGroup> <ItemDefinitionGroup>
<PreBuildEvent> <PreBuildEvent>
<Command>copy $(ProjectDir)..\..\platform.hpp $(ProjectDir)..\..\..\..\perf\</Command> <Command>xcopy /c /y $(ProjectDir)..\..\platform.hpp $(ProjectDir)..\..\..\..\perf\</Command>
</PreBuildEvent> </PreBuildEvent>
<Link> <Link>
<AdditionalDependencies>Advapi32.lib;Rpcrt4.lib;Ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>Advapi32.lib;Rpcrt4.lib;Ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>

2
builds/msvc/vs2012/inproc_thr/inproc_thr.props
View File

@ -11,7 +11,7 @@
<ItemDefinitionGroup> <ItemDefinitionGroup>
<PreBuildEvent> <PreBuildEvent>
<Command>copy $(ProjectDir)..\..\platform.hpp $(ProjectDir)..\..\..\..\perf\</Command> <Command>xcopy /c /y $(ProjectDir)..\..\platform.hpp $(ProjectDir)..\..\..\..\perf\</Command>
</PreBuildEvent> </PreBuildEvent>
<Link> <Link>
<AdditionalDependencies>Advapi32.lib;Rpcrt4.lib;Ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>Advapi32.lib;Rpcrt4.lib;Ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>

43
builds/msvc/vs2012/libsodium.import.props
View File

@ -16,39 +16,12 @@
<ItemDefinitionGroup> <ItemDefinitionGroup>
<ClCompile> <ClCompile>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\..\..\..\libsodium\src\libsodium\include;$(ProjectDir)..\..\..\..\..\libsodium\src\libsodium\include\sodium\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <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> </ClCompile>
</ItemDefinitionGroup> <Link>
<AdditionalDependencies>advapi32.lib;crypt32.lib;libsodium.lib;%(AdditionalDependencies)</AdditionalDependencies>
<ItemDefinitionGroup Condition="'$(Linkage-libsodium)' == 'static' Or '$(Linkage-libsodium)' == 'ltcg'"> <AdditionalLibraryDirectories Condition="$(Configuration.IndexOf('Debug')) != -1">$(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Debug\$(PlatformToolset)\$(Linkage-libsodium)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<ClCompile> <AdditionalLibraryDirectories Condition="$(Configuration.IndexOf('Release')) != -1">$(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Release\$(PlatformToolset)\$(Linkage-libsodium)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<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> </Link>
</ItemDefinitionGroup> </ItemDefinitionGroup>
@ -56,15 +29,15 @@
<Target Name="Linkage-libsodium-dynamic" AfterTargets="AfterBuild" Condition="'$(Linkage-libsodium)' == 'dynamic'"> <Target Name="Linkage-libsodium-dynamic" AfterTargets="AfterBuild" Condition="'$(Linkage-libsodium)' == 'dynamic'">
<Copy Condition="$(Configuration.IndexOf('Debug')) != -1" <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" DestinationFiles="$(TargetDir)libsodium.dll"
SkipUnchangedFiles="true" /> SkipUnchangedFiles="true" />
<Copy Condition="$(Configuration.IndexOf('Debug')) != -1" <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" DestinationFiles="$(TargetDir)libsodium.pdb"
SkipUnchangedFiles="true" /> SkipUnchangedFiles="true" />
<Copy Condition="$(Configuration.IndexOf('Release')) != -1" <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" DestinationFiles="$(TargetDir)libsodium.dll"
SkipUnchangedFiles="true" /> SkipUnchangedFiles="true" />
</Target> </Target>

2
builds/msvc/vs2012/libzmq/libzmq.props
View File

@ -21,7 +21,7 @@
<ItemDefinitionGroup> <ItemDefinitionGroup>
<PreBuildEvent> <PreBuildEvent>
<Command>copy $(ProjectDir)..\..\platform.hpp $(ProjectDir)..\..\..\..\src\</Command> <Command>xcopy /c /y $(ProjectDir)..\..\platform.hpp $(ProjectDir)..\..\..\..\src\</Command>
</PreBuildEvent> </PreBuildEvent>
<ClCompile> <ClCompile>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\..\..\include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>$(ProjectDir)..\..\..\..\include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

2
builds/msvc/vs2012/local_lat/local_lat.props
View File

@ -11,7 +11,7 @@
<ItemDefinitionGroup> <ItemDefinitionGroup>
<PreBuildEvent> <PreBuildEvent>
<Command>copy $(ProjectDir)..\..\platform.hpp $(ProjectDir)..\..\..\..\perf\</Command> <Command>xcopy /c /y $(ProjectDir)..\..\platform.hpp $(ProjectDir)..\..\..\..\perf\</Command>
</PreBuildEvent> </PreBuildEvent>
<Link> <Link>
<AdditionalDependencies>Advapi32.lib;Rpcrt4.lib;Ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>Advapi32.lib;Rpcrt4.lib;Ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>

2
builds/msvc/vs2012/local_thr/local_thr.props
View File

@ -11,7 +11,7 @@
<ItemDefinitionGroup> <ItemDefinitionGroup>
<PreBuildEvent> <PreBuildEvent>
<Command>copy $(ProjectDir)..\..\platform.hpp $(ProjectDir)..\..\..\..\perf\</Command> <Command>xcopy /c /y $(ProjectDir)..\..\platform.hpp $(ProjectDir)..\..\..\..\perf\</Command>
</PreBuildEvent> </PreBuildEvent>
<Link> <Link>
<AdditionalDependencies>Advapi32.lib;Rpcrt4.lib;Ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>Advapi32.lib;Rpcrt4.lib;Ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>

2
builds/msvc/vs2012/remote_lat/remote_lat.props
View File

@ -11,7 +11,7 @@
<ItemDefinitionGroup> <ItemDefinitionGroup>
<PreBuildEvent> <PreBuildEvent>
<Command>copy $(ProjectDir)..\..\platform.hpp $(ProjectDir)..\..\..\..\perf\</Command> <Command>xcopy /c /y $(ProjectDir)..\..\platform.hpp $(ProjectDir)..\..\..\..\perf\</Command>
</PreBuildEvent> </PreBuildEvent>
<Link> <Link>
<AdditionalDependencies>Advapi32.lib;Rpcrt4.lib;Ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>Advapi32.lib;Rpcrt4.lib;Ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>

2
builds/msvc/vs2012/remote_thr/remote_thr.props
View File

@ -11,7 +11,7 @@
<ItemDefinitionGroup> <ItemDefinitionGroup>
<PreBuildEvent> <PreBuildEvent>
<Command>copy $(ProjectDir)..\..\platform.hpp $(ProjectDir)..\..\..\..\perf\</Command> <Command>xcopy /c /y $(ProjectDir)..\..\platform.hpp $(ProjectDir)..\..\..\..\perf\</Command>
</PreBuildEvent> </PreBuildEvent>
<Link> <Link>
<AdditionalDependencies>Advapi32.lib;Rpcrt4.lib;Ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>Advapi32.lib;Rpcrt4.lib;Ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>

2
builds/msvc/vs2013/inproc_lat/inproc_lat.props
View File

@ -11,7 +11,7 @@
<ItemDefinitionGroup> <ItemDefinitionGroup>
<PreBuildEvent> <PreBuildEvent>
<Command>copy $(ProjectDir)..\..\platform.hpp $(ProjectDir)..\..\..\..\perf\</Command> <Command>xcopy /c /y $(ProjectDir)..\..\platform.hpp $(ProjectDir)..\..\..\..\perf\</Command>
</PreBuildEvent> </PreBuildEvent>
<Link> <Link>
<AdditionalDependencies>Advapi32.lib;Rpcrt4.lib;Ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>Advapi32.lib;Rpcrt4.lib;Ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>

2
builds/msvc/vs2013/inproc_thr/inproc_thr.props
View File

@ -11,7 +11,7 @@
<ItemDefinitionGroup> <ItemDefinitionGroup>
<PreBuildEvent> <PreBuildEvent>
<Command>copy $(ProjectDir)..\..\platform.hpp $(ProjectDir)..\..\..\..\perf\</Command> <Command>xcopy /c /y $(ProjectDir)..\..\platform.hpp $(ProjectDir)..\..\..\..\perf\</Command>
</PreBuildEvent> </PreBuildEvent>
<Link> <Link>
<AdditionalDependencies>Advapi32.lib;Rpcrt4.lib;Ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>Advapi32.lib;Rpcrt4.lib;Ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>

36
builds/msvc/vs2013/libsodium.import.props
View File

@ -18,32 +18,10 @@
<AdditionalIncludeDirectories>$(ProjectDir)..\..\..\..\..\libsodium\src\libsodium\include;$(ProjectDir)..\..\..\..\..\libsodium\src\libsodium\include\sodium\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <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> <PreprocessorDefinitions Condition="'$(Linkage-libsodium)' == 'static' Or '$(Linkage-libsodium)' == 'ltcg'">SODIUM_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile> </ClCompile>
</ItemDefinitionGroup> <Link>
<AdditionalDependencies>advapi32.lib;crypt32.lib;libsodium.lib;%(AdditionalDependencies)</AdditionalDependencies>
<ItemDefinitionGroup Condition="'$(Linkage-libsodium)' == 'dynamic'"> <AdditionalLibraryDirectories Condition="$(Configuration.IndexOf('Debug')) != -1">$(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Debug\$(PlatformToolset)\$(Linkage-libsodium)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<Link Condition="$(Configuration.IndexOf('Debug')) != -1"> <AdditionalLibraryDirectories Condition="$(Configuration.IndexOf('Release')) != -1">$(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Release\$(PlatformToolset)\$(Linkage-libsodium)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<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> </Link>
</ItemDefinitionGroup> </ItemDefinitionGroup>
@ -51,15 +29,15 @@
<Target Name="Linkage-libsodium-dynamic" AfterTargets="AfterBuild" Condition="'$(Linkage-libsodium)' == 'dynamic'"> <Target Name="Linkage-libsodium-dynamic" AfterTargets="AfterBuild" Condition="'$(Linkage-libsodium)' == 'dynamic'">
<Copy Condition="$(Configuration.IndexOf('Debug')) != -1" <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" DestinationFiles="$(TargetDir)libsodium.dll"
SkipUnchangedFiles="true" /> SkipUnchangedFiles="true" />
<Copy Condition="$(Configuration.IndexOf('Debug')) != -1" <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" DestinationFiles="$(TargetDir)libsodium.pdb"
SkipUnchangedFiles="true" /> SkipUnchangedFiles="true" />
<Copy Condition="$(Configuration.IndexOf('Release')) != -1" <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" DestinationFiles="$(TargetDir)libsodium.dll"
SkipUnchangedFiles="true" /> SkipUnchangedFiles="true" />
</Target> </Target>

2
builds/msvc/vs2013/libzmq/libzmq.props
View File

@ -21,7 +21,7 @@
<ItemDefinitionGroup> <ItemDefinitionGroup>
<PreBuildEvent> <PreBuildEvent>
<Command>copy $(ProjectDir)..\..\platform.hpp $(ProjectDir)..\..\..\..\src\</Command> <Command>xcopy /c /y $(ProjectDir)..\..\platform.hpp $(ProjectDir)..\..\..\..\src\</Command>
</PreBuildEvent> </PreBuildEvent>
<ClCompile> <ClCompile>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\..\..\include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>$(ProjectDir)..\..\..\..\include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

2
builds/msvc/vs2013/local_lat/local_lat.props
View File

@ -11,7 +11,7 @@
<ItemDefinitionGroup> <ItemDefinitionGroup>
<PreBuildEvent> <PreBuildEvent>
<Command>copy $(ProjectDir)..\..\platform.hpp $(ProjectDir)..\..\..\..\perf\</Command> <Command>xcopy /c /y $(ProjectDir)..\..\platform.hpp $(ProjectDir)..\..\..\..\perf\</Command>
</PreBuildEvent> </PreBuildEvent>
<Link> <Link>
<AdditionalDependencies>Advapi32.lib;Rpcrt4.lib;Ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>Advapi32.lib;Rpcrt4.lib;Ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>

2
builds/msvc/vs2013/local_thr/local_thr.props
View File

@ -11,7 +11,7 @@
<ItemDefinitionGroup> <ItemDefinitionGroup>
<PreBuildEvent> <PreBuildEvent>
<Command>copy $(ProjectDir)..\..\platform.hpp $(ProjectDir)..\..\..\..\perf\</Command> <Command>xcopy /c /y $(ProjectDir)..\..\platform.hpp $(ProjectDir)..\..\..\..\perf\</Command>
</PreBuildEvent> </PreBuildEvent>
<Link> <Link>
<AdditionalDependencies>Advapi32.lib;Rpcrt4.lib;Ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>Advapi32.lib;Rpcrt4.lib;Ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>

2
builds/msvc/vs2013/remote_lat/remote_lat.props
View File

@ -11,7 +11,7 @@
<ItemDefinitionGroup> <ItemDefinitionGroup>
<PreBuildEvent> <PreBuildEvent>
<Command>copy $(ProjectDir)..\..\platform.hpp $(ProjectDir)..\..\..\..\perf\</Command> <Command>xcopy /c /y $(ProjectDir)..\..\platform.hpp $(ProjectDir)..\..\..\..\perf\</Command>
</PreBuildEvent> </PreBuildEvent>
<Link> <Link>
<AdditionalDependencies>Advapi32.lib;Rpcrt4.lib;Ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>Advapi32.lib;Rpcrt4.lib;Ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>

2
builds/msvc/vs2013/remote_thr/remote_thr.props
View File

@ -11,7 +11,7 @@
<ItemDefinitionGroup> <ItemDefinitionGroup>
<PreBuildEvent> <PreBuildEvent>
<Command>copy $(ProjectDir)..\..\platform.hpp $(ProjectDir)..\..\..\..\perf\</Command> <Command>xcopy /c /y $(ProjectDir)..\..\platform.hpp $(ProjectDir)..\..\..\..\perf\</Command>
</PreBuildEvent> </PreBuildEvent>
<Link> <Link>
<AdditionalDependencies>Advapi32.lib;Rpcrt4.lib;Ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>Advapi32.lib;Rpcrt4.lib;Ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>