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

Removed picnic lib dependency from 32-bit projects, and specified platform in picnic build instructions.

Browse Source
This commit is contained in:
Christian Paquin 2018-02-02 16:03:27 -05:00
parent 5af6cb3807
commit 10881f4b3e
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
VisualStudio/oqs/oqs.vcxproj
View File

@ -334,7 +334,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 "$(SolutionDir)..\src\sig_picnic\external\msbuild\picnic.sln"</Command> msbuild /t:Rebuild /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>
@ -380,7 +380,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 "$(SolutionDir)..\src\sig_picnic\external\msbuild\picnic.sln"</Command> msbuild /t:Rebuild /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>
@ -511,7 +511,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 "$(SolutionDir)..\src\sig_picnic\external\msbuild\picnic.sln"</Command> msbuild /t:Rebuild /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>
@ -561,7 +561,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 "$(SolutionDir)..\src\sig_picnic\external\msbuild\picnic.sln"</Command> msbuild /t:Rebuild /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>

12
VisualStudio/test_sig/test_sig.vcxproj
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations"> <ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="DebugDLL|Win32"> <ProjectConfiguration Include="DebugDLL|Win32">
@ -226,7 +226,7 @@
</ClCompile> </ClCompile>
<Link> <Link>
<SubSystem>Console</SubSystem> <SubSystem>Console</SubSystem>
<AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;oqs.lib;libpicnic_static.lib;Bcrypt.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;oqs.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(SolutionDir)$(Platform)\$(Configuration)\</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>$(SolutionDir)$(Platform)\$(Configuration)\</AdditionalLibraryDirectories>
<AdditionalOptions>/ignore:4006 %(AdditionalOptions)</AdditionalOptions> <AdditionalOptions>/ignore:4006 %(AdditionalOptions)</AdditionalOptions>
</Link> </Link>
@ -246,7 +246,7 @@
</ClCompile> </ClCompile>
<Link> <Link>
<SubSystem>Console</SubSystem> <SubSystem>Console</SubSystem>
<AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;oqs.lib;libpicnic.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;oqs.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(SolutionDir)$(Platform)\$(Configuration)\</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>$(SolutionDir)$(Platform)\$(Configuration)\</AdditionalLibraryDirectories>
<AdditionalOptions>/ignore:4006 %(AdditionalOptions)</AdditionalOptions> <AdditionalOptions>/ignore:4006 %(AdditionalOptions)</AdditionalOptions>
</Link> </Link>
@ -312,7 +312,7 @@
<SubSystem>Console</SubSystem> <SubSystem>Console</SubSystem>
<EnableCOMDATFolding>true</EnableCOMDATFolding> <EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences> <OptimizeReferences>true</OptimizeReferences>
<AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;oqs.lib;libpicnic_static.lib;Bcrypt.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;oqs.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(SolutionDir)$(Platform)\$(Configuration)\</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>$(SolutionDir)$(Platform)\$(Configuration)\</AdditionalLibraryDirectories>
<AdditionalOptions>/ignore:4006 %(AdditionalOptions)</AdditionalOptions> <AdditionalOptions>/ignore:4006 %(AdditionalOptions)</AdditionalOptions>
</Link> </Link>
@ -336,7 +336,7 @@
<SubSystem>Console</SubSystem> <SubSystem>Console</SubSystem>
<EnableCOMDATFolding>true</EnableCOMDATFolding> <EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences> <OptimizeReferences>true</OptimizeReferences>
<AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;oqs.lib;libpicnic.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;oqs.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(SolutionDir)$(Platform)\$(Configuration)\</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>$(SolutionDir)$(Platform)\$(Configuration)\</AdditionalLibraryDirectories>
<AdditionalOptions>/ignore:4006 %(AdditionalOptions)</AdditionalOptions> <AdditionalOptions>/ignore:4006 %(AdditionalOptions)</AdditionalOptions>
</Link> </Link>
@ -353,4 +353,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets"> <ImportGroup Label="ExtensionTargets">
</ImportGroup> </ImportGroup>
</Project> </Project>