Browse Source

OpenSSL support on Visual Studio project

yhirose 5 years ago
parent
commit
ef65f09608
3 changed files with 27 additions and 22 deletions
  1. 21 6
      .github/workflows/test.yaml
  2. 0 14
      appveyor.yml
  3. 6 2
      test/test.vcxproj

+ 21 - 6
.github/workflows/test.yaml

@@ -8,16 +8,31 @@ jobs:
 
 
     strategy:
     strategy:
       matrix:
       matrix:
-        os: [macOS-latest, ubuntu-latest]
+        os: [macOS-latest, ubuntu-latest, windows-latest]
 
 
     steps:
     steps:
+    - name: prepare git for checkout on windows
+      if: matrix.os == 'windows-latest'
+      run: |
+        git config --global core.autocrlf false
+        git config --global core.eol lf
     - name: checkout
     - name: checkout
-      uses: actions/checkout@v1
-    - name: brotli-ubuntu
-      run: sudo apt-get install -y libbrotli-dev
+      uses: actions/checkout@v2
+    - name: install brotli library on ubuntu
       if: matrix.os == 'ubuntu-latest'
       if: matrix.os == 'ubuntu-latest'
-    - name: brotli-macOS
-      run: brew install brotli
+      run: sudo apt-get install -y libbrotli-dev
+    - name: install brotli library on macOS
       if: matrix.os == 'macOS-latest'
       if: matrix.os == 'macOS-latest'
+      run: brew install brotli
     - name: make
     - name: make
+      if: matrix.os != 'windows-latest'
       run: cd test && make
       run: cd test && make
+    - name: setup msbuild on windows
+      if: matrix.os == 'windows-latest'
+      uses: warrenbuckley/Setup-MSBuild@v1
+    - name: make-windows
+      if: matrix.os == 'windows-latest'
+      run: |
+        cd test
+        msbuild.exe test.sln /verbosity:minimal /t:Build "/p:Configuration=Release;Platform=x64"
+        x64\Release\test.exe

+ 0 - 14
appveyor.yml

@@ -1,14 +0,0 @@
-image:
-  - Visual Studio 2019
-
-platform:
-  - x64
-
-build_script:
-  - cmd: >-
-      cd test
-
-      msbuild.exe test.sln /verbosity:minimal /t:Build /p:Configuration=Release;Platform=%PLATFORM%
-
-test_script:
-  - cmd: x64\Release\test.exe

+ 6 - 2
test/test.vcxproj

@@ -22,7 +22,7 @@
     <ProjectGuid>{6B3E6769-052D-4BC0-9D2C-E9127C3DBB26}</ProjectGuid>
     <ProjectGuid>{6B3E6769-052D-4BC0-9D2C-E9127C3DBB26}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>test</RootNamespace>
     <RootNamespace>test</RootNamespace>
-    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -97,6 +97,7 @@
       <AdditionalIncludeDirectories>./;../</AdditionalIncludeDirectories>
       <AdditionalIncludeDirectories>./;../</AdditionalIncludeDirectories>
       <AdditionalUsingDirectories>
       <AdditionalUsingDirectories>
       </AdditionalUsingDirectories>
       </AdditionalUsingDirectories>
+      <SDLCheck>true</SDLCheck>
     </ClCompile>
     </ClCompile>
     <Link>
     <Link>
       <SubSystem>Console</SubSystem>
       <SubSystem>Console</SubSystem>
@@ -114,6 +115,7 @@
       <AdditionalIncludeDirectories>./;../</AdditionalIncludeDirectories>
       <AdditionalIncludeDirectories>./;../</AdditionalIncludeDirectories>
       <AdditionalUsingDirectories>
       <AdditionalUsingDirectories>
       </AdditionalUsingDirectories>
       </AdditionalUsingDirectories>
+      <SDLCheck>true</SDLCheck>
     </ClCompile>
     </ClCompile>
     <Link>
     <Link>
       <SubSystem>Console</SubSystem>
       <SubSystem>Console</SubSystem>
@@ -133,6 +135,7 @@
       <AdditionalIncludeDirectories>./;../</AdditionalIncludeDirectories>
       <AdditionalIncludeDirectories>./;../</AdditionalIncludeDirectories>
       <AdditionalUsingDirectories>
       <AdditionalUsingDirectories>
       </AdditionalUsingDirectories>
       </AdditionalUsingDirectories>
+      <SDLCheck>true</SDLCheck>
     </ClCompile>
     </ClCompile>
     <Link>
     <Link>
       <SubSystem>Console</SubSystem>
       <SubSystem>Console</SubSystem>
@@ -154,6 +157,7 @@
       <AdditionalIncludeDirectories>./;../</AdditionalIncludeDirectories>
       <AdditionalIncludeDirectories>./;../</AdditionalIncludeDirectories>
       <AdditionalUsingDirectories>
       <AdditionalUsingDirectories>
       </AdditionalUsingDirectories>
       </AdditionalUsingDirectories>
+      <SDLCheck>true</SDLCheck>
     </ClCompile>
     </ClCompile>
     <Link>
     <Link>
       <SubSystem>Console</SubSystem>
       <SubSystem>Console</SubSystem>
@@ -171,4 +175,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
   </ImportGroup>
-</Project>
+</Project>