sharpetronics/liboqs
1
0
Fork 0
mirror of https://github.com/open-quantum-safe/liboqs.git synced 2025-10-07 00:10:54 -04:00
Code Issues Projects Releases Wiki Activity

Merge pull request #226 from christianpaquin/cp-merge-picnic-lib-in-oqs-lib-on-windows

Browse Source 
Added post-build step to merge the oqs and picnic library on Windows
This commit is contained in:
Vlad Gheorghiu 2018-02-07 13:56:06 -05:00 committed by GitHub
commit 755b6a07bc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
VisualStudio/oqs/oqs.vcxproj
View File

@ -337,11 +337,14 @@ copy "$(SolutionDir)..\src\sig_picnic\sig_picnic.h" "$(SolutionDir)include\oqs\"
mkdir "$(SolutionDir)..\src\sig_picnic\external\msbuild" mkdir "$(SolutionDir)..\src\sig_picnic\external\msbuild"
cd "$(SolutionDir)..\src\sig_picnic\external\msbuild" cd "$(SolutionDir)..\src\sig_picnic\external\msbuild"
cmake -G "Visual Studio 15 2017 Win64" "$(SolutionDir)..\src\sig_picnic\external\" cmake -G "Visual Studio 15 2017 Win64" "$(SolutionDir)..\src\sig_picnic\external\"
msbuild /t:Rebuild /p:Configuration=Release;Platform=x64 "$(SolutionDir)..\src\sig_picnic\external\msbuild\picnic.sln"</Command> msbuild /p:Configuration=Release;Platform=x64 "$(SolutionDir)..\src\sig_picnic\external\msbuild\picnic.sln"</Command>
</PreBuildEvent> </PreBuildEvent>
<Lib> <Lib>
<AdditionalOptions>/ignore:4006 %(AdditionalOptions)</AdditionalOptions> <AdditionalOptions>/ignore:4006 %(AdditionalOptions)</AdditionalOptions>
</Lib> </Lib>
<PostBuildEvent>
<Command>lib /out:"$(OutDir)oqs.lib" "$(OutDir)oqs.lib" "$(SolutionDir)..\src\sig_picnic\external\msbuild\Release\libpicnic_static.lib"</Command>
</PostBuildEvent>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|x64'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|x64'">
<ClCompile> <ClCompile>
@ -384,7 +387,7 @@ copy "$(SolutionDir)..\src\sig_picnic\sig_picnic.h" "$(SolutionDir)include\oqs\"
mkdir "$(SolutionDir)..\src\sig_picnic\external\msbuild" mkdir "$(SolutionDir)..\src\sig_picnic\external\msbuild"
cd "$(SolutionDir)..\src\sig_picnic\external\msbuild" cd "$(SolutionDir)..\src\sig_picnic\external\msbuild"
cmake -G "Visual Studio 15 2017 Win64" "$(SolutionDir)..\src\sig_picnic\external\" cmake -G "Visual Studio 15 2017 Win64" "$(SolutionDir)..\src\sig_picnic\external\"
msbuild /t:Rebuild /p:Configuration=Release;Platform=x64 "$(SolutionDir)..\src\sig_picnic\external\msbuild\picnic.sln"</Command> msbuild /p:Configuration=Release;Platform=x64 "$(SolutionDir)..\src\sig_picnic\external\msbuild\picnic.sln"</Command>
</PreBuildEvent> </PreBuildEvent>
<Lib> <Lib>
<AdditionalOptions>/ignore:4006 %(AdditionalOptions)</AdditionalOptions> <AdditionalOptions>/ignore:4006 %(AdditionalOptions)</AdditionalOptions>
@ -518,11 +521,14 @@ copy "$(SolutionDir)..\src\sig_picnic\sig_picnic.h" "$(SolutionDir)include\oqs\"
mkdir "$(SolutionDir)..\src\sig_picnic\external\msbuild" mkdir "$(SolutionDir)..\src\sig_picnic\external\msbuild"
cd "$(SolutionDir)..\src\sig_picnic\external\msbuild" cd "$(SolutionDir)..\src\sig_picnic\external\msbuild"
cmake -G "Visual Studio 15 2017 Win64" "$(SolutionDir)..\src\sig_picnic\external\" cmake -G "Visual Studio 15 2017 Win64" "$(SolutionDir)..\src\sig_picnic\external\"
msbuild /t:Rebuild /p:Configuration=Release;Platform=x64 "$(SolutionDir)..\src\sig_picnic\external\msbuild\picnic.sln"</Command> msbuild /p:Configuration=Release;Platform=x64 "$(SolutionDir)..\src\sig_picnic\external\msbuild\picnic.sln"</Command>
</PreBuildEvent> </PreBuildEvent>
<Lib> <Lib>
<AdditionalOptions>/ignore:4006 %(AdditionalOptions)</AdditionalOptions> <AdditionalOptions>/ignore:4006 %(AdditionalOptions)</AdditionalOptions>
</Lib> </Lib>
<PostBuildEvent>
<Command>lib /out:"$(OutDir)oqs.lib" "$(OutDir)oqs.lib" "$(SolutionDir)..\src\sig_picnic\external\msbuild\Release\libpicnic_static.lib"</Command>
</PostBuildEvent>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|x64'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|x64'">
<ClCompile> <ClCompile>
@ -569,7 +575,7 @@ copy "$(SolutionDir)..\src\sig_picnic\sig_picnic.h" "$(SolutionDir)include\oqs\"
mkdir "$(SolutionDir)..\src\sig_picnic\external\msbuild" mkdir "$(SolutionDir)..\src\sig_picnic\external\msbuild"
cd "$(SolutionDir)..\src\sig_picnic\external\msbuild" cd "$(SolutionDir)..\src\sig_picnic\external\msbuild"
cmake -G "Visual Studio 15 2017 Win64" "$(SolutionDir)..\src\sig_picnic\external\" cmake -G "Visual Studio 15 2017 Win64" "$(SolutionDir)..\src\sig_picnic\external\"
msbuild /t:Rebuild /p:Configuration=Release;Platform=x64 "$(SolutionDir)..\src\sig_picnic\external\msbuild\picnic.sln"</Command> msbuild /p:Configuration=Release;Platform=x64 "$(SolutionDir)..\src\sig_picnic\external\msbuild\picnic.sln"</Command>
</PreBuildEvent> </PreBuildEvent>
<Lib> <Lib>
<AdditionalOptions>/ignore:4006 %(AdditionalOptions)</AdditionalOptions> <AdditionalOptions>/ignore:4006 %(AdditionalOptions)</AdditionalOptions>