Skip to content

Commit fef5d50

Browse files
authored
Merge pull request #8468 from DonLakeFlyer/VCRuntime
Windows: Use 64 bit versions of vc runtime
2 parents e9cb4d8 + bd81120 commit fef5d50

File tree

6 files changed

+1
-2
lines changed

6 files changed

+1
-2
lines changed

ChangeLog.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ Note: This file only contains high level features or important fixes.
99
* Fix ArduPilot current mission item tracking in Fly view
1010
* Fix ADSB vehicle display
1111
* Fix map positioning bug in Plan view
12+
* Fix Windows 0xcc000007b startup error causes by incorrect VC runtimes being installed.
1213

1314
### 4.0.0 - Stable
1415

QGCSetup.pri

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,6 @@ WindowsBuild {
7979
# Copy Visual Studio DLLs
8080
# Note that this is only done for release because the debugging versions of these DLLs cannot be redistributed.
8181
QMAKE_POST_LINK += $$escape_expand(\\n) $$QMAKE_COPY \"$$BASEDIR\\deploy\\msvcp140.dll\" \"$$DESTDIR_WIN\"
82-
QMAKE_POST_LINK += $$escape_expand(\\n) $$QMAKE_COPY \"$$BASEDIR\\deploy\\msvcp140_1.dll\" \"$$DESTDIR_WIN\"
83-
QMAKE_POST_LINK += $$escape_expand(\\n) $$QMAKE_COPY \"$$BASEDIR\\deploy\\msvcp140_2.dll\" \"$$DESTDIR_WIN\"
8482
QMAKE_POST_LINK += $$escape_expand(\\n) $$QMAKE_COPY \"$$BASEDIR\\deploy\\vcruntime140.dll\" \"$$DESTDIR_WIN\"
8583
}
8684

deploy/msvcp140.dll

174 KB
Binary file not shown.

deploy/msvcp140_1.dll

-28.5 KB
Binary file not shown.

deploy/msvcp140_2.dll

-169 KB
Binary file not shown.

deploy/vcruntime140.dll

4.79 KB
Binary file not shown.

0 commit comments

Comments
 (0)