fix: copy vcruntime after build

CCExtractor · Jul 14, 2023 · 46a13a4 · 46a13a4
1 parent 01a6a82
commit 46a13a4
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 8 deletions.
diff --git a/.github/workflows/build_windows.yml b/.github/workflows/build_windows.yml
@@ -54,9 +54,9 @@ jobs:
           VCPKG_ROOT: ${{ github.workspace }}\vcpkg
         run: msbuild ccextractor.sln /p:Configuration=Release-Full /p:Platform=x64
         working-directory: ./windows
-      # - name: Display version information
-      #   run: ./ccextractorwinfull.exe --version
-      #   working-directory: ./windows/x64/Release-Full
+      - name: Display version information
+        run: ./ccextractorwinfull.exe --version
+        working-directory: ./windows/x64/Release-Full
       - uses: actions/upload-artifact@v3
         with:
           name: CCExtractor Windows Release build
@@ -96,9 +96,9 @@ jobs:
           VCPKG_ROOT: ${{ github.workspace }}\vcpkg
         run: msbuild ccextractor.sln /p:Configuration=Debug-Full /p:Platform=x64
         working-directory: ./windows
-      # - name: Display version information
-      #   run: ./ccextractorwinfull.exe --version
-      #   working-directory: ./windows/x64/Debug-Full
+      - name: Display version information
+        run: ./ccextractorwinfull.exe --version
+        working-directory: ./windows/x64/Debug-Full
       - uses: actions/upload-artifact@v3
         with:
           name: CCExtractor Windows Debug build

diff --git a/windows/ccextractor.vcxproj b/windows/ccextractor.vcxproj
@@ -273,7 +273,10 @@
         call rust.bat</Command>
     </PreBuildEvent>
     <PostBuildEvent>
-      <Command>xcopy /y "C:\Program Files\GPAC\libgpac.dll" "$(OutDir)"
+      <Command>
+        xcopy /y "$(ProjectDir)\dll\vcruntime140.dll" "$(OutDir)"
+        xcopy /y "$(ProjectDir)\dll\vcruntime140_1.dll" "$(OutDir)"
+        xcopy /y "C:\Program Files\GPAC\libgpac.dll" "$(OutDir)"
         xcopy /y "C:\Program Files\GPAC\OpenSVCDecoder.dll" "$(OutDir)"
         xcopy /y "C:\Program Files\GPAC\postproc-56.dll" "$(OutDir)"
         xcopy /y "C:\Program Files\GPAC\swresample-4.dll" "$(OutDir)"
@@ -317,7 +320,10 @@
         call rust.bat -r</Command>
     </PreBuildEvent>
     <PostBuildEvent>
-      <Command>xcopy /y "C:\Program Files\GPAC\libgpac.dll" "$(OutDir)"
+      <Command>
+        xcopy /y "$(ProjectDir)\dll\vcruntime140.dll" "$(OutDir)"
+        xcopy /y "$(ProjectDir)\dll\vcruntime140_1.dll" "$(OutDir)"
+        xcopy /y "C:\Program Files\GPAC\libgpac.dll" "$(OutDir)"
         xcopy /y "C:\Program Files\GPAC\OpenSVCDecoder.dll" "$(OutDir)"
         xcopy /y "C:\Program Files\GPAC\postproc-56.dll" "$(OutDir)"
         xcopy /y "C:\Program Files\GPAC\swresample-4.dll" "$(OutDir)"

diff --git a/windows/dll/vcruntime140.dll b/windows/dll/vcruntime140.dll
diff --git a/windows/dll/vcruntime140_1.dll b/windows/dll/vcruntime140_1.dll