Skip to content

Commit dc3db74

Browse files
JeromeMartinezJeromeMartinez
authored
Merge pull request bavc#871 from MediaArea/vcrt
Update VC runtime path
2 parents 3571829 + 10252ef commit dc3db74

File tree

2 files changed

+28
-24
lines changed

2 files changed

+28
-24
lines changed

‎.github/workflows/qctools.yml‎

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,10 @@ jobs:
3939
4040
- name: Install qwt-qt5
4141
run: |
42-
wget https://raw.githubusercontent.com/Homebrew/homebrew-core/56cd02e96876d1fb5b9ae951d605585fe8d614de/Formula/qwt.rb
43-
brew install --ignore-dependencies ./qwt.rb
42+
curl -L https://raw.githubusercontent.com/Homebrew/homebrew-core/56cd02e96876d1fb5b9ae951d605585fe8d614de/Formula/qwt.rb -o /opt/homebrew/Library/Taps/homebrew/homebrew-core/Formula/q/qwt.rb
43+
git -C /opt/homebrew/Library/Taps/homebrew/homebrew-core add Formula/q/qwt.rb
44+
git -C /opt/homebrew/Library/Taps/homebrew/homebrew-core commit -m "Formula/q/qwt.rb 6.2.0 for Qt5"
45+
HOMEBREW_NO_AUTO_UPDATE=1 HOMEBREW_NO_INSTALL_FROM_API=1 brew install qwt
4446
4547
- name: Set Qt5 environment path
4648
run: |
@@ -493,34 +495,35 @@ jobs:
493495
shell: pwsh
494496
run: |
495497
Set-Location ..
496-
$json = $(curl -L -H "Accept: application/vnd.github+json" https://api.github.com/repos/BtbN/FFmpeg-Builds/releases/latest)
498+
$json = $(curl -L -H "Accept: application/vnd.github+json" https://api.github.com/repos/BtbN/FFmpeg-Builds/releases/243719342)
497499
$ffmpeg_name = $($json | jq -r '.assets[] | select(.name | endswith("-win64-gpl-shared-6.1.zip")).name | sub("\\.zip$";"")')
498500
$ffmpeg_url = $($json | jq -r '.assets[] | select(.name | endswith("-win64-gpl-shared-6.1.zip")).browser_download_url')
499501
Invoke-WebRequest -Uri "$ffmpeg_url" -OutFile "$ffmpeg_name.zip"
500502
Expand-Archive -Path "$ffmpeg_name.zip" -DestinationPath .
501503
Rename-Item -Path "$ffmpeg_name" -NewName "ffmpeg"
502504
503505
- name: Download and configure qwt
506+
shell: bash
504507
run: |
505508
git clone --branch qwt-6.3 --depth 1 https://git.code.sf.net/p/qwt/git ../qwt
506-
copy .github\workflows\qwtconfig.pri ..\qwt
509+
cp .github/workflows/qwtconfig.pri ../qwt
507510
cd ../qwt
508511
qmake -r
509512
510513
- name: Build qwt
511-
shell: cmd
514+
shell: bash
512515
run: |
513516
cd ../qwt
514517
mingw32-make -j4
515518
516519
- name: Configure QCTools
517-
shell: cmd
520+
shell: bash
518521
run: |
519522
cd Project/QtCreator
520523
qmake
521524
522525
- name: Build QCTools
523-
shell: cmd
526+
shell: bash
524527
run: |
525528
cd Project/QtCreator
526529
mingw32-make
@@ -575,34 +578,35 @@ jobs:
575578
shell: pwsh
576579
run: |
577580
Set-Location ..
578-
$json = $(curl -L -H "Accept: application/vnd.github+json" https://api.github.com/repos/BtbN/FFmpeg-Builds/releases/latest)
581+
$json = $(curl -L -H "Accept: application/vnd.github+json" https://api.github.com/repos/BtbN/FFmpeg-Builds/releases/243719342)
579582
$ffmpeg_name = $($json | jq -r '.assets[] | select(.name | endswith("-win64-gpl-shared-6.1.zip")).name | sub("\\.zip$";"")')
580583
$ffmpeg_url = $($json | jq -r '.assets[] | select(.name | endswith("-win64-gpl-shared-6.1.zip")).browser_download_url')
581584
Invoke-WebRequest -Uri "$ffmpeg_url" -OutFile "$ffmpeg_name.zip"
582585
Expand-Archive -Path "$ffmpeg_name.zip" -DestinationPath .
583586
Rename-Item -Path "$ffmpeg_name" -NewName "ffmpeg"
584587
585588
- name: Download and configure qwt
589+
shell: bash
586590
run: |
587591
git clone --branch qwt-6.3 --depth 1 https://git.code.sf.net/p/qwt/git ../qwt
588-
copy .github\workflows\qwtconfig.pri ..\qwt
592+
cp .github/workflows/qwtconfig.pri ../qwt
589593
cd ../qwt
590594
qmake -r
591595
592596
- name: Build qwt
593-
shell: cmd
597+
shell: bash
594598
run: |
595599
cd ../qwt
596600
mingw32-make -j4
597601
598602
- name: Configure QCTools
599-
shell: cmd
603+
shell: bash
600604
run: |
601605
cd Project/QtCreator
602606
qmake
603607
604608
- name: Build QCTools
605-
shell: cmd
609+
shell: bash
606610
run: |
607611
cd Project/QtCreator
608612
mingw32-make
@@ -658,7 +662,7 @@ jobs:
658662
shell: pwsh
659663
run: |
660664
Set-Location ..
661-
$json = $(curl -L -H "Accept: application/vnd.github+json" https://api.github.com/repos/BtbN/FFmpeg-Builds/releases/latest)
665+
$json = $(curl -L -H "Accept: application/vnd.github+json" https://api.github.com/repos/BtbN/FFmpeg-Builds/releases/243719342)
662666
$ffmpeg_name = $($json | jq -r '.assets[] | select(.name | endswith("-win64-gpl-shared-6.1.zip")).name | sub("\\.zip$";"")')
663667
$ffmpeg_url = $($json | jq -r '.assets[] | select(.name | endswith("-win64-gpl-shared-6.1.zip")).browser_download_url')
664668
Invoke-WebRequest -Uri "$ffmpeg_url" -OutFile "$ffmpeg_name.zip"
@@ -745,7 +749,7 @@ jobs:
745749
shell: pwsh
746750
run: |
747751
Set-Location ..
748-
$json = $(curl -L -H "Accept: application/vnd.github+json" https://api.github.com/repos/BtbN/FFmpeg-Builds/releases/latest)
752+
$json = $(curl -L -H "Accept: application/vnd.github+json" https://api.github.com/repos/BtbN/FFmpeg-Builds/releases/243719342)
749753
$ffmpeg_name = $($json | jq -r '.assets[] | select(.name | endswith("-win64-gpl-shared-6.1.zip")).name | sub("\\.zip$";"")')
750754
$ffmpeg_url = $($json | jq -r '.assets[] | select(.name | endswith("-win64-gpl-shared-6.1.zip")).browser_download_url')
751755
Invoke-WebRequest -Uri "$ffmpeg_url" -OutFile "$ffmpeg_name.zip"

‎Source/Install/QCTools.nsi‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -106,16 +106,16 @@ Section "SectionPrincipale" SEC01
106106
File "..\..\..\output\bin\swscale-*.dll"
107107
File "..\..\..\output\bin\freetype-*.dll"
108108
File "..\..\..\output\bin\harfbuzz.dll"
109-
File "C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Redist\MSVC\14.42.34433\X64\Microsoft.VC143.CRT\concrt140.dll"
110-
File "C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Redist\MSVC\14.42.34433\X64\Microsoft.VC143.CRT\msvcp140.dll"
111-
File "C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Redist\MSVC\14.42.34433\X64\Microsoft.VC143.CRT\msvcp140_1.dll"
112-
File "C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Redist\MSVC\14.42.34433\X64\Microsoft.VC143.CRT\msvcp140_2.dll"
113-
File "C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Redist\MSVC\14.42.34433\X64\Microsoft.VC143.CRT\msvcp140_atomic_wait.dll"
114-
File "C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Redist\MSVC\14.42.34433\X64\Microsoft.VC143.CRT\msvcp140_codecvt_ids.dll"
115-
File "C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Redist\MSVC\14.42.34433\X64\Microsoft.VC143.CRT\vccorlib140.dll"
116-
File "C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Redist\MSVC\14.42.34433\X64\Microsoft.VC143.CRT\vcruntime140.dll"
117-
File "C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Redist\MSVC\14.42.34433\X64\Microsoft.VC143.CRT\vcruntime140_1.dll"
118-
File "C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Redist\MSVC\14.42.34433\X64\Microsoft.VC143.CRT\vcruntime140_threads.dll"
109+
File "C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Redist\MSVC\14.44.35112\X64\Microsoft.VC143.CRT\concrt140.dll"
110+
File "C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Redist\MSVC\14.44.35112\X64\Microsoft.VC143.CRT\msvcp140.dll"
111+
File "C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Redist\MSVC\14.44.35112\X64\Microsoft.VC143.CRT\msvcp140_1.dll"
112+
File "C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Redist\MSVC\14.44.35112\X64\Microsoft.VC143.CRT\msvcp140_2.dll"
113+
File "C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Redist\MSVC\14.44.35112\X64\Microsoft.VC143.CRT\msvcp140_atomic_wait.dll"
114+
File "C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Redist\MSVC\14.44.35112\X64\Microsoft.VC143.CRT\msvcp140_codecvt_ids.dll"
115+
File "C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Redist\MSVC\14.44.35112\X64\Microsoft.VC143.CRT\vccorlib140.dll"
116+
File "C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Redist\MSVC\14.44.35112\X64\Microsoft.VC143.CRT\vcruntime140.dll"
117+
File "C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Redist\MSVC\14.44.35112\X64\Microsoft.VC143.CRT\vcruntime140_1.dll"
118+
File "C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Redist\MSVC\14.44.35112\X64\Microsoft.VC143.CRT\vcruntime140_threads.dll"
119119
File "..\..\Project\QtCreator\build\qctools-gui\release\Qt6Core.dll"
120120
File "..\..\Project\QtCreator\build\qctools-gui\release\Qt6Gui.dll"
121121
File "..\..\Project\QtCreator\build\qctools-gui\release\Qt6Multimedia.dll"

0 commit comments

Comments
 (0)