Issue opendnssec#190: Sync Win32 project files

bellgrim · Sep 23, 2016 · cb37db9 · cb37db9
1 parent a9a8e1e
commit cb37db9
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 2 deletions.
diff --git a/win32/convarch/convarch.vcxproj.filters.in b/win32/convarch/convarch.vcxproj.filters.in
@@ -281,6 +281,9 @@
      <ClInclude Include="..\..\src\lib\crypto\OSSLAES.h">
        <Filter>Crypto Header Files</Filter>
      </ClInclude>
+     <ClInclude Include="..\..\src\lib\crypto\OSSLComp.h">
+       <Filter>Crypto Header Files</Filter>
+     </ClInclude>
      <ClInclude Include="..\..\src\lib\crypto\OSSLCryptoFactory.h">
        <Filter>Crypto Header Files</Filter>
      </ClInclude>
@@ -698,6 +701,9 @@
      <ClCompile Include="..\..\src\lib\crypto\OSSLAES.cpp">
        <Filter>Crypto Source Files</Filter>
      </ClCompile>
+     <ClCompile Include="..\..\src\lib\crypto\OSSLComp.cpp">
+       <Filter>Crypto Source Files</Filter>
+     </ClCompile>
      <ClCompile Include="..\..\src\lib\crypto\OSSLCryptoFactory.cpp">
        <Filter>Crypto Source Files</Filter>
      </ClCompile>

diff --git a/win32/convarch/convarch.vcxproj.in b/win32/convarch/convarch.vcxproj.in
@@ -83,6 +83,7 @@
     <ClInclude Include="..\..\src\lib\crypto\odd.h" />
 @IF OPENSSL
      <ClInclude Include="..\..\src\lib\crypto\OSSLAES.h" />
+     <ClInclude Include="..\..\src\lib\crypto\OSSLComp.h" />
      <ClInclude Include="..\..\src\lib\crypto\OSSLCryptoFactory.h" />
      <ClInclude Include="..\..\src\lib\crypto\OSSLDES.h" />
      <ClInclude Include="..\..\src\lib\crypto\OSSLDH.h" />
@@ -227,6 +228,7 @@
     <ClCompile Include="..\..\src\lib\crypto\MacAlgorithm.cpp" />
 @IF OPENSSL
      <ClCompile Include="..\..\src\lib\crypto\OSSLAES.cpp" />
+     <ClCompile Include="..\..\src\lib\crypto\OSSLComp.cpp" />
      <ClCompile Include="..\..\src\lib\crypto\OSSLCryptoFactory.cpp" />
      <ClCompile Include="..\..\src\lib\crypto\OSSLDES.cpp" />
      <ClCompile Include="..\..\src\lib\crypto\OSSLDH.cpp" />

diff --git a/win32/keyconv/keyconv.vcxproj.filters.in b/win32/keyconv/keyconv.vcxproj.filters.in
@@ -40,6 +40,11 @@
     <ClInclude Include="..\..\src\bin\keyconv\softhsm2-keyconv.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+@IF OPENSSL
+    <ClInclude Include="..\..\src\lib\crypto\OSSLComp.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+@END OPENSSL
     <ClInclude Include="..\config.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -60,6 +65,9 @@
     <ClCompile Include="..\..\src\bin\keyconv\softhsm2-keyconv-ossl.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\lib\crypto\OSSLComp.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
 @END OPENSSL
     <ClCompile Include="..\..\src\bin\common\getpw.cpp">
       <Filter>Common Source Files</Filter>

diff --git a/win32/keyconv/keyconv.vcxproj.in b/win32/keyconv/keyconv.vcxproj.in
@@ -54,7 +54,7 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..;..\..\src\bin\common;..\..\src\bin\win32;..\..\src\lib\cryptoki_compat;@DEBUGINCPATH@;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..;..\..\src\bin\common;..\..\src\bin\win32;..\..\src\lib\cryptoki_compat;..\..\src\lib\crypto;@DEBUGINCPATH@;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -72,7 +72,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..;..\..\src\bin\common;..\..\src\bin\win32;..\..\src\lib\cryptoki_compat;@INCLUDEPATH@;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..;..\..\src\bin\common;..\..\src\bin\win32;..\..\src\lib\cryptoki_compat;..\..\src\lib\crypto;@INCLUDEPATH@;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -87,6 +87,9 @@
     <ClInclude Include="..\..\src\bin\common\getpw.h" />
     <ClInclude Include="..\..\src\bin\common\library.h" />
     <ClInclude Include="..\..\src\bin\keyconv\softhsm2-keyconv.h" />
+@IF OPENSSL
+    <ClInclude Include="..\..\src\lib\crypto\OSSLComp.h" />
+@END OPENSSL
     <ClInclude Include="..\..\src\bin\win32\getopt.h" />
     <ClInclude Include="..\config.h" />
   </ItemGroup>
@@ -99,6 +102,7 @@
 @END BOTAN
 @IF OPENSSL
     <ClCompile Include="..\..\src\bin\keyconv\softhsm2-keyconv-ossl.cpp" />
+    <ClCompile Include="..\..\src\lib\crypto\OSSLComp.cpp" />
 @END OPENSSL
     <ClCompile Include="..\..\src\bin\keyconv\softhsm2-keyconv.cpp" />
     <ClCompile Include="..\..\src\bin\win32\getopt.cpp" />

diff --git a/win32/util/util.vcxproj.filters.in b/win32/util/util.vcxproj.filters.in
@@ -52,6 +52,9 @@
     <ClInclude Include="..\..\src\bin\util\softhsm2-util-ossl.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\lib\crypto\OSSLComp.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
 @END OPENSSL
     <ClInclude Include="..\..\src\lib\cryptoki_compat\pkcs11.h">
       <Filter>Header Files</Filter>
@@ -82,6 +85,9 @@
     <ClCompile Include="..\..\src\bin\util\softhsm2-util-ossl.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\lib\crypto\OSSLComp.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
 @END OPENSSL
     <ClCompile Include="..\..\src\bin\win32\getopt.cpp">
       <Filter>Win32 Source Files</Filter>

diff --git a/win32/util/util.vcxproj.in b/win32/util/util.vcxproj.in
@@ -98,6 +98,7 @@
 @END BOTAN
 @IF OPENSSL
     <ClInclude Include="..\..\src\bin\util\softhsm2-util-ossl.h" />
+    <ClInclude Include="..\..\src\lib\crypto\OSSLComp.h" />
 @END OPENSSL
     <ClInclude Include="..\..\src\bin\util\softhsm2-util.h" />
     <ClInclude Include="..\..\src\bin\win32\getopt.h" />
@@ -112,6 +113,7 @@
 @END BOTAN
 @IF OPENSSL
     <ClCompile Include="..\..\src\bin\util\softhsm2-util-ossl.cpp" />
+    <ClCompile Include="..\..\src\lib\crypto\OSSLComp.cpp" />
 @END OPENSSL
     <ClCompile Include="..\..\src\bin\util\softhsm2-util.cpp" />
     <ClCompile Include="..\..\src\bin\win32\getopt.cpp" />