Conan

howetuft · Aug 16, 2024 · afa3639 · afa3639
1 parent 8fea940
commit afa3639
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/.github/actions/windows-build-system/action.yml b/.github/actions/windows-build-system/action.yml
@@ -70,7 +70,7 @@ runs:
         conan install --build=missing ../externals/windows/libvpx  -s build_type=Release
         conan create ../externals/windows/openimageio
         conan create ../externals/windows/oidn
-      shell: pwsh
+      shell: bash
 
     #- uses: mxschmitt/action-tmate@v3
 

diff --git a/conan_profile b/conan_profile
@@ -10,6 +10,6 @@ os=Windows
 [conf]
 tools.cmake.cmaketoolchain:generator=Ninja
 tools.env.virtualenv:powershell=False
-tools.microsoft.bash:active=False
-tools.microsoft.bash:path=C:/shells/gitbash.exe
+tools.microsoft.bash:active=True
+tools.microsoft.bash:path=C:\shells\gitbash.exe
 tools.microsoft.bash:subsystem=msys2
diff --git a/externals/windows/libvpx/conanfile.py b/externals/windows/libvpx/conanfile.py
@@ -0,0 +1,5 @@
+from conan import ConanFile
+
+class Libvpx(ConanFile):
+  requires= ["libvpx/1.13.1",]
+  win_bash=True
diff --git a/externals/windows/libvpx/conanfile.txt b/externals/windows/libvpx/conanfile.txt